Merge remote-tracking branch 'origin/dev_20260131' into dev_20260131

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -857,6 +857,7 @@ public class AuthServiceImpl implements IAuthService {
         loginRes.setSystemType(tokenSystemType);
         loginRes.setToken(newToken);
         loginRes.setRefreshToken(newRefreshToken);
+        loginRes.setDriverId(driver.getId());
         List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, null,1);
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(tabBar)) {
             loginRes.setTabBar(tabBar);
@@ -892,6 +893,7 @@ public class AuthServiceImpl implements IAuthService {
         loginRes.setRefreshToken(newRefreshToken);
         loginRes.setDeptId(user.getDeptId());
         loginRes.setRoleId(user.getRoleId());
+        loginRes.setDriverId(user.getDriverId());
         loginRes.setRoleName(user.getRoleName());
         loginRes.setRoleList(user.getRoleInfoDto());
         List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, user.getRoleName(),1);
@@ -990,12 +992,6 @@ public class AuthServiceImpl implements IAuthService {
         if (isLogistics){
             return buildLogisticsTabBar();
         }
-        if (flag == 1) {
-            return buildDefaultDriverTabBar();
-        }
-        if (flag == 0 && !isDoorKeeper && !isForkliftDriver && !isBuyer && !isDriver){
-            return buildBuyerTabBar();
-        }
         return List.of();
     }
 
@@ -1023,7 +1019,7 @@ public class AuthServiceImpl implements IAuthService {
                 "个人中心",
                 "/static/tabbar/my_select.png",
                 "/static/tabbar/my.png",
-                "/pages/forklift/my"
+                "/pages/myCenter/index"
         ));
         return items;
     }
@@ -1047,7 +1043,7 @@ public class AuthServiceImpl implements IAuthService {
                 "个人中心",
                 "/static/tabbar/my_select.png",
                 "/static/tabbar/my.png",
-                "/pages/forklift/my"
+                "/pages/myCenter/index"
         ));
         return items;
     }
@@ -1082,7 +1078,7 @@ public class AuthServiceImpl implements IAuthService {
                 "个人中心",
                 "/static/tabbar/my_select.png",
                 "/static/tabbar/my.png",
-                "/pages/purchaser/my"
+                "/pages/myCenter/index"
         ));
         return items;
     }
@@ -1099,7 +1095,7 @@ public class AuthServiceImpl implements IAuthService {
                 "个人中心",
                 "/static/tabbar/my_select.png",
                 "/static/tabbar/my.png",
-                "/pages/doorkeeper/my"
+                "/pages/myCenter/index"
         ));
         return items;
     }
@@ -1116,7 +1112,7 @@ public class AuthServiceImpl implements IAuthService {
                 "个人中心",
                 "/static/tabbar/my_select.png",
                 "/static/tabbar/my.png",
-                "/pages/forklift/my"
+                "/pages/myCenter/index"
         ));
         return items;
     }

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/dto/req/TradeEntListQueryFeignDto.java

@@ -0,0 +1,18 @@
+package com.sckw.contract.api.model.dto.req;
+
+import lombok.Data;
+
+/**
+ * 交易企业列表查询参数
+ */
+@Data
+public class TradeEntListQueryFeignDto {
+    /**
+     * 当前企业的 id
+     */
+    private Long curEntId;
+    /**
+     * 需要查询的对方企业类型 1-供应 2-采购 3-托运 4-承运
+     */
+    private Integer tradeEntType;
+}

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/dto/res/TradeEntInfoResVo.java → sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/dto/res/TradeEntInfoResVo.java

@@ -1,4 +1,4 @@
-package com.sckw.contract.model.dto.res;
+package com.sckw.contract.api.model.dto.res;
 
 import lombok.Data;
 

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcLogisticsContractController.java

@@ -1,7 +1,7 @@
 package com.sckw.contract.controller;
 
-import com.sckw.contract.model.dto.req.TradeEntListQueryFeignDto;
-import com.sckw.contract.model.dto.res.TradeEntInfoResVo;
+import com.sckw.contract.api.model.dto.req.TradeEntListQueryFeignDto;
+import com.sckw.contract.api.model.dto.res.TradeEntInfoResVo;
 import com.sckw.contract.model.vo.req.ContractDetailReq;
 import com.sckw.contract.model.vo.req.LogisticListReq;
 import com.sckw.contract.model.vo.req.QueryLogisticListReq;
@@ -46,8 +46,8 @@ public class KwcLogisticsContractController {
     }
 
     @PostMapping("queryTradeEntList")
