修改我的接单状态

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/ShuntApply.java

@@ -53,7 +53,7 @@ public class ShuntApply implements Serializable {
     private Integer status;
 
 	@Column(name = "order_status")
-	@ApiModelProperty(value = "状态 1--待支付 2--已支付 3--已取消 4--已下单 5--接单成功 6--接单失败")
+	@ApiModelProperty(value = "状态 1--待支付 2--已支付 3--已取消 ")
 	private Integer orderStatus;
 	
 	    /**

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/ShuntApplyController.java

@@ -14,6 +14,7 @@ import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
 import com.xxfc.platform.order.biz.ShuntApplyBiz;
 import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.entity.ShuntApply;
+import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO;
 import com.xxfc.platform.order.pojo.order.add.BgAddRentDTO;
@@ -179,6 +180,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
     @Data
     public static class ShuntApplyVO extends ShuntApply {
         VehicleModel vehicleModel;
+        OrderPageVO orderPageVO;
     }
 
     @Data

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/BgShuntApplyController.java

@@ -15,12 +15,14 @@ import com.github.wxiaoqi.security.common.util.OrderUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.github.wxiaoqi.security.common.vo.PageParam;
+import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
 import com.xxfc.platform.order.biz.ShuntApplyBiz;
 import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.ShuntApply;
 import com.xxfc.platform.order.mqhandler.RabbitProduct;
+import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.rest.ShuntApplyController;
 import com.xxfc.platform.order.service.OrderRentVehicleService;
@@ -68,6 +70,9 @@ public class BgShuntApplyController extends BaseController<ShuntApplyBiz, ShuntA
     @Autowired
     RabbitProduct rabbitProduct;
 
+    @Autowired
+    BaseOrderBiz baseOrderBiz;
+
     @Override
     public UserFeign getUserFeign() {
         return this.userFeign;
@@ -271,6 +276,15 @@ public class BgShuntApplyController extends BaseController<ShuntApplyBiz, ShuntA
 
         pages.getData().forEach(data -> {
             data.setVehicleModel(vehicleFeign.get(data.getModelId()).getData());
+
+            if(StrUtil.isNotBlank(data.getOrderNo())) {
+                Map<String, Object> map = CollUtil.newHashMap();
+                map.put("no", data.getOrderNo());
+                List<OrderPageVO> list = baseOrderBiz.pageByParm(map);
+                if(CollUtil.isNotEmpty(list)) {
+                    data.setOrderPageVO(list.get(0));
+                }
+            }
         });
 
         return ObjectRestResponse.succ(pages);