Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -145,6 +145,7 @@ public enum StatusEnum {
     DRIVER_ORDER_SETTLEMENTED("9", "已结算", "driver_order_settlemented"),
     DRIVER_ORDER_SIGN("11", "待签约", "driver_order_sign"),
     DRIVER_ORDER_END("13", "已终止", "driver_order_end"),
+    CARGO_OWNER_REJECTION("15", "货主已驳回", "cargo_owner_rejection"),
 
     //装车反馈状态
     NOT_LOADING("1","未装车","not_loading"),

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/OrderInfoController.java

@@ -60,5 +60,15 @@ public class OrderInfoController {
     public String signContract(@RequestBody OrderInfo orderInfo){
         return orderInfoService.signContract(orderInfo);
     }
+
+    /**
+     * 接单(拒绝)
+     * @param orderInfo
+     * @return
+     */
+    @PostMapping("/api/orderReceiving")
+    public String orderReceiving(@RequestBody OrderInfo orderInfo){
+        return orderInfoService.orderReceiving(orderInfo);
+    }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/OrderInfo.java

@@ -154,6 +154,12 @@ public class OrderInfo extends BaseModel<OrderInfo> {
     @TableField(exist = false)
     private CarrierInfo carrierInfo;
 
+    /**
+     * flag(1接受2驳回)
+     */
+    @TableField(exist = false)
+    private String flag;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IOrderInfoService.java

@@ -42,4 +42,11 @@ public interface IOrderInfoService extends IService<OrderInfo> {
      * @return
      */
     String signContract (OrderInfo orderInfo);
+
+    /**
+     * 接单(拒绝)
+     * @param orderInfo
+     * @return
+     */
+    String orderReceiving (OrderInfo orderInfo);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -114,4 +114,29 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         }
         return "ok";
     }
+
+    /**
+     * 接单(拒绝)
+     * @param orderInfo
+     * @return
+     */
+    @Override
+    public String orderReceiving (OrderInfo orderInfo){
+        //查询订单
+        OrderInfo orderInfo1 = this.selectById(orderInfo.getId());
+        if(orderInfo1 != null){
+            //接单
+            if("1".equals(orderInfo1.getFlag())){
+                orderInfo1.setOrderStatusKey(StatusEnum.DRIVER_ORDER_SHIPPING.getFlag());
+                orderInfo1.setOrderStatus(StatusEnum.DRIVER_ORDER_SHIPPING.getName());
+            }
+            //驳回
+            else{
+                orderInfo1.setOrderStatusKey(StatusEnum.CARGO_OWNER_REJECTION.getFlag());
+                orderInfo1.setOrderStatus(StatusEnum.CARGO_OWNER_REJECTION.getName());
+            }
+            this.updateById(orderInfo1);
+        }
+        return "ok";
+    }
 }