Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into test

performance-api/src/main/java/com/clx/performance/vo/app/OrderGoodsAPPVO.java

@@ -105,5 +105,7 @@ public class OrderGoodsAPPVO {
     @ApiModelProperty("创建时间")
     private String createTime;
 
+    @ApiModelProperty("车牌号")
+    private String truckNo;
 
 }
\ No newline at end of file

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/app/AppGoodsOrderController.java

@@ -63,7 +63,7 @@ public class AppGoodsOrderController {
 
     @ApiOperation(value = "司机端无接单位置上报", notes = "<br>By:胡宇帆")
     @GetMapping("/getCancelOrderGoods")
-    public Result<List<OrderGoods>> getCancelOrderGoods(@RequestParam(value = "userNo") Long userNo) {
+    public Result<List<OrderGoodsAPPVO>> getCancelOrderGoods(@RequestParam(value = "userNo") Long userNo) {
         return Result.ok(orderGoodsTruckBindService.getCancelOrderGoods(userNo));
     }
 }

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/dao/OrderGoodsDao.java

 package com.clx.performance.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.mapper.OrderGoodsMapper;
@@ -82,4 +83,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
     boolean batchUpdateOrderGoodsWeight(BigDecimal residueWeight, List<Integer> ids);
 
     List<OrderGoods> getOrderGoodsListByOrderNoAndStatus(String orderNo);
+
+    List<OrderGoodsAPPVO> getCancelOrderGoods(List<OrderGoodsTruckBind> list);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -3,6 +3,7 @@ package com.clx.performance.dao.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.dao.OrderGoodsDao;
@@ -222,5 +223,10 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
         );
     }
 
+    @Override
+    public List<OrderGoodsAPPVO> getCancelOrderGoods(List<OrderGoodsTruckBind> param) {
+        return baseMapper.getCancelOrderGoods(param);
+    }
+
 
 }

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -3,6 +3,7 @@ package com.clx.performance.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.model.OrderGoods;
@@ -78,4 +79,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
 
     @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus")
     Integer updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(@Param(value = "residueWeight") BigDecimal residueWeight,@Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value = "status") Integer status,@Param(value = "id") Integer id);
+
+    @SelectProvider(type = OrderGoodsSqlProvider.class, method = "getCancelOrderGoods")
+    List<OrderGoodsAPPVO> getCancelOrderGoods(@Param(value = "param") List<OrderGoodsTruckBind> param);
 }

performance-web/src/main/java/com/clx/performance/service/OrderGoodsTruckBindService.java

 package com.clx.performance.service;
 
-import com.clx.performance.model.OrderGoods;
+import com.clx.performance.vo.app.OrderGoodsAPPVO;
 
 import java.util.List;
 
@@ -8,5 +8,5 @@ public interface OrderGoodsTruckBindService {
 
     List<Integer> getTrucksByOrderGoodsNo(String orderGoodsNo);
 
-    List<OrderGoods> getCancelOrderGoods(Long userNo);
+    List<OrderGoodsAPPVO> getCancelOrderGoods(Long userNo);
 }

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/service/impl/OrderGoodsTruckBindServiceImpl.java

@@ -7,6 +7,7 @@ import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.service.OrderGoodsTruckBindService;
+import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.user.feign.TruckFeign;
 import com.clx.user.vo.app.driver.truck.DriverTruckAppVo;
 import com.msl.common.exception.ServiceSystemException;
@@ -39,7 +40,7 @@ public class OrderGoodsTruckBindServiceImpl implements OrderGoodsTruckBindServic
     }
 
     @Override
-    public List<OrderGoods> getCancelOrderGoods(Long userNo) {
+    public List<OrderGoodsAPPVO> getCancelOrderGoods(Long userNo) {
         Result<List<DriverTruckAppVo>> result = truckFeign.driverTruckList(userNo);
         if (!result.succeed() || CollectionUtil.isEmpty(result.getData())) {
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
@@ -54,9 +55,8 @@ public class OrderGoodsTruckBindServiceImpl implements OrderGoodsTruckBindServic
         if (CollectionUtil.isEmpty(list)) {
             return null;
         }
-        List<String> orderGoodsNoList = list.stream().map(OrderGoodsTruckBind::getOrderGoodsNo).collect(Collectors.toList());
 
-        return orderGoodsDao.selectListByOrderGoodsList(orderGoodsNoList);
+        return orderGoodsDao.getCancelOrderGoods(list);
     }
 
 

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

@@ -256,4 +256,25 @@ public class OrderGoodsSqlProvider {
         return sql;
     }
 
+    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," +
+                    " a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude," +
+                    "a.goods_id, a.goods_name, a.pending_order_way," +
+                    " date_format(a.directional_expire_time, '%Y-%m-%d %H:%i:%s') as directional_expire_time ," +
+                    " date_format(a.last_arrive_send_time, '%Y-%m-%d %H:%i:%s') as last_arrive_send_time ," +
+                    " date_format(a.pending_order_time, '%Y-%m-%d %H:%i:%s') as pending_order_time," +
+                    " date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time," +
+                    " date_format(a.modified_time, '%Y-%m-%d %H:%i:%s') as modified_time," +
+                    "a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name,a.pending_order_freight," +
+                    "a.user_no,a.user_name,a.stop_flag,a.batch_number,a.last_arrive_receive_time,a.last_load_time,a.last_order_time,a.vehicle_usage,ab.truck_no as truckNo"
+                + "from order_goods a left join order_goods_truck_bind ab on ab.order_goods_no = a.order_goods_no"
+                ;
+
+
+        return sql;
+    }
+
+
 }