货主端确认装卸车

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

@@ -155,6 +155,7 @@ public enum StatusEnum {
     //装车确认状态
     NOT_LOADING_CONFIRM("1", "未确认", "not_loading_confirm"),
     LOADING_CONFIRM("3", "已确认", "loading_confirm"),
+    LOADING_REJECTION("5", "已驳回", "loading_rejection"),
 
 
 

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

@@ -44,6 +44,15 @@ public class CarrierInfoController {
      public String unLoadingAdd(@RequestBody CarrierInfo carrierInfo) {
          return carrierInfoService.unLoadingAdd(carrierInfo);
     }
-
+    /**
+     * 货主端确认装卸车
+     *
+     * @param carrierInfo
+     * @return
+     */
+    @PostMapping("/cargoOwnerLoadingAdd")
+    public String cargoOwnerLoadingAdd(@RequestBody CarrierInfo carrierInfo) {
+        return carrierInfoService.cargoOwnerLoadingAdd(carrierInfo);
+    }
 }
 

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

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
@@ -110,22 +111,33 @@ public class CarrierInfo extends BaseModel<CarrierInfo> {
     private String status;
 
     /**
-     * 装车确认状态
+     * 装车确认状态（1未确认3已确认5已驳回）
      */
     private String loadingConfirm;
     /**
-     * 装车确认状态标识（1未确认3已确认）
+     * 装车确认状态标识
      */
     private String loadingConfirmFlag;
     /**
-     * 卸车确认状态（1未确认3已确认）
+     * 卸车确认状态（1未确认3已确认5已驳回）
      */
     private String unloadingConfirm;
     /**
-     * 卸车确认状态标识（1未确认3已确认）
+     * 卸车确认状态标识
      */
     private String unloadingConfirmFlag;
 
+    /**
+     * flag(1通过2驳回)
+     */
+    @TableField(exist = false)
+    private String flag;
+    /**
+     * 装卸flag(1装车2卸车)
+     */
+    @TableField(exist = false)
+    private String loadingFlag;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -58,6 +58,10 @@ public class FreightInfo extends BaseModel<FreightInfo> {
      * 应还运费
      */
     private Float freightPayable;
+    /**
+     * 合计应还
+     */
+    private Float totalRepayable;
     /**
      * 超期费
      */

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

@@ -53,6 +53,14 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      * 货主电话
      */
     private String cargoOwnerPhone;
+    /**
+     * 司机
+     */
+    private String driverName;
+    /**
+     * 司机电话
+     */
+    private String driverPhone;
     /**
      * 货主单位
      */

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

@@ -57,6 +57,20 @@ public class RepaymentInfo extends BaseModel<RepaymentInfo> {
      */
     private String lastNumber;
 
+    /**
+     * 已还
+     */
+    private Float alreadyRepaid;
+    /**
+     * 合计应还
+     */
+    private Float totalRepayable;
+    /**
+     * 还款账户银行
+     */
+    private String repaymentBank;
+
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -20,4 +20,10 @@ public interface ICarrierInfoService extends IService<CarrierInfo> {
      * 确认卸车
      */
     String unLoadingAdd(CarrierInfo carrierInfo);
+
+    /**
+     * 货主端确认装卸车
+     */
+    String cargoOwnerLoadingAdd(CarrierInfo carrierInfo);
+
 }

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

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -25,6 +26,8 @@ import org.springframework.transaction.annotation.Transactional;
 public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, CarrierInfo> implements ICarrierInfoService {
     @Autowired
     private IOrderInfoService orderInfoService;
+    @Autowired
+    private ICarrierInfoService carrierInfoService;
 
     /**
      * 确认装车
@@ -40,7 +43,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
         //判断暂存提交（前端传参1暂存3提交）
         if ("1".equals(carrierInfo.getStatusFlag())) {
             //添加装车信息
-            if(StringUtils.isEmpty(carrierInfo.getId())) {
+            if (StringUtils.isEmpty(carrierInfo.getId())) {
                 //新增主键id
                 carrierInfo.setId(IdGenerator.generateUUID());
                 carrierInfo.setCompId(orderInfo.getCompId());
@@ -56,10 +59,9 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
             else {
                 this.updateById(carrierInfo);
             }
-        }
-        else{
+        } else {
             //添加装车信息
-            if(StringUtils.isEmpty(carrierInfo.getId())) {
+            if (StringUtils.isEmpty(carrierInfo.getId())) {
                 //新增主键id
                 carrierInfo.setId(IdGenerator.generateUUID());
                 carrierInfo.setCompId(orderInfo.getCompId());
@@ -74,7 +76,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
                 this.insert(carrierInfo);
             }
             //编辑装车信息
-            else{
+            else {
                 this.updateById(carrierInfo);
             }
         }
@@ -93,7 +95,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
         if ("1".equals(carrierInfo.getStatusFlag())) {
             this.updateById(carrierInfo);
         }
-        else{
+        else {
             carrierInfo.setStatus(StatusEnum.SUBMITTED.getName());
             carrierInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
             carrierInfo.setUnloadingConfirm(StatusEnum.NOT_LOADING_CONFIRM.getName());
@@ -104,4 +106,47 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
         }
         return "OK";
     }
+    /**
+     * 货主端确认装卸车
+     *
+     * @param carrierInfo
+     * @return
+     */
+    @Override
+    public String cargoOwnerLoadingAdd(CarrierInfo carrierInfo) {
+        //查询订单
+        OrderInfo orderInfo = orderInfoService.selectById(carrierInfo.getOrderId());
+        //查询承运信息
+        CarrierInfo carrierInfo1 = carrierInfoService.selectOne(new EntityWrapper<CarrierInfo>()
+                .eq("id",carrierInfo.getId())
+                .eq("order_id",carrierInfo.getOrderId()));
+        if(carrierInfo1 != null){
+            if("1".equals(carrierInfo1.getFlag())){
+                if("1".equals(carrierInfo1.getLoadingFlag())){
+                    carrierInfo1.setLoadingConfirm(StatusEnum.LOADING_CONFIRM.getName());
+                    carrierInfo1.setLoadingConfirmFlag(StatusEnum.LOADING_CONFIRM.getFlag());
+                }
+                else{
+                    carrierInfo1.setUnloadingConfirm(StatusEnum.LOADING_CONFIRM.getName());
+                    carrierInfo1.setUnloadingConfirmFlag(StatusEnum.LOADING_CONFIRM.getFlag());
+                }
+            }
+            else{
+                if("2".equals(carrierInfo1.getLoadingFlag())){
+                    carrierInfo1.setLoadingConfirm(StatusEnum.LOADING_REJECTION.getName());
+                    carrierInfo1.setLoadingConfirmFlag(StatusEnum.LOADING_REJECTION.getFlag());
+                }
+                else{
+                    carrierInfo1.setUnloadingConfirm(StatusEnum.LOADING_REJECTION.getName());
+                    carrierInfo1.setUnloadingConfirmFlag(StatusEnum.LOADING_REJECTION.getFlag());
+                }
+            }
+            this.updateById(carrierInfo1);
+            //更改订单状态
+            orderInfo.setOrderStatus(StatusEnum.DRIVER_ORDER_SETTLEMENT.getName());
+            orderInfo.setOrderStatusKey(StatusEnum.DRIVER_ORDER_SETTLEMENT.getFlag());
+            orderInfoService.updateById(orderInfo);
+        }
+        return "OK";
+    }
 }