发布任务

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

@@ -164,7 +164,7 @@ public enum StatusEnum {
     OWNER_REPAIDED("27", "已还款", "owner_repaided"),
     OWNER_ORDER_FINISH("29", "已完结", "owner_order_finish"),
     OWNER_ORDER_END("31", "已终止", "owner_order_end"),
-
+    CARGO_ORDER_REVIEWED("17", "订单待审核", "cargo_order_reviewed"),
 
     //装车反馈状态
     NOT_LOADING("1","未装车","not_loading"),

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

@@ -2,8 +2,10 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.IOrderInfoService;
+import org.aspectj.weaver.ast.Or;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -70,5 +72,13 @@ public class OrderInfoController {
     public String orderReceiving(@RequestBody OrderInfo orderInfo){
         return orderInfoService.orderReceiving(orderInfo);
     }
+
+    /**
+     * 发布任务
+     */
+    @PostMapping("/api/addOrder")
+    public String addOrder(@RequestBody OrderInfo orderInfo){
+        return orderInfoService.addOrder(orderInfo);
+    }
 }
 

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

@@ -49,4 +49,11 @@ public interface IOrderInfoService extends IService<OrderInfo> {
      * @return
      */
     String orderReceiving (OrderInfo orderInfo);
+
+    /**
+     * 发布任务
+     * @param orderInfo
+     * @return
+     */
+    String addOrder(OrderInfo orderInfo);
 }

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

@@ -40,59 +40,33 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
     public String loadingAdd(CarrierInfo carrierInfo) {
         //查询订单
         OrderInfo orderInfo = orderInfoService.selectById(carrierInfo.getOrderId());
-        //判断暂存提交（前端传参1暂存3提交）
-        if ("1".equals(carrierInfo.getStatusFlag())) {
-            //添加装车信息
-            if (StringUtils.isEmpty(carrierInfo.getId())) {
-                //新增主键id
-                carrierInfo.setId(IdGenerator.generateUUID());
-                carrierInfo.setCompId(orderInfo.getCompId());
-                carrierInfo.setContractNo(orderInfo.getContractNo());
-                carrierInfo.setOrderNo(orderInfo.getOrderNo());
-                carrierInfo.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
-                carrierInfo.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
-                carrierInfo.setLoadingConfirm(StatusEnum.NOT_LOADING_CONFIRM.getName());
-                carrierInfo.setLoadingConfirmFlag(StatusEnum.NOT_LOADING_CONFIRM.getFlag());
-                this.insert(carrierInfo);
-            }
-            //编辑装车信息
-            else {
-                this.updateById(carrierInfo);
-            }
-        } else {
-            //添加装车信息
-            if (StringUtils.isEmpty(carrierInfo.getId())) {
-                //新增主键id
-                carrierInfo.setId(IdGenerator.generateUUID());
-                carrierInfo.setCompId(orderInfo.getCompId());
-                carrierInfo.setContractNo(orderInfo.getContractNo());
-                carrierInfo.setOrderNo(orderInfo.getOrderNo());
-                carrierInfo.setStatus(StatusEnum.SUBMITTED.getName());
-                carrierInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
-                carrierInfo.setLoadingConfirm(StatusEnum.NOT_LOADING_CONFIRM.getName());
-                carrierInfo.setLoadingConfirmFlag(StatusEnum.NOT_LOADING_CONFIRM.getFlag());
-                carrierInfo.setLoadingStatus(StatusEnum.LOADING.getName());
-                carrierInfo.setLoadingStatusKey(StatusEnum.LOADING.getFlag());
-                this.insert(carrierInfo);
-                //司机确认装车后，订单状态改为待货主确认装车
-                orderInfo.setOrderStatus(StatusEnum.OWNER_CONFIRMED_LOADING.getName());
-                orderInfo.setOrderStatusKey(StatusEnum.OWNER_CONFIRMED_LOADING.getFlag());
-                orderInfo.setCargoOwnerStatus(StatusEnum.CONFIRMED_LOADING.getName());
-                orderInfo.setCargoOwnerStatusKey(StatusEnum.CONFIRMED_LOADING.getFlag());
-                orderInfoService.updateById(orderInfo);
-            }
-            //编辑装车信息
-            else {
-                this.updateById(carrierInfo);
-                //司机确认装车后，订单状态改为待货主确认装车
-                orderInfo.setOrderStatus(StatusEnum.OWNER_CONFIRMED_LOADING.getName());
-                orderInfo.setOrderStatusKey(StatusEnum.OWNER_CONFIRMED_LOADING.getFlag());
-                orderInfo.setCargoOwnerStatus(StatusEnum.CONFIRMED_LOADING.getName());
-                orderInfo.setCargoOwnerStatusKey(StatusEnum.CONFIRMED_LOADING.getFlag());
-                orderInfoService.updateById(orderInfo);
+        if (orderInfo != null) {
+            //根据id查询承运信息
+            CarrierInfo carrierInfo1 = this.selectById(carrierInfo.getId());
+            if (carrierInfo1 != null) {
+                //判断暂存提交（前端传参1暂存3提交）
+                if ("1".equals(carrierInfo.getStatusFlag())) {
+                    carrierInfo1.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
+                    carrierInfo1.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
+                    carrierInfo1.setLoadingConfirm(StatusEnum.NOT_LOADING_CONFIRM.getName());
+                    carrierInfo1.setLoadingConfirmFlag(StatusEnum.NOT_LOADING_CONFIRM.getFlag());
+                }
+                else {
+                    carrierInfo1.setStatus(StatusEnum.SUBMITTED.getName());
+                    carrierInfo1.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
+                    carrierInfo1.setLoadingStatus(StatusEnum.LOADING.getName());
+                    carrierInfo1.setLoadingStatusKey(StatusEnum.LOADING.getFlag());
+                    //司机确认装车后，订单状态改为待货主确认装车
+                    orderInfo.setOrderStatus(StatusEnum.OWNER_CONFIRMED_LOADING.getName());
+                    orderInfo.setOrderStatusKey(StatusEnum.OWNER_CONFIRMED_LOADING.getFlag());
+                    orderInfo.setCargoOwnerStatus(StatusEnum.CONFIRMED_LOADING.getName());
+                    orderInfo.setCargoOwnerStatusKey(StatusEnum.CONFIRMED_LOADING.getFlag());
+                    orderInfoService.updateById(orderInfo);
+                }
+                this.updateById(carrierInfo1);
             }
         }
-        return "OK";
+            return "OK";
     }
 
     /**

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

@@ -3,8 +3,10 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
+import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.CarrierInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.DriverPayeeInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.FreightInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.OrderInfoMapper;
@@ -148,4 +150,36 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         }
         return "ok";
     }
+
+    /**
+     * 发布任务
+     * @param
+     * @return
+     */
+    @Override
+    public String addOrder(OrderInfo orderInfo){
+        //新增主键id
+        orderInfo.setId(IdGenerator.generateUUID());
+        orderInfo.setOrderStatusKey(StatusEnum.CARGO_ORDER_REVIEWED.getFlag());
+        orderInfo.setOrderStatus(StatusEnum.CARGO_ORDER_REVIEWED.getName());
+        //新增承运信息
+        CarrierInfo carrierInfo = orderInfo.getCarrierInfo();
+        carrierInfo.setId(IdGenerator.generateUUID());
+        carrierInfo.setOrderId(orderInfo.getId());
+        carrierInfo.setLoadingStatusKey(StatusEnum.NOT_LOADING.getFlag());
+        carrierInfo.setLoadingStatus(StatusEnum.NOT_LOADING.getName());
+        carrierInfo.setUnloadingStatusKey(StatusEnum.NOT_UNLOADING.getFlag());
+        carrierInfo.setUnloadingStatus(StatusEnum.NOT_UNLOADING.getName());
+        carrierInfo.setOrderId(orderInfo.getId());
+        carrierInfo.setOrderNo(orderInfo.getOrderNo());
+        carrierInfo.setCompId(orderInfo.getCompId());
+        // 操作主表数据
+        boolean one = this.insert(orderInfo);
+        boolean two = carrierInfoService.insert(carrierInfo);
+        if (one && two) {
+            return "OK";
+        } else {
+            return "NG";
+        }
+    }
 }