修改BUG

performance-api/src/main/java/com/clx/performance/vo/pc/OwnerAccountAllVO.java

 package com.clx.performance.vo.pc;
 
+import com.msl.common.convertor.field.Converted;
 import lombok.Data;
 
 @Data
 public class OwnerAccountAllVO {
 
+    @Converted(isDynamic = true)
     private OwnerAccountVO marginAccount;
 
+    @Converted(isDynamic = true)
     private OwnerAccountVO prepaidFreightAccount;
 }

performance-web/src/main/java/com/clx/performance/controller/feign/OrderCancelFeignController.java

@@ -26,7 +26,7 @@ public class OrderCancelFeignController {
 
     private final OrderCancelService orderCancelService;
 
-    @ApiOperation(value = "货主端订单取消", notes = "<br>By:胡宇帆")
+    @ApiOperation(value = "承运单发起订单取消货主端进行确认", notes = "<br>By:胡宇帆")
     @PostMapping("/orderCancel")
     public Result<Object> orderCancel(@RequestBody OrderCancelFeignParam param) {
 //        OrderCancelParam cancelParam = new OrderCancelParam();

performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java

@@ -74,9 +74,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
     @Transactional(rollbackFor = Exception.class)
     public void ownerConfirmCancelOrderPre(String orderNo) {
         List<OrderGoods> orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
+        Integer orderStatusCode = OrderEnum.Status.CANCELED.getCode();
         if (CollectionUtil.isEmpty(orderGoodsList)) {
             //未产生货单
-            Result<Object> result = orderFeign.updateOrderStatusByOrderNo(orderNo, OrderEnum.Status.CANCELED.getCode());
+            Result<Object> result = orderFeign.updateOrderStatusByOrderNo(orderNo, orderStatusCode);
             if (!result.succeed()) {
                 throw new RuntimeException("货主取消订单失败,原因：远程调用取消订单失败");
             }
@@ -95,10 +96,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
         if (CollectionUtil.isEmpty(orderChildrenList)) {
             //说明此刻未产生运单
-            Result<Object> result = orderFeign.updateOrderStatusByOrderNo(orderNo, OrderEnum.Status.CANCELED.getCode());
-            if (!result.succeed()) {
-                throw new RuntimeException("货主取消订单失败,原因：远程调用取消订单失败");
-            }
             List<Integer> ids = new LinkedList<>();
             for (OrderGoods orderGoods : orderGoodsList) {
                 if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
@@ -125,6 +122,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 orderChildDao.batchUpdateOrderChildStatus(
                         OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), "系统取消",
                         ids);
+                orderStatusCode = OrderEnum.Status.COMPLETED.getCode();
             }
 
             Map<String, List<OrderChild>> orderChildMap = orderChildrenList.stream()
@@ -175,7 +173,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
         ownerAccountService.ownerAccountThaw(thawAccountParam);
         this.ownerConfirmCancelProcess(orderNo);
-        Result<Object> result = orderFeign.updateOrderStatusByOrderNo(orderNo, OrderEnum.Status.COMPLETED.getCode());
+        Result<Object> result = orderFeign.updateOrderStatusByOrderNo(orderNo, orderStatusCode);
         if (!result.succeed()) {
             throw new RuntimeException("货主取消订单失败,原因：远程调用取消订单失败");
         }

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -256,7 +256,7 @@ public class OrderGoodsSqlProvider {
         return sql;
     }
 
-    public String pageOrderGoodsList(@Param("param") PageOrderGoodsListParam param) {
+    public String getCancelOrderGoods(@Param("param") PageOrderGoodsListParam param) {
         String sql = " select a.id, a.order_no," +
                     " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
                     " if(a.residue_transport_weight < 0, '0', a.residue_transport_weight) as residue_transport_weight ,a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +