ERP_override.git

			@@ -11,7 +11,7 @@
			private String pass;
			private String token;
			private String userName;
			private String address;
			private Object address;
			private String phone;
			private List<String> permissions;
			}

			@@ -522,7 +522,7 @@
			List<OrderOtherMoney> orderOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(jsonObject.get("otherMoney")), OrderOtherMoney.class);

			if(orderOtherMoneyList != null ){
			orderOtherMoneyList = orderOtherMoneyList.stream().filter(o -> o.getColumn()==null \|\| o.getColumn().indexOf("M")==0).collect(Collectors.toList());
			orderOtherMoneyList = orderOtherMoneyList.stream().filter(o -> (o.getColumn()==null && o.getDeliveryState()==0 ) \|\| o.getColumn().indexOf("M")==0).collect(Collectors.toList());
			}
			if(orderOtherMoneyList!=null){
			orderOtherMoneyList.forEach(orderOtherMoney -> {
			@@ -542,7 +542,10 @@


			//删除其他金额明细表
			orderOtherMoneyMapper.delete(new LambdaQueryWrapper<OrderOtherMoney>().eq(OrderOtherMoney::getOrderId, order.getOrderId()));
			orderOtherMoneyMapper.delete(new LambdaQueryWrapper<OrderOtherMoney>()
			.eq(OrderOtherMoney::getOrderId, order.getOrderId())
			.eq(OrderOtherMoney::getDeliveryState, 0)
			);
			List<OrderOtherMoney> orderOtherMoneyLists=orderOtherMoneyList;

			double money = 0;

			@@ -2,6 +2,8 @@

			import cn.dev33.satoken.stp.StpUtil;
			import cn.hutool.core.util.StrUtil;
			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.TypeReference;
			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.example.erp.controller.dto.UserDTO;
			@@ -143,7 +145,12 @@
			userDTO.setPass(null);
			userDTO.setId(user.getId());
			userDTO.setUserName(user.getUserName());
			userDTO.setAddress(user.getAddress());
			List<String> list = JSON.parseObject(user.getAddress(), new TypeReference<List<String>>() {});
			if(list!=null && list.size()==1){
			userDTO.setAddress(list.get(0));
			}else{
			userDTO.setAddress(list);
			}
			userDTO.setToken(StpUtil.getTokenValue());
			Boolean userIsAdmin= userRoleMapper.getUserIsAdmin(user.getId());
			userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId(),userIsAdmin));

	north-glass-erp/src/main/java/com/example/erp/controller/dto/UserDTO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史