-    public List<TradeEntInfoResVo> queryTradeEntList(@RequestBody TradeEntListQueryFeignDto queryFeignDto) {
-        return kwcContractLogisticsService.queryTradeEntList(queryFeignDto);
+    public BaseResult<List<TradeEntInfoResVo>> queryTradeEntList(@RequestBody TradeEntListQueryFeignDto queryFeignDto) {
+        return BaseResult.success(kwcContractLogisticsService.queryTradeEntList(queryFeignDto));
     }
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcPurchaseController.java

@@ -1,11 +1,12 @@
 package com.sckw.contract.controller;
 
-import com.sckw.contract.model.dto.req.TradeEntListQueryFeignDto;
+import com.sckw.contract.api.model.dto.req.TradeEntListQueryFeignDto;
 import com.sckw.contract.model.vo.req.IdReqVo;
 import com.sckw.contract.model.vo.req.QueryListReqVo;
-import com.sckw.contract.model.dto.res.TradeEntInfoResVo;
+import com.sckw.contract.api.model.dto.res.TradeEntInfoResVo;
 import com.sckw.contract.service.operateService.KwcContractTradeService;
 import com.sckw.core.model.enums.EntTypeEnum;
+import com.sckw.core.web.response.BaseResult;
 import com.sckw.core.web.response.HttpResult;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
@@ -44,8 +45,8 @@ public class KwcPurchaseController {
     }
 
     @PostMapping("queryTradeEntList")
-    public List<TradeEntInfoResVo> queryTradeEntList(@RequestBody TradeEntListQueryFeignDto queryFeignDto) {
-        return kwcContractTradeService.queryTradeEntList(queryFeignDto);
+    public BaseResult<List<TradeEntInfoResVo>> queryTradeEntList(@RequestBody TradeEntListQueryFeignDto queryFeignDto) {
+        return BaseResult.success(kwcContractTradeService.queryTradeEntList(queryFeignDto));
     }
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/dto/req/TradeEntListQueryFeignDto.java

@@ -1,17 +0,0 @@
-package com.sckw.contract.model.dto.req;
-
-import lombok.Data;
-
-/**
- * 交易企业列表查询参数
- *
- * @author tangyishan
- * @since 2026-02-03  10:18
- */
-@Data
-public class TradeEntListQueryFeignDto {
-    //当前企业的 id
-    private Long curEntId;
-    //需要查询的对方企业类型 1-供应 2-采购 3-托运 4-承运
-    private Integer tradeEntType;
-}

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractLogisticsService.java

@@ -10,11 +10,11 @@ import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.sckw.contract.api.model.dto.req.TradeEntListQueryFeignDto;
+import com.sckw.contract.api.model.dto.res.TradeEntInfoResVo;
 import com.sckw.contract.dao.KwcContractLogisticsMapper;
 import com.sckw.contract.model.dto.req.QueryListReqDto;
-import com.sckw.contract.model.dto.req.TradeEntListQueryFeignDto;
 import com.sckw.contract.model.dto.res.QueryListResDto;
-import com.sckw.contract.model.dto.res.TradeEntInfoResVo;
 import com.sckw.contract.model.entity.*;
 import com.sckw.contract.model.report.LogisticsListExport;
 import com.sckw.contract.model.vo.req.*;
@@ -1665,6 +1665,7 @@ public class KwcContractLogisticsService {
             payableAddDto.setCarriageEntId(collect.get(CooperateTypeEnum.CARRIAGE.getCode()).getEntId());
             payableAddDto.setTradeAmount(BigDecimal.ZERO);
             payableAddDto.setRemark("运费清单初始化");
+            log.info("托运放:{}与承运方:{}签订物流合同，运费清单初始化",payableAddDto.getConsignEntId(),payableAddDto.getCarriageEntId());
             BaseResult<Object> payable = paymentFeignService.initPayable(payableAddDto);
             if (payable.getCode() == HttpStatus.SUCCESS_CODE){
                 log.info("创建运费清单成功");

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -9,7 +9,7 @@ import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.sckw.contract.model.dto.req.TradeEntListQueryFeignDto;
+import com.sckw.contract.api.model.dto.req.TradeEntListQueryFeignDto;
 import com.sckw.contract.api.model.dto.res.*;
 import com.sckw.contract.api.model.vo.LogisticsEntDtoVO;
 import com.sckw.contract.api.model.vo.LogisticsGoodsDto;
@@ -17,7 +17,6 @@ import com.sckw.contract.api.model.vo.TradeContractUnitDto;
 import com.sckw.contract.dao.KwcContractTradeMapper;
 import com.sckw.contract.model.dto.req.QueryListReqDto;
 import com.sckw.contract.model.dto.res.QueryListResDto;
-import com.sckw.contract.model.dto.res.TradeEntInfoResVo;
 import com.sckw.contract.model.entity.*;
 import com.sckw.contract.model.report.TradeListExport;
 import com.sckw.contract.model.vo.req.*;
@@ -1492,6 +1491,7 @@ public class KwcContractTradeService {
             prepaidDto.setSupEntId(collect.get(CooperateTypeEnum.SUPPLIER.getCode()).getEntId());
             prepaidDto.setTradeAmount(BigDecimal.ZERO);
             prepaidDto.setRemark("预付清单初始化");
+            log.info("采购商:{}与供应商:{}签订贸易合同，预付清单初始化",prepaidDto.getProEntId(),prepaidDto.getSupEntId());
             BaseResult<Object> prepaidResult = paymentFeignService.initPrepaidBalance(prepaidDto);
             if (prepaidResult.getCode() == HttpStatus.SUCCESS_CODE) {
                 log.info("创建预付清单成功");

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -2220,7 +2220,7 @@ public class KwoTradeOrderService {
         List<TradeContractUnitDto> unitList = tradeContractResDto.getUnitList();
         List<KwoTradeOrderUnit> list = new ArrayList<>();
         WalletPrepaidDto walletFreeze = new WalletPrepaidDto();
-        walletFreeze.setOrderNo(String.valueOf(order.getId()));
+        walletFreeze.setOrderNo(order.getTOrderNo());
         walletFreeze.setTradeAmount(order.getPrice());
         unitList.forEach(e -> {
             KwoTradeOrderUnit unit = BeanUtil.copyProperties(e, KwoTradeOrderUnit.class);
@@ -2249,6 +2249,7 @@ public class KwoTradeOrderService {
             walletFreeze.setOrderType(4);
             walletFreeze.setTradeType(4);
             walletFreeze.setRemark("贸易订单号：" + walletFreeze.getOrderNo() + ",下单冻结");
+            log.info("贸易订单号：{}，订单下单调用钱包服务冻结预付余额，参数：{}", walletFreeze.getOrderNo(),JSON.toJSONString(walletFreeze));
             freezeBaseResult = paymentFeignService.updatePrepaidBalance(walletFreeze);
         }
 
@@ -2288,23 +2289,23 @@ public class KwoTradeOrderService {
                 freezeDto.setSupEntId(unit.getEntId());
             }
         });
-        freezeDto.setOrderNo(String.valueOf(order.getId()));
+        freezeDto.setOrderNo(order.getTOrderNo());
         freezeDto.setOrderType(4);
         freezeDto.setTradeType(5);
         freezeDto.setRemark("贸易订单号：" + freezeDto.getOrderNo() + ",撤销订单");
         BaseResult<Object> balanceResult;
         try {
+            log.info("贸易订单号：{}，订单撤销调用钱包服务解冻预付余额，参数：{}", freezeDto.getOrderNo(),JSON.toJSONString(freezeDto));
             balanceResult = paymentFeignService.updatePrepaidBalance(freezeDto);
         } catch (Exception e) {
-            log.error("线下钱包扣减预付余额、增加冻结金额异常", e);
-            throw new BusinessException("线下钱包扣减预付余额、增加冻结金额异常");
+            String errMsg = freezeDto.getRemark()+"异常";
+            log.error(errMsg, e);
+            throw new BusinessException(errMsg);
         }
-        if (balanceResult == null || balanceResult.getCode() != HttpStatus.SUCCESS_CODE) {
-            throw new BusinessException("线下钱包扣减预付余额、增加冻结金额失败");
-        }
-        Boolean aBoolean = (Boolean) balanceResult.getData();
-        if (!Boolean.TRUE.equals(aBoolean)) {
-            throw new BusinessException("线下钱包扣减预付余额、增加冻结金额失败");
+        if (balanceResult == null || balanceResult.getCode() != HttpStatus.SUCCESS_CODE || !Boolean.TRUE.equals(balanceResult.getData())) {
+            String errMsg = freezeDto.getRemark()+"失败";
+            log.error("{}:{}", errMsg, balanceResult != null ? balanceResult.getMessage(): "");
+            throw new BusinessException(errMsg);
         }
 
         // 3. 贸易合同该商品有采购数量，则更新采购数量（加回本单总量）
@@ -2428,7 +2429,7 @@ public class KwoTradeOrderService {
             //钱包退回金额
             WalletPrepaidDto walletFreeze = new WalletPrepaidDto();
 //            walletFreeze.setTTradeOrderId(kwoTradeOrder.getId());
-            walletFreeze.setOrderNo(String.valueOf(kwoTradeOrder.getId()));
+            walletFreeze.setOrderNo(kwoTradeOrder.getTOrderNo());
             walletFreeze.setProEntId(unitMap.get(String.valueOf(CooperateTypeEnum.PURCHASER.getCode())).getEntId());
             walletFreeze.setSupEntId(unitMap.get(String.valueOf(CooperateTypeEnum.SUPPLIER.getCode())).getEntId());
             walletFreeze.setOrderType(4);
@@ -2442,6 +2443,7 @@ public class KwoTradeOrderService {
 
             } else if (Objects.equals(kwoTradeOrder.getSettlement(), 2)) {
                 //预付制结算解冻
+                log.info("贸易订单号：{}，订单审核拒绝调用钱包服务解冻预付余额，参数：{}", walletFreeze.getOrderNo(),JSON.toJSONString(walletFreeze));
                 booleanBaseResult = paymentFeignService.updatePrepaidBalance(walletFreeze);
             }
             if (booleanBaseResult.getCode() != 60200) {
@@ -2834,12 +2836,13 @@ public class KwoTradeOrderService {
                 }
                 //钱包退回金额
                 WalletPrepaidDto unFreezePrepaidDto = new WalletPrepaidDto();
-                unFreezePrepaidDto.setOrderNo(String.valueOf(kwoTradeOrder.getId()));
+                unFreezePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
                 unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(CooperateTypeEnum.PURCHASER.getCode())).getEntId());
                 unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(CooperateTypeEnum.SUPPLIER.getCode())).getEntId());
                 unFreezePrepaidDto.setOrderType(4);
                 unFreezePrepaidDto.setTradeType(5);
                 unFreezePrepaidDto.setRemark("贸易订单：" + unFreezePrepaidDto.getOrderNo() + ",");
+                log.info("贸易订单号：{}，订单完结调用钱包服务解冻预付余额，参数：{}", unFreezePrepaidDto.getOrderNo(),JSON.toJSONString(unFreezePrepaidDto));
                 BaseResult<Object> unFreezeResult = paymentFeignService.updatePrepaidBalance(unFreezePrepaidDto);
                 if (unFreezeResult.getCode() != HttpStatus.SUCCESS_CODE) {
                     log.error("贸易订单号：{}，订单完结解冻失败,异常信息为：{}", unFreezePrepaidDto.getOrderNo(), unFreezeResult.getMessage());
@@ -2847,13 +2850,14 @@ public class KwoTradeOrderService {
                 }
                 //2计算订单金额
                 WalletPrepaidDto consumePrepaidDto = new WalletPrepaidDto();
-                unFreezePrepaidDto.setOrderNo(String.valueOf(kwoTradeOrder.getId()));
+                unFreezePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
                 unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(CooperateTypeEnum.PURCHASER.getCode())).getEntId());
                 unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(CooperateTypeEnum.SUPPLIER.getCode())).getEntId());
                 unFreezePrepaidDto.setOrderType(4);
                 unFreezePrepaidDto.setTradeType(6);
                 consumePrepaidDto.setTradeAmount(kwoTradeOrder.getPrice());
                 consumePrepaidDto.setRemark("贸易订单号：" + consumePrepaidDto.getOrderNo() + "，订单完结消费");
+                log.info("贸易订单号：{}，订单完结调用钱包服务消费预付余额，参数：{}", consumePrepaidDto.getOrderNo(),JSON.toJSONString(consumePrepaidDto));
                 BaseResult<Object> consumeResult = paymentFeignService.updatePrepaidBalance(consumePrepaidDto);
                 if (consumeResult.getCode() != HttpStatus.SUCCESS_CODE) {
                     log.error("贸易订单号：{}，订单完结消费失败,异常信息为：{}", consumePrepaidDto.getOrderNo(), consumeResult.getMessage());

sckw-modules/sckw-order/src/main/java/com/sckw/order/task/TradeOrderTask.java

@@ -2,6 +2,7 @@ package com.sckw.order.task;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
@@ -104,6 +105,11 @@ public class TradeOrderTask {
 
                             kwoTradeOrder.setStatus(TradeOrderStatusEnum.SUCCESS.getCode());
                             kwoTradeOrderMapper.updateById(kwoTradeOrder);
+                            try {
+                                Boolean aBoolean = transportRemoteService.logisticOrderFinish(new OrderFinishParam(kwoTradeOrder.getId()));
+                            } catch (Exception e) {
+                                log.error("物流订单结算失败 {}",e.getMessage());
+                            }
                             kwoTradeOrder.setPrice(NumberUtil.mul(sum, kwoTradeOrderGoods.getUnitPrice()));
                             calculatePrepaidBalance(kwoTradeOrder,unitMap);
                         } catch (Exception ex) {
@@ -148,6 +154,11 @@ public class TradeOrderTask {
 
                                 kwoTradeOrder.setStatus(TradeOrderStatusEnum.SUCCESS.getCode());
                                 kwoTradeOrderMapper.updateById(kwoTradeOrder);
+                                try {
+                                    Boolean aBoolean = transportRemoteService.logisticOrderFinish(new OrderFinishParam(kwoTradeOrder.getId()));
+                                } catch (Exception e) {
+                                    log.error("物流订单结算失败 {}",e.getMessage());
+                                }
                                 kwoTradeOrder.setPrice(NumberUtil.mul(sum, kwoTradeOrderGoods.getUnitPrice()));
                                 calculatePrepaidBalance(kwoTradeOrder,unitMap);
                             } catch (Exception ex) {
@@ -191,13 +202,19 @@ public class TradeOrderTask {
                                 return;
                             }
                             Map<String, KwoTradeOrderUnit> unitMap = orderUnits.stream().collect(Collectors.toMap(KwoTradeOrderUnit::getUnitType, Function.identity(), (a, b) -> a));
-                            unFreezePrepaid(kwoTradeOrder,unitMap);
+//                            unFreezePrepaid(kwoTradeOrder,unitMap);
+                            calculatePrepaidBalance(kwoTradeOrder,unitMap);
                         }
                     }
                     if (Objects.equals(one.getKey(), TradeOrderStatusEnum.ING.getCode())) {
                         for (KwoTradeOrder kwoTradeOrder : value) {
                             kwoTradeOrder.setStatus(TradeOrderStatusEnum.DEAL.getCode());
                             kwoTradeOrderMapper.updateById(kwoTradeOrder);
+                            try {
+                                Boolean aBoolean = transportRemoteService.logisticOrderFinish(new OrderFinishParam(kwoTradeOrder.getId()));
+                            } catch (Exception e) {
+                                log.error("物流订单结算失败 {}",e.getMessage());
+                            }
                         }
                     }
                 }
@@ -219,12 +236,13 @@ public class TradeOrderTask {
                 }
                 //钱包退回金额
                 WalletPrepaidDto unFreezePrepaidDto = new WalletPrepaidDto();
-                unFreezePrepaidDto.setOrderNo(String.valueOf(kwoTradeOrder.getId()));
+                unFreezePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
                 unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(CooperateTypeEnum.PURCHASER.getCode())).getEntId());
                 unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(CooperateTypeEnum.SUPPLIER.getCode())).getEntId());
                 unFreezePrepaidDto.setOrderType(4);
                 unFreezePrepaidDto.setTradeType(5);
                 unFreezePrepaidDto.setRemark("贸易订单："+unFreezePrepaidDto.getOrderNo()+",");
