123

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java

@@ -258,9 +258,14 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
         String orderNoStr = null;
         if (StringUtils.isNotBlank(refuseReceiveIds)){
             List<Integer> refuseReceiveIdList =Arrays.asList(refuseReceiveIds.split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
-            receive.setStatus(2);
+            if (status.equals( VehiclePublishReceiveDTO.CANCEL)){
+                receive.setStatus(4);
+            }else {
+                receive.setStatus(2);
+            }
+
             refuseNumber+=updReceive(refuseReceiveIdList,receive);
-            if (status.equals( VehiclePublishReceiveDTO.REFUSE)){
+            if (status.equals( VehiclePublishReceiveDTO.REFUSE) || status.equals( VehiclePublishReceiveDTO.CANCEL)){
                 orderNoStr=mapper.getOrderNoStr(null,refuseReceiveIdList);
             }
         }
@@ -507,7 +512,31 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
 
 
     public  void  canelReceiveOrder(String  orderNo){
+        VehiclePublishFindDTO publishFindDTO = new VehiclePublishFindDTO();
+        publishFindDTO.setOrderNo(orderNo);
+        List<ReceiveVo> list = getListByReceive(publishFindDTO);
+        if (list.size() > 0){
+            ReceiveVo receiveVo = list.get(0);
+            String statusStr = receiveVo.getStatusStr();
+            String ids = receiveVo.getIds();
 
+            List<Integer> statusIds = Arrays.asList(statusStr.split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
+            Long waitPayNum = statusIds.stream().filter(x -> x == 0).count();
+            if (waitPayNum > 0){
+                VehiclePublishReceive receive = new VehiclePublishReceive();
+                List<Integer> idList = Arrays.asList(ids.split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
+                receive.setStatus(4);
+                updReceive(idList,receive);
+            }else {
+                Integer publishId = receiveVo.getPublishId();
+                VehiclePublishReceiveDTO publishReceiveDTO = new  VehiclePublishReceiveDTO();
+                publishReceiveDTO.setRefuseReceiveIds(ids);
+                publishReceiveDTO.setPublishId(publishId);
+                publishReceiveDTO.setType(2);
+                publishReceiveDTO.setStatus(VehiclePublishReceiveDTO.CANCEL);
+                updOrderReceive(publishReceiveDTO);
+            }
+            }
     }
 
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/AppVehiclePublishReceiveController.java

@@ -84,6 +84,14 @@ public class AppVehiclePublishReceiveController extends BaseController<VehiclePu
     }
 
 
+    @PostMapping("canelReceiveOrder")
+    @ApiModelProperty("取消我的接单")
+    public  ObjectRestResponse canelReceiveOrder(@RequestBody VehiclePublishReceiveDTO publishReceiveDTO){
+        baseBiz.canelReceiveOrder(publishReceiveDTO.getOrderNo());
+        return ObjectRestResponse.succ();
+    }
+
+