From 02a346b1b78c8d2b6b3c298ed2fb8feea8ef96ee Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 31 十二月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java | 9 ++++++++-
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 7 +++++--
north-glass-erp/src/main/java/com/example/erp/controller/dto/UserDTO.java | 2 +-
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/dto/UserDTO.java b/north-glass-erp/src/main/java/com/example/erp/controller/dto/UserDTO.java
index e150555..6dd872a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/dto/UserDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/dto/UserDTO.java
@@ -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;
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 4e1add2..ef15938 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -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;
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
index ebcb818..d54f642 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
@@ -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));
--
Gitblit v1.8.0