修改接单

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/VehiclePublishReceiveDTO.java

 package com.xxfc.platform.vehicle.pojo.dto;
 
 
+import com.xxfc.platform.vehicle.entity.VehiclePublish;
 import com.xxfc.platform.vehicle.entity.VehiclePublishReceive;
+import com.xxfc.platform.vehicle.pojo.vo.VehiclePublishReceiveVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -55,8 +57,12 @@ public class VehiclePublishReceiveDTO{
     private Integer status;
 
 
+    @ApiModelProperty("需求详情")
+    VehiclePublish vehiclePublish;
+
+
     @ApiModelProperty("接单详情")
-    List<VehiclePublishReceive> receives;
+    List<VehiclePublishReceiveVo> receiveVos;
 
 
     private String orderNo;

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

@@ -22,6 +22,7 @@ import com.xxfc.platform.vehicle.pojo.vo.VehiclePublishReceiveVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -61,26 +62,63 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
     @Autowired
     VehicleUseTimeBiz vehicleUseTimeBiz;
 
+    @Autowired
+    VehicleBrandBiz brandBiz;
+
+    @Autowired
+    VehicleCategoryBiz categoryBiz;
+
 
 
     @Transactional(rollbackFor = Exception.class)
     public  BaseOrder  receive(VehiclePublishReceiveDTO publishReceiveDTO){
+        Integer receiveType = publishReceiveDTO.getType() == null ? 0 : publishReceiveDTO.getType();
+        publishReceiveDTO = confirmOrder(publishReceiveDTO);
+        List<VehiclePublishReceiveVo> receives = publishReceiveDTO.getReceiveVos();
+        List<Integer> receiveIds = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(receives)){
+            for (VehiclePublishReceive vehiclePublishReceive : receives){
+                Integer id = vehiclePublishReceive.getId() == null ? 0 : vehiclePublishReceive.getId();
+                if (id == 0){
+                    insertSelective(vehiclePublishReceive);
+                    id = vehiclePublishReceive.getId();
+                }
+                receiveIds.add(id);
+
+            }
+            publishReceiveDTO.setIds(receiveIds);
+            BaseOrder baseOrder = addOrder(publishReceiveDTO);
+            if (baseOrder == null)
+                throw  new BaseException("下单失败",ResultCode.FAILED_CODE);
+            publishReceiveDTO.setOrderNo(baseOrder.getNo());
+            mapper.updReceiveById(publishReceiveDTO);
+            return  baseOrder;
+        }else {
+            if (receiveType == 2){
+                publishReceiveDTO.setStatus(VehiclePublishReceiveDTO.REFUSE);
+                updOrderReceive(publishReceiveDTO);
+            }
+            return  null;
+        }
+    }
+
+    public  VehiclePublishReceiveDTO  confirmOrder(VehiclePublishReceiveDTO publishReceiveDTO){
         Integer publishId = publishReceiveDTO.getPublishId() == null ? 0 : publishReceiveDTO.getPublishId();
         Integer receiveType = publishReceiveDTO.getType() == null ? 0 : publishReceiveDTO.getType();
         String receiveIdStr= publishReceiveDTO.getReceiveIds();
-        if (publishId == 0 || receiveType == 0 || ( receiveType == 1 && CollectionUtils.isEmpty(publishReceiveDTO.getReceives()))){
+        if (publishId == 0 || receiveType == 0 || ( receiveType == 1 && CollectionUtils.isEmpty(publishReceiveDTO.getReceiveVos()))){
             throw  new BaseException("参数不能为空", ResultCode.FAILED_CODE);
         }
         VehiclePublish vehiclePublish = vehiclePublishBiz.selectById(publishId);
         if (vehiclePublish == null ){
             throw  new BaseException("需求不存在或无效", ResultCode.FAILED_CODE);
         }
+        publishReceiveDTO.setVehiclePublish(vehiclePublish);
         Integer type = vehiclePublish.getType() == null ? 0 : vehiclePublish.getType();
-        List<VehiclePublishReceive> receives = publishReceiveDTO.getReceives();
+        List<VehiclePublishReceiveVo> receives = publishReceiveDTO.getReceiveVos();
         setVehiclePublishReceive(receives,receiveIdStr);
-        List<Integer> receiveIds = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(publishReceiveDTO.getReceives())){
-            for (VehiclePublishReceive vehiclePublishReceive : receives){
+        if (CollectionUtils.isNotEmpty(receives)){
+            for (VehiclePublishReceiveVo vehiclePublishReceive : receives){
                 Integer id = vehiclePublishReceive.getId() == null ? 0 : vehiclePublishReceive.getId();
                 if (id == 0){
                     String vehicleId = vehiclePublishReceive.getVehicleId();
@@ -111,41 +149,33 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
                     vehiclePublishReceive.setCategoryId(categoryId);
                     vehiclePublishReceive.setExtensionList(extensionList);
                     vehiclePublishReceive.setReceiveUserId(publishReceiveDTO.getUserId());
-                    insertSelective(vehiclePublishReceive);
-                    id = vehiclePublishReceive.getId();
                 }else {
-                    VehiclePublishReceive  receive = selectById(id);
-                    if (receive == null || !receive.getStatus().equals(VehiclePublishReceiveDTO.PAY)){
+                    VehiclePublishReceive vehiclePublishReceive1  = selectById(id);
+                    BeanUtils.copyProperties(vehiclePublishReceive1,vehiclePublishReceive);
+                    if (vehiclePublishReceive == null || !vehiclePublishReceive.getStatus().equals(VehiclePublishReceiveDTO.PAY)){
                         throw  new BaseException("接单无法确认--id==="+id, ResultCode.FAILED_CODE);
                     }
                 }
-                receiveIds.add(id);
-
+                VehicleBrand vehicleBrand = brandBiz.selectById(vehiclePublishReceive.getBrandId());
+                if (vehicleBrand != null)
+                    vehiclePublishReceive.setBrandName(vehicleBrand.getCnName());
+                VehicleCategory vehicleCategory = categoryBiz.selectById(vehiclePublishReceive.getCategoryId());
+                if (vehicleCategory != null )
+                    vehiclePublishReceive.setCategoryName(vehicleCategory.getName());
+                if (StringUtils.isNotBlank(vehiclePublishReceive.getExtensionList()))
+                    vehiclePublishReceive.setExtensionVOS(vehicleExtensionBiz.getTreeByApply(Arrays.asList(vehiclePublishReceive.getExtensionList().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList())));
             }
-            publishReceiveDTO.setIds(receiveIds);
-            BaseOrder baseOrder = addOrder(publishReceiveDTO);
-            if (baseOrder == null)
-                throw  new BaseException("下单失败",ResultCode.FAILED_CODE);
-            publishReceiveDTO.setOrderNo(baseOrder.getNo());
-            mapper.updReceiveById(publishReceiveDTO);
-            return  baseOrder;
-        }else {
-            if (receiveType == 2){
-                publishReceiveDTO.setStatus(VehiclePublishReceiveDTO.REFUSE);
-                updOrderReceive(publishReceiveDTO);
-            }
-            return  null;
         }
-
+        return  publishReceiveDTO;
     }
 
-    public  void  setVehiclePublishReceive(List<VehiclePublishReceive> receives,String receiveIds){
+    public  void  setVehiclePublishReceive(List<VehiclePublishReceiveVo> receives,String receiveIds){
         if (receives == null || receives.size() == 0){
             receives = new ArrayList<>();
             if(StringUtils.isNotBlank(receiveIds)){
                 List<Integer> receiveIdList =Arrays.asList(receiveIds.split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
                 for (Integer id : receiveIdList){
-                    VehiclePublishReceive vehiclePublishReceive  = new VehiclePublishReceive();
+                    VehiclePublishReceiveVo vehiclePublishReceive  = new VehiclePublishReceiveVo();
                     vehiclePublishReceive.setId(id);
                     receives.add(vehiclePublishReceive);
                 }

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

@@ -27,16 +27,33 @@ public class AppVehiclePublishReceiveController extends BaseController<VehiclePu
     @PostMapping("meet")
     @ApiModelProperty("接单")
     public  ObjectRestResponse meet(@RequestBody VehiclePublishReceiveDTO publishReceiveDTO) throws Exception {
-     if (publishReceiveDTO.getCompanyId() == null || publishReceiveDTO.getCompanyId() == 0){
-         List<Integer> companyIds = getBusinessUserCompanyIds();
-         if (companyIds != null && companyIds.size() > 0){
-             publishReceiveDTO.setCompanyId(companyIds.get(0));
-         }
-     }
+        setPublishReceiveDTO(publishReceiveDTO);
+        return ObjectRestResponse.succ(baseBiz.receive(publishReceiveDTO));
+    }
+
+
+
+    @PostMapping("confirmOrder")
+    @ApiModelProperty("确认订单")
+    public  ObjectRestResponse confirmOrder(@RequestBody VehiclePublishReceiveDTO publishReceiveDTO) throws Exception {
+        setPublishReceiveDTO(publishReceiveDTO);
+        return ObjectRestResponse.succ(baseBiz.confirmOrder(publishReceiveDTO));
+    }
+
+
+
+    public  void  setPublishReceiveDTO(VehiclePublishReceiveDTO publishReceiveDTO)throws Exception{
+        if (publishReceiveDTO.getCompanyId() == null || publishReceiveDTO.getCompanyId() == 0){
+            List<Integer> companyIds = getBusinessUserCompanyIds();
+            if (companyIds != null && companyIds.size() > 0){
+                publishReceiveDTO.setCompanyId(companyIds.get(0));
+            }
+        }
         publishReceiveDTO.setUserId(Integer.parseInt(getUserId()));
-     return ObjectRestResponse.succ(baseBiz.receive(publishReceiveDTO));
     }
 
+
+
     @PostMapping("app/unauth/updReceive")
     @ApiModelProperty("支付后处理")
     @IgnoreUserToken