+                log.info("贸易订单号：{}，订单完结调用钱包服务解冻预付余额，参数：{}", unFreezePrepaidDto.getOrderNo(),JSON.toJSONString(unFreezePrepaidDto));
                 BaseResult<Object> unFreezeResult = paymentFeignService.updatePrepaidBalance(unFreezePrepaidDto);
                 if(unFreezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                     log.error("贸易订单号：{}，订单完结解冻失败,异常信息为：{}",unFreezePrepaidDto.getOrderNo(),unFreezeResult.getMessage());
@@ -232,13 +250,14 @@ public class TradeOrderTask {
                 }
                 //2计算订单金额
                 WalletPrepaidDto consumePrepaidDto = new WalletPrepaidDto();
-                unFreezePrepaidDto.setOrderNo(String.valueOf(kwoTradeOrder.getId()));
+                unFreezePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
                 unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(CooperateTypeEnum.PURCHASER.getCode())).getEntId());
                 unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(CooperateTypeEnum.SUPPLIER.getCode())).getEntId());
                 unFreezePrepaidDto.setOrderType(4);
                 unFreezePrepaidDto.setTradeType(6);
                 consumePrepaidDto.setTradeAmount(kwoTradeOrder.getPrice());
                 consumePrepaidDto.setRemark("贸易订单号："+consumePrepaidDto.getOrderNo()+"，订单完结消费");
