司机端无接单位置上报

performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java

@@ -6,10 +6,7 @@ import com.clx.order.enums.OrderEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
-import com.clx.performance.enums.OrderChildEnum;
-import com.clx.performance.enums.OrderGoodsStatusEnum;
-import com.clx.performance.enums.PendingOrderWayStatusEnum;
-import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
@@ -160,14 +157,51 @@ public class OrderCancelComponent {
         }
     }
 
-    public void backFillTonnage(OrderGoods orderGoods, BigDecimal weight) {
-        if (orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
-                || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
-        ) {
-
-
-
-
-        }
-    }
+//    public void backFillTonnage(OrderGoods orderGoods, BigDecimal weight) {
+//        if (orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
+//                || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
+//        ) {
+//
+//            //返回到货单
+//            orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(weight,weight, orderGoods.getId());
+//
+//            if (!orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
+//                for (OrderGoods orderGoods : orderGoodsList) {
+//                    truckDemandMap.put(orderGoods.getTruckDemand(),
+//                            truckDemandMap.get(orderGoods.getTruckDemand())
+//                                    .add(orderGoods.getResidueTransportWeight()));
+//                }
+//            } else {
+//                for (OrderGoods orderGoods : orderGoodsList) {
+//                    vehicleUsageMap.put(orderGoods.getVehicleUsage(),
+//                            vehicleUsageMap.get(orderGoods.getVehicleUsage())
+//                                    .add(orderGoods.getResidueTransportWeight()));
+//                }
+//            }
+//            rollbackOrderWeightParam = new Ro
+//            //归还吨数
+//            if (!orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
+//                rollbackOrderWeightParam.setOrderNo(orderNo);
+//                if (truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())) {
+//                    rollbackOrderWeightParam.setResidueWeight(truckDemandMap.get(truckDemand));
+//                    rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
+//                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(truckDemandMap.get(truckDemand));
+//                }
+//                if (truckDemand.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
+//                    rollbackOrderWeightParam.setResidueWeight(truckDemandMap.get(truckDemand));
+//                    rollbackOrderWeightParam.setOwnResidueCarryWeight(truckDemandMap.get(truckDemand));
+//                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
+//                }
+//            } else {
+//                BigDecimal platformResidueSum = vehicleUsageMap.get(1);
+//                BigDecimal ownResidueSum = vehicleUsageMap.get(2);
+//                BigDecimal residueSum = platformResidueSum.add(ownResidueSum);
+//                rollbackOrderWeightParam.setOrderNo(orderNo);
+//                rollbackOrderWeightParam.setResidueWeight(residueSum);
+//                rollbackOrderWeightParam.setPlatformResidueCarryWeight(platformResidueSum);
+//                rollbackOrderWeightParam.setOwnResidueCarryWeight(ownResidueSum);
+//            }
+//
+//        }
+//    }
 }

performance-web/src/main/java/com/clx/performance/controller/app/AppGoodsOrderController.java

@@ -11,8 +11,11 @@ import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -32,17 +35,13 @@ import java.util.List;
 @RestController
 @RequestMapping("/app/goodsOrder")
 @Validated
+@AllArgsConstructor
 @Api(tags = "APP-货单")
 public class AppGoodsOrderController {
 
-    @Autowired
-    OrderGoodsService orderGoodsService;
+    private final OrderGoodsService orderGoodsService;
 
-    @Autowired
-    OrderGoodsMapper orderGoodsMapper;
-
-    @Autowired
-    OrderGoodsTruckBindService orderGoodsTruckBindService;
+    private final OrderGoodsTruckBindService orderGoodsTruckBindService;
 
 
     @ApiOperation(value = "查看货单详情", notes = "<br>By:胡宇帆")
@@ -64,7 +63,8 @@ public class AppGoodsOrderController {
 
     @ApiOperation(value = "司机端无接单位置上报", notes = "<br>By:胡宇帆")
     @GetMapping("/getCancelOrderGoods")
-    public Result<List<OrderGoods>> getCancelOrderGoods(@RequestParam(value = "userNo") Long userNo) {
-        return Result.ok(orderGoodsTruckBindService.getCancelOrderGoods(userNo));
+    public Result<List<OrderGoods>> getCancelOrderGoods() {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        return Result.ok(orderGoodsTruckBindService.getCancelOrderGoods(loginUserInfo.getUserNo()));
     }
 }

performance-web/src/main/java/com/clx/performance/listener/OrderCancelHandler.java

@@ -33,11 +33,8 @@ public class OrderCancelHandler {
     public void onMessage(String message) {
         log.info("处理订单取消监听器执行,订单No为{}", message);
         OrderCancelParam param = JSONUtil.toBean(message, OrderCancelParam.class);
-        if (ObjectUtil.equals(param.getCancelType(), 1)) {
         orderCancelService.orderCancelProcess(param);
-        } else {
-            orderCancelService.orderCancelProcess(param);
-        }
+
 //        //货主端取消订单进行违约计费
 //        if(Objects.equals(param.getCreateByType(), RoleEnum.Type.OWNER)){
 //            breakContractSettlementOwnerService.saveSettlementOwnerForCancelOrder(param.getOrderNo());