+                log.info("贸易订单号：{}，订单完结调用钱包服务消费预付余额，参数：{}", consumePrepaidDto.getOrderNo(),JSON.toJSONString(consumePrepaidDto));
                 BaseResult<Object> consumeResult = paymentFeignService.updatePrepaidBalance(consumePrepaidDto);
                 if(consumeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                     log.error("贸易订单号：{}，订单完结消费失败,异常信息为：{}",consumePrepaidDto.getOrderNo(),consumeResult.getMessage());
@@ -257,12 +276,13 @@ public class TradeOrderTask {
         }
         //钱包退回金额
         WalletPrepaidDto unFreezePrepaidDto = new WalletPrepaidDto();
-        unFreezePrepaidDto.setOrderNo(String.valueOf(kwoTradeOrder.getId()));
+        unFreezePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
         unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(CooperateTypeEnum.PURCHASER.getCode())).getEntId());
         unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(CooperateTypeEnum.SUPPLIER.getCode())).getEntId());
         unFreezePrepaidDto.setOrderType(4);
         unFreezePrepaidDto.setTradeType(5);
         unFreezePrepaidDto.setRemark("贸易订单："+unFreezePrepaidDto.getOrderNo()+",");
+        log.info("贸易订单号：{}，订单完结调用钱包服务解冻预付余额，参数：{}", unFreezePrepaidDto.getOrderNo(),JSON.toJSONString(unFreezePrepaidDto));
         BaseResult<Object> unFreezeResult = paymentFeignService.updatePrepaidBalance(unFreezePrepaidDto);
         if(unFreezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
             log.error("贸易订单号：{}，订单完结解冻失败,异常信息为：{}",unFreezePrepaidDto.getOrderNo(),unFreezeResult.getMessage());

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsRoleService.java

@@ -130,7 +130,7 @@ public class KwsRoleService {
         roleBindMenuReqVo.setEntId(reqVo.getEntId());
         roleBindMenuReqVo.setMenuIds(reqVo.getMenuIds());
         kwsMenuService.roleBindMenu(roleBindMenuReqVo);
-
+        reqVo.setVisiblePersonal(true);
         /*3、设置数据权限*/
         if (reqVo.getVisiblePersonal()) {
             //只能看见自己的数据则不管

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/UnloadingHandler.java

@@ -217,10 +217,11 @@ public class UnloadingHandler extends AbstractWaybillOrderHandler<WaybillOrderUn
             WalletPayableDto unFreezePayableDto = new WalletPayableDto();
             unFreezePayableDto.setConsignEntId(map.get(1));
             unFreezePayableDto.setCarriageEntId(map.get(2));
-            unFreezePayableDto.setOrderNo(String.valueOf(logisticsOrder.getId()));
+            unFreezePayableDto.setOrderNo(logisticsOrder.getLOrderNo());
             unFreezePayableDto.setOrderType(5);
             unFreezePayableDto.setTradeType(5);
             unFreezePayableDto.setRemark("物流订单号："+unFreezePayableDto.getOrderNo()+"，订单完结解冻");
+            log.info("物流订单号：{}，订单完结解冻进行中运费，参数：{}", unFreezePayableDto.getOrderNo(),JSON.toJSONString(unFreezePayableDto));
             BaseResult<Object> unFreezeResult = paymentFeignService.updatePayable(unFreezePayableDto);
             if(unFreezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                 log.error("物流订单号：{}，订单完结解冻失败,异常信息为：{}",unFreezePayableDto.getOrderNo(),unFreezeResult.getMessage());
@@ -230,11 +231,12 @@ public class UnloadingHandler extends AbstractWaybillOrderHandler<WaybillOrderUn
             WalletPayableDto consumePayableDto = new WalletPayableDto();
             consumePayableDto.setConsignEntId(map.get(1));
             consumePayableDto.setCarriageEntId(map.get(2));
-            consumePayableDto.setOrderNo(String.valueOf(logisticsOrder.getId()));
+            consumePayableDto.setOrderNo(logisticsOrder.getLOrderNo());
             consumePayableDto.setOrderType(5);
             consumePayableDto.setTradeType(6);
             consumePayableDto.setTradeAmount(logisticsOrder.getTotalLoadAmount().multiply(logisticsOrder.getPrice()));
             consumePayableDto.setRemark("物流订单号："+consumePayableDto.getOrderNo()+"，订单完结消费");
+            log.info("物流订单号：{}，订单完结消费，参数：{}", consumePayableDto.getOrderNo(),JSON.toJSONString(consumePayableDto));
             BaseResult<Object> consumeResult = paymentFeignService.updatePayable(consumePayableDto);
             if(consumeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                 log.error("物流订单号：{}，订单完结消费失败,异常信息为：{}",unFreezePayableDto.getOrderNo(),consumeResult.getMessage());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/LogisticData.java

@@ -19,9 +19,9 @@ public  class LogisticData implements Serializable {
     private static final long serialVersionUID = -4781207406119020652L;
 
     /**
-     * 物流订单id
+     * 物流订单编号
      */
-    private Long lOrderId;
+    private String lOrderNo;
         /**
          * 合同id
          */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/WaybillOrderReq.java

@@ -39,6 +39,9 @@ public class WaybillOrderReq extends PageReq implements Serializable {
      */
     @Schema(description = "运单号")
     private String waybillNo;
+
+    @Schema(description = "贸易订单号")
+    private String tradeOrderNo;
     /**
      * 商品名称
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtLogisticsOrderRepository.java

@@ -158,4 +158,9 @@ public class KwtLogisticsOrderRepository extends ServiceImpl<KwtLogisticsOrderMa
     }
 
 
+    public List<KwtLogisticsOrder> queryTradeOrderNo(String tradeOrderNo) {
+        return list(Wrappers.<KwtLogisticsOrder>lambdaQuery()
+                .eq(KwtLogisticsOrder::getDelFlag,0)
+                .like(KwtLogisticsOrder::getTOrderNo, tradeOrderNo));
+    }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtAcceptCarriageOrderService.java

@@ -3324,11 +3324,12 @@ public class KwtAcceptCarriageOrderService {
                 WalletPayableDto payableUpdateDto = new WalletPayableDto();
                 payableUpdateDto.setConsignEntId(orderDTO.getConsignCompanyId());
                 payableUpdateDto.setCarriageEntId(x.getAcceptCompanyId());
-                payableUpdateDto.setOrderNo(String.valueOf(x.getLOrderId()));
+                payableUpdateDto.setOrderNo(x.getLOrderNo());
                 payableUpdateDto.setOrderType(5);
                 payableUpdateDto.setTradeType(4);
                 payableUpdateDto.setTradeAmount(x.getPrice().multiply(x.getAmount()));
-                payableUpdateDto.setRemark("物流订单号："+x.getLOrderId()+"，下单冻结");
+                payableUpdateDto.setRemark("物流订单号："+x.getLOrderNo()+"，下单冻结");
+                log.info("物流订单号：{}，订单下单冻结，参数：{}", payableUpdateDto.getOrderNo(), com.alibaba.fastjson2.JSON.toJSONString(payableUpdateDto));
                 BaseResult<Object> freezeResult = paymentFeignService.updatePayable(payableUpdateDto);
                 if(freezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                     log.error("物流订单号：{}，下单冻结失败,异常信息为：{}",payableUpdateDto.getOrderNo(),freezeResult.getMessage());
@@ -3660,7 +3661,7 @@ public class KwtAcceptCarriageOrderService {
     private static void setLogisticOrderInfo(AddLogisticOrderDTO orderDTO, LogisticData x, Long lOrderId, String lOrderNo, List<KwtLogisticsOrder> saveLogisticsOrderList,String distance, Map<Long, ContractCommonInfoResDto> longContractCommonInfoResDtoMap ) {
         KwtLogisticsOrder kwtLogisticsOrder = new KwtLogisticsOrder();
         kwtLogisticsOrder.setId(lOrderId);
-        x.setLOrderId(lOrderId);
+        x.setLOrderNo(lOrderNo);
         kwtLogisticsOrder.setEntId(orderDTO.getEntId());
         kwtLogisticsOrder.setType(String.valueOf(x.getType()));
         kwtLogisticsOrder.setTOrderId(orderDTO.getTradeOrderId());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -3788,10 +3788,11 @@ public class KwtLogisticsConsignmentService {
                 WalletPayableDto unFreezePayableDto = new WalletPayableDto();
                 unFreezePayableDto.setConsignEntId(map.get(1));
                 unFreezePayableDto.setCarriageEntId(map.get(2));
-                unFreezePayableDto.setOrderNo(String.valueOf(logisticsOrder.getId()));
+                unFreezePayableDto.setOrderNo(logisticsOrder.getLOrderNo());
                 unFreezePayableDto.setOrderType(5);
                 unFreezePayableDto.setTradeType(5);
                 unFreezePayableDto.setRemark("物流订单号：" + unFreezePayableDto.getOrderNo() + "，订单完结解冻");
+                log.info("物流订单号：{}，订单完结解冻进行中运费，参数：{}", unFreezePayableDto.getOrderNo(),JSON.toJSONString(unFreezePayableDto));
                 BaseResult<Object> unFreezeResult = paymentFeignService.updatePayable(unFreezePayableDto);
                 if(unFreezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                     log.error("物流订单号：{}，订单完结解冻失败,异常信息为：{}",unFreezePayableDto.getOrderNo(),unFreezeResult.getMessage());
@@ -3801,7 +3802,7 @@ public class KwtLogisticsConsignmentService {
                 WalletPayableDto consumePayableDto = new WalletPayableDto();
                 consumePayableDto.setConsignEntId(map.get(1));
                 consumePayableDto.setCarriageEntId(map.get(2));
-                consumePayableDto.setOrderNo(String.valueOf(logisticsOrder.getId()));
+                consumePayableDto.setOrderNo(logisticsOrder.getLOrderNo());
                 consumePayableDto.setOrderType(5);
                 consumePayableDto.setTradeType(6);
                 if (org.apache.commons.lang3.StringUtils.equals(logisticsOrder.getBillingMode(), DictEnum.CHARGING_TYPE_1.getValue())) {
@@ -3814,6 +3815,7 @@ public class KwtLogisticsConsignmentService {
                     consumePayableDto.setTradeAmount(actualPrice);
                 }
                 consumePayableDto.setRemark("物流订单号：" + consumePayableDto.getOrderNo() + "，订单完结消费");
+                log.info("物流订单号：{}，订单完结消费，参数：{}", consumePayableDto.getOrderNo(),JSON.toJSONString(consumePayableDto));
                 BaseResult<Object> consumeResult = paymentFeignService.updatePayable(consumePayableDto);
                 if(consumeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                     log.error("物流订单号：{}，订单完结消费失败,异常信息为：{}",unFreezePayableDto.getOrderNo(),consumeResult.getMessage());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -3627,7 +3627,18 @@ public class KwtWaybillOrderV1Service {
                 return Collections.emptySet();
             }
         }
-
+        // 如果指定了贸易订单号，根据贸易订单号查询
+        if (StringUtils.isNotBlank(req.getTradeOrderNo())) {
+            Set<Long> orderIdsByTradeOrderNo = getLogOrderIdsByTradeOrderNo(req.getTradeOrderNo());
+            log.debug("根据贸易订单号查询到ID数量: {}", orderIdsByTradeOrderNo.size());
+            if (CollectionUtils.isNotEmpty(orderIdsByTradeOrderNo)) {
+                intersectLogOrderIds(logOrderIds, orderIdsByTradeOrderNo);
+                log.debug("贸易订单号查询后，当前物流订单ID数量: {}", logOrderIds.size());
+            } else {
+                log.debug("根据贸易订单号未查询到数据，返回空集合");
+                return Collections.emptySet();
+            }
+        }
         // 如果指定了结算方式，根据结算方式查询
         if (StringUtils.isNotBlank(req.getBillingMethod())) {
             Set<Long> orderIdsByBilling = getLogOrderIdsByBillingMethod(req.getBillingMethod());
@@ -3897,7 +3908,19 @@ public class KwtWaybillOrderV1Service {
         orderIds.add(logisticsOrder.getId());
         return orderIds;
     }
+    /**
+     * 根据贸易订单号获取物流订单ID集合
+     */
+    private Set<Long> getLogOrderIdsByTradeOrderNo(String tradeOrderNo) {
+        List<KwtLogisticsOrder> logisticsOrders = logisticsOrderRepository.queryTradeOrderNo(tradeOrderNo);
+        if (CollectionUtils.isEmpty(logisticsOrders)) {
+            return Collections.emptySet();
+        }
 
+        return logisticsOrders.stream()
+                .map(KwtLogisticsOrder::getId)
+                .collect(Collectors.toSet());
+    }
     /**
      * 根据结算方式获取物流订单ID集合
      */
@@ -4574,6 +4597,11 @@ public class KwtWaybillOrderV1Service {
                     contractGoodsDto.getPrice().multiply(subtask.getLoadAmount()) : BigDecimal.ZERO;
             resp.setActualPrice(actualPrice.setScale(2, RoundingMode.HALF_UP).toPlainString() +"元");
             resp.setActualGoodsPrice(actualGoodsPrice.setScale(2, RoundingMode.HALF_UP).toPlainString()+"元");
+            // 票据信息
+            String shipmentTicketKey = subtask.getWOrderId() + "-" + AddressTypeEnum.SHIPMENT.getCode();
+            KwtWaybillOrderTicket tareAmountTicket = ticketMap.getOrDefault(shipmentTicketKey, new KwtWaybillOrderTicket());
+            resp.setTareAmount(tareAmountTicket.getTareAmount());
+            resp.setGrossAmount(tareAmountTicket.getGrossAmount());
         }else if (org.apache.commons.lang3.StringUtils.equals(logOrder.getBillingMode(), DictEnum.CHARGING_TYPE_2.getValue())){
             BigDecimal actualPrice = Objects.nonNull(logOrder.getPrice()) && Objects.nonNull(subtask.getUnloadAmount()) ?
                     logOrder.getPrice().multiply(subtask.getUnloadAmount()) : BigDecimal.ZERO;
@@ -4581,6 +4609,12 @@ public class KwtWaybillOrderV1Service {
                     contractGoodsDto.getPrice().multiply(subtask.getUnloadAmount()) : BigDecimal.ZERO;
             resp.setActualPrice(actualPrice.setScale(2, RoundingMode.HALF_UP).toPlainString()+"元");
             resp.setActualGoodsPrice(actualGoodsPrice.setScale(2, RoundingMode.HALF_UP).toPlainString()+"元");
+
+            String takeTicketKey = subtask.getWOrderId() + "-" + AddressTypeEnum.TAKE.getCode();
+            KwtWaybillOrderTicket grossAmountTicket = ticketMap.getOrDefault(takeTicketKey, new KwtWaybillOrderTicket());
+            resp.setTareAmount(grossAmountTicket.getTareAmount());
+            resp.setGrossAmount(grossAmountTicket.getGrossAmount());
+
         }
         resp.setTruckNo(billOrder.getTruckNo());
         resp.setCarAxis(truck != null ? truck.getCarAxis() : "");
@@ -4634,14 +4668,6 @@ public class KwtWaybillOrderV1Service {
                     .ifPresent(x -> resp.setSupplyEntName(x.getFirmName()));
         }
 
-        // 票据信息
-        String shipmentTicketKey = subtask.getWOrderId() + "-" + AddressTypeEnum.SHIPMENT.getCode();
-        String takeTicketKey = subtask.getWOrderId() + "-" + AddressTypeEnum.TAKE.getCode();
-        KwtWaybillOrderTicket tareAmountTicket = ticketMap.getOrDefault(shipmentTicketKey, new KwtWaybillOrderTicket());
-        KwtWaybillOrderTicket grossAmountTicket = ticketMap.getOrDefault(takeTicketKey, new KwtWaybillOrderTicket());
-        resp.setTareAmount(tareAmountTicket.getTareAmount());
-        resp.setGrossAmount(grossAmountTicket.getGrossAmount());
-
         // 状态信息
         resp.setStatus(subtask.getStatus());
         resp.setStatusDesc(CarWaybillV1Enum.geDesc(subtask.getStatus()));
@@ -4863,10 +4889,11 @@ public class KwtWaybillOrderV1Service {
                 WalletPayableDto unFreezePayableDto = new WalletPayableDto();
                 unFreezePayableDto.setConsignEntId(map.get(1));
                 unFreezePayableDto.setCarriageEntId(map.get(2));
-                unFreezePayableDto.setOrderNo(String.valueOf(kwtLogistics.getId()));
+                unFreezePayableDto.setOrderNo(kwtLogistics.getLOrderNo());
                 unFreezePayableDto.setOrderType(5);
                 unFreezePayableDto.setTradeType(5);
                 unFreezePayableDto.setRemark("物流订单号：" + unFreezePayableDto.getOrderNo() + "，订单完结解冻");
+                log.info("物流订单号：{}，订单完结解冻进行中运费，参数：{}", unFreezePayableDto.getOrderNo(),JSON.toJSONString(unFreezePayableDto));
                 BaseResult<Object> unFreezeResult = paymentFeignService.updatePayable(unFreezePayableDto);
                 if(unFreezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                     log.error("物流订单号：{}，订单完结解冻失败,异常信息为：{}",unFreezePayableDto.getOrderNo(),unFreezeResult.getMessage());
@@ -4876,15 +4903,16 @@ public class KwtWaybillOrderV1Service {
                 WalletPayableDto consumePayableDto = new WalletPayableDto();
                 consumePayableDto.setConsignEntId(map.get(1));
                 consumePayableDto.setCarriageEntId(map.get(2));
-                consumePayableDto.setOrderNo(String.valueOf(kwtLogistics.getId()));
+                consumePayableDto.setOrderNo(kwtLogistics.getLOrderNo());
                 consumePayableDto.setOrderType(5);
                 consumePayableDto.setTradeType(6);
                 consumePayableDto.setTradeAmount(kwtLogistics.getTotalUnloadAmount().multiply(kwtLogistics.getPrice()));
                 consumePayableDto.setRemark("物流订单号：" + consumePayableDto.getOrderNo() + "，订单完结消费");
+                log.info("物流订单号：{}，订单完结消费，参数：{}", consumePayableDto.getOrderNo(),JSON.toJSONString(consumePayableDto));
                 BaseResult<Object> consumeResult = paymentFeignService.updatePayable(consumePayableDto);
                 if(consumeResult.getCode()!= HttpStatus.SUCCESS_CODE){
-                    log.error("物流订单号：{}，订单完结消费失败,异常信息为：{}",unFreezePayableDto.getOrderNo(),consumeResult.getMessage());
-                    throw new BusinessException("物流订单号："+unFreezePayableDto.getOrderNo()+"，订单完结消费失败");
+                    log.error("物流订单号：{}，订单完结消费失败,异常信息为：{}",consumePayableDto.getOrderNo(),consumeResult.getMessage());
+                    throw new BusinessException("物流订单号："+consumePayableDto.getOrderNo()+"，订单完结消费失败");
                 }
             }
         }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/task/LogisticsOrderCompletionTask.java

@@ -195,10 +195,11 @@ public class LogisticsOrderCompletionTask {
                 WalletPayableDto unFreezePayableDto = new WalletPayableDto();
                 unFreezePayableDto.setConsignEntId(map.get(1));
                 unFreezePayableDto.setCarriageEntId(map.get(2));
-                unFreezePayableDto.setOrderNo(String.valueOf(logisticsOrder.getId()));
+                unFreezePayableDto.setOrderNo(logisticsOrder.getLOrderNo());
                 unFreezePayableDto.setOrderType(5);
                 unFreezePayableDto.setTradeType(5);
                 unFreezePayableDto.setRemark("物流订单号：" + unFreezePayableDto.getOrderNo() + "，订单完结解冻");
+                log.info("物流订单号：{}，订单完结解冻进行中运费，参数：{}", unFreezePayableDto.getOrderNo(),JSON.toJSONString(unFreezePayableDto));
                 BaseResult<Object> unFreezeResult = paymentFeignService.updatePayable(unFreezePayableDto);
                 if(unFreezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                     log.error("物流订单号：{}，订单完结解冻失败,异常信息为：{}",unFreezePayableDto.getOrderNo(),unFreezeResult.getMessage());
@@ -208,7 +209,7 @@ public class LogisticsOrderCompletionTask {
                 WalletPayableDto consumePayableDto = new WalletPayableDto();
                 consumePayableDto.setConsignEntId(map.get(1));
                 consumePayableDto.setCarriageEntId(map.get(2));
-                consumePayableDto.setOrderNo(String.valueOf(logisticsOrder.getId()));
+                consumePayableDto.setOrderNo(logisticsOrder.getLOrderNo());
                 consumePayableDto.setOrderType(5);
                 consumePayableDto.setTradeType(6);
                 if (org.apache.commons.lang3.StringUtils.equals(logisticsOrder.getBillingMode(), DictEnum.CHARGING_TYPE_1.getValue())) {
@@ -221,10 +222,11 @@ public class LogisticsOrderCompletionTask {
                     consumePayableDto.setTradeAmount(actualPrice);
                 }
                 consumePayableDto.setRemark("物流订单号：" + consumePayableDto.getOrderNo() + "，订单完结消费");
+                log.info("物流订单号：{}，订单完结消费，参数：{}", consumePayableDto.getOrderNo(),JSON.toJSONString(consumePayableDto));
                 BaseResult<Object> consumeResult = paymentFeignService.updatePayable(consumePayableDto);
                 if(consumeResult.getCode()!= HttpStatus.SUCCESS_CODE){
-                    log.error("物流订单号：{}，订单完结消费失败,异常信息为：{}",unFreezePayableDto.getOrderNo(),consumeResult.getMessage());
-                    throw new BusinessException("物流订单号："+unFreezePayableDto.getOrderNo()+"，订单完结消费失败");
+                    log.error("物流订单号：{}，订单完结消费失败,异常信息为：{}",consumePayableDto.getOrderNo(),consumeResult.getMessage());
+                    throw new BusinessException("物流订单号："+consumePayableDto.getOrderNo()+"，订单完结消费失败");
                 }
             }
         }

sckw-modules/sckw-transport/src/main/resources/bootstrap-cxf.yml

@@ -3,16 +3,16 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: @nacos.server@
+        server-addr: 118.116.4.155:8848
         # 命名空间
-        namespace: @nacos.namespace@
+        namespace: sckw-ng-service-platform-xf
         # 共享配置
         group: sckw-ng-service-platform
       config:
         # 配置中心地址
-        server-addr: @nacos.server@
+        server-addr: 118.116.4.155:8848
         # 命名空间
-        namespace: @nacos.namespace@
+        namespace: sckw-ng-service-platform-xf
         # 共享配置
         group: sckw-ng-service-platform
         # 配置文件格式