修改

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

@@ -7,6 +7,8 @@ import com.yh.saas.plugin.yiliangyiyun.util.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.ParseException;
+
 /**
  * <p>
  * 记录承运信息 前端控制器
@@ -62,7 +64,7 @@ public class CarrierInfoController {
      */
     @Log(title = "货主确认装卸车")
     @PostMapping("/cargoOwnerLoadingAdd")
-    public String cargoOwnerLoadingAdd(@RequestBody HyCarrierInfo hyCarrierInfo) {
+    public String cargoOwnerLoadingAdd(@RequestBody HyCarrierInfo hyCarrierInfo) throws ParseException {
         return carrierInfoService.cargoOwnerLoadingAdd(hyCarrierInfo);
     }
 }

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

@@ -152,6 +152,10 @@ public class HyCompanyInfo extends BaseModel<HyCompanyInfo> {
      * 审核通过一次（1是）
      */
     private String passOnce;
+    /**
+     * 自动跳过平台审核（1是）
+     */
+    private String skipAudit;
 
     /**
      * 审核标识

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

@@ -365,6 +365,12 @@ public class PublishTaskInfo extends BaseModel<PublishTaskInfo> {
     @TableField(exist = false)
     private String flag;
 
+    /**
+     * 全部数量
+     */
+    @TableField(exist = false)
+    private Integer allNum;
+
     /**
      * 审核中数量
      */

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

@@ -3,6 +3,8 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 import com.yh.saas.plugin.yiliangyiyun.entity.HyCarrierInfo;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.text.ParseException;
+
 /**
  * <p>
  * 记录承运信息 服务类
@@ -29,6 +31,6 @@ public interface ICarrierInfoService extends IService<HyCarrierInfo> {
     /**
      * 货主端确认装卸车
      */
-    String cargoOwnerLoadingAdd(HyCarrierInfo hyCarrierInfo);
+    String cargoOwnerLoadingAdd(HyCarrierInfo hyCarrierInfo) throws ParseException;
 
 }

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

@@ -239,7 +239,7 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setReCommonId(hyCargoOwnerInfo1.getCommonId());
-                newsInfo.setNewsTitle("身份认证已通过！");
+                newsInfo.setNewsTitle("审核通知！");
                 newsInfo.setNewsContent("身份认证已通过！");
                 newsInfo.setBussId(hyCargoOwnerInfo1.getId());
                 newsInfo.setNewsTypeKey("1");
@@ -256,7 +256,7 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setReCommonId(hyCargoOwnerInfo1.getCommonId());
-                newsInfo.setNewsTitle("身份认证已驳回！");
+                newsInfo.setNewsTitle("审核通知！");
                 newsInfo.setNewsContent("身份认证已驳回！" + "\n" + "驳回原因：" + hyCargoOwnerInfo.getRejectReasonDescription());
                 newsInfo.setBussId(hyCargoOwnerInfo1.getId());
                 newsInfo.setNewsTypeKey("1");

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

@@ -14,6 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  * <p>
  * 记录承运信息 服务实现类
@@ -36,6 +40,10 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
     private ICompanyInfoService companyInfoService;
     @Autowired
     private ICargoOwnerInfoService cargoOwnerInfoService;
+    @Autowired
+    private IHyCargoOwnerCapitalInfoService hyCargoOwnerCapitalInfoService;
+    @Autowired
+    private IHyFreightSettlementInfoService hyFreightSettlementInfoService;
 
 
     /**
@@ -153,7 +161,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String cargoOwnerLoadingAdd(HyCarrierInfo hyCarrierInfo) {
+    public String cargoOwnerLoadingAdd(HyCarrierInfo hyCarrierInfo) throws ParseException {
         //查询订单
         OrderInfo orderInfo = orderInfoService.selectById(hyCarrierInfo.getOrderId());
         if (orderInfo != null) {
@@ -165,48 +173,172 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
                     orderInfo.setCargoOwnerStatus(StatusEnum.PLATFORM_CONFIRMED_LOADING.getName());
                     orderInfo.setCargoOwnerStatusKey(StatusEnum.PLATFORM_CONFIRMED_LOADING.getFlag());
                     //查询订单是否垫付
-                    if("0".equals(orderInfo.getFreightAdvance())){
+                    if ("0".equals(orderInfo.getFreightAdvance())) {
                         //生成货主冻结金额流向信息
                         HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
                         hyFreezingMoneyInfo.setId(IdGenerator.generateUUID());
                         hyFreezingMoneyInfo.setOrderId(orderInfo.getId());
                         hyFreezingMoneyInfo.setType("冻结");
                         hyFreezingMoneyInfo.setAmountMoney(orderInfo.getAdvanceCharge());
-                        if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()){
-                           //货主是公司
+                        if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()) {
+                            //货主是公司
                             HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo.getCompId());
-                            if (hyCompanyInfo.getAccountBalance() < orderInfo.getAdvanceCharge()){
+                            if (hyCompanyInfo.getAccountBalance() < orderInfo.getAdvanceCharge()) {
                                 //账户余额小于预付款
                                 throw new YException(YExceptionEnum.INSUFFICIENT_ACCOUNT_BALANCES);
-                            }else {
+                            } else {
                                 //冻结公司账户余额
                                 Double d = hyCompanyInfo.getAccountBalance();
                                 Double d1 = hyCompanyInfo.getFrozenAmount();
-                                hyCompanyInfo.setAccountBalance(d-orderInfo.getAdvanceCharge());
-                                hyCompanyInfo.setFrozenAmount(d1+orderInfo.getAdvanceCharge());
+                                hyCompanyInfo.setAccountBalance(d - orderInfo.getAdvanceCharge());
+                                hyCompanyInfo.setFrozenAmount(d1 + orderInfo.getAdvanceCharge());
                                 companyInfoService.updateById(hyCompanyInfo);
                                 hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
                             }
-                        }
-                        else {
+                        } else {
                             //货主是个人
                             HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
-                                .eq("common_id",orderInfo.getCargoCommonId()).eq("delete_flag","0"));
-                            if (hyCargoOwnerInfo.getAccountBalance() < orderInfo.getAdvanceCharge()){
+                                    .eq("common_id", orderInfo.getCargoCommonId()).eq("delete_flag", "0"));
+                            if (hyCargoOwnerInfo.getAccountBalance() < orderInfo.getAdvanceCharge()) {
                                 //账户余额小于预付款
                                 throw new YException(YExceptionEnum.INSUFFICIENT_ACCOUNT_BALANCES);
-                            }else {
+                            } else {
                                 //冻结货主账户余额
                                 Double d = hyCargoOwnerInfo.getAccountBalance();
                                 Double d1 = hyCargoOwnerInfo.getFrozenAmount();
-                                hyCargoOwnerInfo.setAccountBalance(d-orderInfo.getAdvanceCharge());
-                                hyCargoOwnerInfo.setFrozenAmount(d1+orderInfo.getAdvanceCharge());
+                                hyCargoOwnerInfo.setAccountBalance(d - orderInfo.getAdvanceCharge());
+                                hyCargoOwnerInfo.setFrozenAmount(d1 + orderInfo.getAdvanceCharge());
                                 cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
                                 hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
                             }
                         }
                         hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
                     }
+                    //查询货主是否为公司
+                    if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()) {
+                        //查询该公司是否自动跳过平台审核
+                        HyCompanyInfo hyCompanyInfo1 = companyInfoService.selectById(orderInfo.getCompId());
+                        if ("1".equals(hyCompanyInfo1.getSkipAudit())) {
+                            //平台确认装车更改订单状态
+                            orderInfo.setOrderStatus(StatusEnum.DRIVER_ORDER_TRANSIT.getName());
+                            orderInfo.setOrderStatusKey(StatusEnum.DRIVER_ORDER_TRANSIT.getFlag());
+                            orderInfo.setCargoOwnerStatus(StatusEnum.DRIVER_ORDER_TRANSIT.getName());
+                            orderInfo.setCargoOwnerStatusKey(StatusEnum.DRIVER_ORDER_TRANSIT.getFlag());
+                            //生成费用信息
+                            FreightInfo freightInfo = new FreightInfo();
+                            freightInfo.setId(IdGenerator.generateUUID());
+                            freightInfo.setOrderId(orderInfo.getId());
+                            freightInfo.setDriverServiceCharge(0d);
+                            freightInfo.setPayableFreight(orderInfo.getAdvanceCharge());
+                            freightInfo.setPayabledFreight(0d);
+                            freightInfo.setNopayableFreight(freightInfo.getPayableFreight());
+                            //判断是否是垫付订单
+                            if ("0".equals(orderInfo.getFreightAdvance())) {
+                                //非垫付订单
+                                freightInfo.setPrepaidFreight(orderInfo.getAdvanceCharge());
+//                        freightInfo.setReceivableFreight(orderInfo.getAdvanceCharge());
+//                        freightInfo.setReceivabledFreight(orderInfo.getAdvanceCharge());
+
+                                //生成货主冻结金额流向信息
+                                HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
+                                hyFreezingMoneyInfo.setId(IdGenerator.generateUUID());
+                                hyFreezingMoneyInfo.setOrderId(orderInfo.getId());
+                                hyFreezingMoneyInfo.setType("扣除");
+                                hyFreezingMoneyInfo.setAmountMoney(orderInfo.getAdvanceCharge());
+
+                                if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()) {
+                                    //货主是公司
+                                    HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo.getCompId());
+                                    //将货主冻结金额减去
+                                    Double d1 = hyCompanyInfo.getFrozenAmount();
+                                    hyCompanyInfo.setFrozenAmount(d1 - orderInfo.getAdvanceCharge());
+                                    companyInfoService.updateById(hyCompanyInfo);
+                                    hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
+                                    if (freightInfo.getReceivableFreight() != null && freightInfo.getReceivableFreight() != 0) {
+                                        //生成货主账单信息
+                                        HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo = new HyCargoOwnerCapitalInfo();
+                                        hyCargoOwnerCapitalInfo.setId(IdGenerator.generateUUID());
+                                        hyCargoOwnerCapitalInfo.setCompanyId(hyCompanyInfo.getId());
+                                        hyCargoOwnerCapitalInfo.setTypes("支付预付款");
+                                        hyCargoOwnerCapitalInfo.setAmountMoney(freightInfo.getReceivableFreight());
+                                        hyCargoOwnerCapitalInfo.setOrderId(orderInfo.getId());
+                                        hyCargoOwnerCapitalInfo.setOrderNo(orderInfo.getOrderNo());
+                                        hyCargoOwnerCapitalInfoService.insert(hyCargoOwnerCapitalInfo);
+                                    }
+                                } else {
+                                    //货主是个人
+                                    HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
+                                            .eq("common_id", orderInfo.getCargoCommonId()).eq("delete_flag", "0"));
+                                    //将货主冻结金额减去
+                                    Double d1 = hyCargoOwnerInfo.getFrozenAmount();
+                                    hyCargoOwnerInfo.setFrozenAmount(d1 - orderInfo.getAdvanceCharge());
+                                    cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+                                    hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
+                                    if (freightInfo.getReceivableFreight() != null && freightInfo.getReceivableFreight() != 0) {
+                                        //生成货主账单信息
+                                        HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo = new HyCargoOwnerCapitalInfo();
+                                        hyCargoOwnerCapitalInfo.setId(IdGenerator.generateUUID());
+                                        hyCargoOwnerCapitalInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
+                                        hyCargoOwnerCapitalInfo.setTypes("支付预付款");
+                                        hyCargoOwnerCapitalInfo.setAmountMoney(freightInfo.getReceivableFreight());
+                                        hyCargoOwnerCapitalInfo.setOrderId(orderInfo.getId());
+                                        hyCargoOwnerCapitalInfo.setOrderNo(orderInfo.getOrderNo());
+                                        hyCargoOwnerCapitalInfoService.insert(hyCargoOwnerCapitalInfo);
+                                    }
+                                }
+                                hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
+                                //货主是公司
+                                if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()) {
+                                    //计算公司累计支付运费
+                                    HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo.getCompId());
+                                    if (hyCompanyInfo != null) {
+                                        Double d3 = hyCompanyInfo.getAccumulatedFreight();
+                                        hyCompanyInfo.setAccumulatedFreight(d3 + orderInfo.getAdvanceCharge());
+                                        companyInfoService.updateById(hyCompanyInfo);
+                                    }
+                                }
+                                //货主是个人
+                                else {
+                                    //查询货主
+                                    HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
+                                            .eq("common_id", orderInfo.getCargoCommonId()).eq("delete_flag", "0"));
+                                    //计算货主累计支付运费
+                                    if (hyCargoOwnerInfo != null) {
+                                        Double d3 = hyCargoOwnerInfo.getAccumulatedFreight();
+                                        hyCargoOwnerInfo.setAccumulatedFreight(d3 + orderInfo.getAdvanceCharge());
+                                        cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+                                    }
+                                }
+                            }
+                            freightInfoService.insert(freightInfo);
+                            //如果应付款大于0，生成司机运费结算信息
+                            if (freightInfo.getPayableFreight() != null && freightInfo.getPayableFreight() != 0) {
+                                HyFreightSettlementInfo hyFreightSettlementInfo = new HyFreightSettlementInfo();
+                                hyFreightSettlementInfo.setId(IdGenerator.generateUUID());
+                                hyFreightSettlementInfo.setCommonId(orderInfo.getCommonId());
+                                hyFreightSettlementInfo.setOrderId(orderInfo.getId());
+                                hyFreightSettlementInfo.setOrderNo(orderInfo.getOrderNo());
+                                hyFreightSettlementInfo.setDocumentNo(orderInfo.getOrderNo().replace("CY", "ZJLS"));
+                                hyFreightSettlementInfo.setFreightAdvance(orderInfo.getFreightAdvance());
+                                hyFreightSettlementInfo.setDriverName(orderInfo.getDriverName());
+                                hyFreightSettlementInfo.setPayeeName(orderInfo.getPayeeName());
+                                hyFreightSettlementInfo.setPayeeIdCard(orderInfo.getPayeeIdCard());
+                                if (orderInfo.getCarCaptainCommonId() != null && !orderInfo.getCarCaptainCommonId().isEmpty()) {
+                                    hyFreightSettlementInfo.setCarCaptainCommonId(orderInfo.getCarCaptainCommonId());
+                                }
+                                hyFreightSettlementInfo.setBankCard(orderInfo.getBankCard());
+                                hyFreightSettlementInfo.setBankDeposit(orderInfo.getBankDeposit());
+                                hyFreightSettlementInfo.setBankDepositBranch(orderInfo.getBankDepositBranch());
+                                hyFreightSettlementInfo.setPaymentType("预付款");
+                                hyFreightSettlementInfo.setAmountMoney(freightInfo.getPayableFreight());
+                                hyFreightSettlementInfo.setStatusKey(StatusEnum.NO_PAYMENT.getFlag());
+                                hyFreightSettlementInfo.setStatus(StatusEnum.NO_PAYMENT.getName());
+//                        hyFreightSettlementInfo.setEscalationStatusKey(StatusEnum.NO_REPORTED.getFlag());
+//                        hyFreightSettlementInfo.setEscalationStatus(StatusEnum.NO_REPORTED.getName());
+                                hyFreightSettlementInfoService.insert(hyFreightSettlementInfo);
+                            }
+                        }
+                    }
                 } else {
                     //驳回装车更改订单状态
                     orderInfo.setOrderStatus(StatusEnum.OWNER_REJECT_LOADING.getName());
@@ -238,14 +370,14 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
                     }
                     //查询订单是否垫付
                     //非垫付订单
-                    if("0".equals(orderInfo.getFreightAdvance())){
-                        if (freightInfo1.getPrepaidFreight() > hyCarrierInfo.getTotalFreight()){
+                    if ("0".equals(orderInfo.getFreightAdvance())) {
+                        if (freightInfo1.getPrepaidFreight() > hyCarrierInfo.getTotalFreight()) {
                             //预付运费大于实际运费
                             throw new YException(YExceptionEnum.TOTAL_BIG_PREPAID);
                         }
                         //查询费用信息
                         FreightInfo freightInfo = freightInfoService.selectOne(new EntityWrapper<FreightInfo>()
-                        .eq("order_id",orderInfo.getId()).eq("delete_flag","0"));
+                                .eq("order_id", orderInfo.getId()).eq("delete_flag", "0"));
                         //尾款
                         Double weikuan = freightInfo.getActualFreight() - freightInfo.getPrepaidFreight();
                         //尾款+服务费
@@ -258,41 +390,183 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
                         hyFreezingMoneyInfo.setType("冻结");
                         hyFreezingMoneyInfo.setAmountMoney(zong);
 
-                        if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()){
+                        if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()) {
                             //货主是公司
                             HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo.getCompId());
-                            if (hyCompanyInfo.getAccountBalance() < zong){
+                            if (hyCompanyInfo.getAccountBalance() < zong) {
                                 //账户余额小于尾款+服务费
                                 throw new YException(YExceptionEnum.INSUFFICIENT_ACCOUNT_BALANCES);
-                            }else {
+                            } else {
                                 //冻结公司账户余额
                                 Double d = hyCompanyInfo.getAccountBalance();
                                 Double d1 = hyCompanyInfo.getFrozenAmount();
-                                hyCompanyInfo.setAccountBalance(d-zong);
-                                hyCompanyInfo.setFrozenAmount(d1+zong);
+                                hyCompanyInfo.setAccountBalance(d - zong);
+                                hyCompanyInfo.setFrozenAmount(d1 + zong);
                                 companyInfoService.updateById(hyCompanyInfo);
                                 hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
                             }
-                        }
-                        else {
+                        } else {
                             //货主是个人
                             HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
-                                    .eq("common_id",orderInfo.getCargoCommonId()).eq("delete_flag","0"));
-                            if (hyCargoOwnerInfo.getAccountBalance() < zong){
+                                    .eq("common_id", orderInfo.getCargoCommonId()).eq("delete_flag", "0"));
+                            if (hyCargoOwnerInfo.getAccountBalance() < zong) {
                                 //账户余额小于尾款+服务费
                                 throw new YException(YExceptionEnum.INSUFFICIENT_ACCOUNT_BALANCES);
-                            }else {
+                            } else {
                                 //冻结货主账户余额
                                 Double d = hyCargoOwnerInfo.getAccountBalance();
                                 Double d1 = hyCargoOwnerInfo.getFrozenAmount();
-                                hyCargoOwnerInfo.setAccountBalance(d-zong);
-                                hyCargoOwnerInfo.setFrozenAmount(d1+zong);
+                                hyCargoOwnerInfo.setAccountBalance(d - zong);
+                                hyCargoOwnerInfo.setFrozenAmount(d1 + zong);
                                 cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
                                 hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
                             }
                         }
                         hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
                     }
+                    //查询货主是否为公司
+                    if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()) {
+                        //查询该公司是否自动跳过平台审核
+                        HyCompanyInfo hyCompanyInfo1 = companyInfoService.selectById(orderInfo.getCompId());
+                        if ("1".equals(hyCompanyInfo1.getSkipAudit())) {
+                            //确认卸车,判断是否是垫付订单
+                            if ("1".equals(orderInfo.getFreightAdvance())) {
+                                //确认卸车更改订单状态
+                                orderInfo.setOrderStatus(StatusEnum.DRIVER_ORDER_SETTLEMENT.getName());
+                                orderInfo.setOrderStatusKey(StatusEnum.DRIVER_ORDER_SETTLEMENT.getFlag());
+                                orderInfo.setCargoOwnerStatus(StatusEnum.OWNER_REPAID.getName());
+                                orderInfo.setCargoOwnerStatusKey(StatusEnum.OWNER_REPAID.getFlag());
+                            } else {
+                                orderInfo.setOrderStatus(StatusEnum.DRIVER_ORDER_SETTLEMENT.getName());
+                                orderInfo.setOrderStatusKey(StatusEnum.DRIVER_ORDER_SETTLEMENT.getFlag());
+                                orderInfo.setCargoOwnerStatus(StatusEnum.OWNER_ORDER_FINISH.getName());
+                                orderInfo.setCargoOwnerStatusKey(StatusEnum.OWNER_ORDER_FINISH.getFlag());
+                            }
+                            //查询费用信息
+                            FreightInfo freightInfo = freightInfoService.selectOne(new EntityWrapper<FreightInfo>()
+                                    .eq("order_id", orderInfo.getId()).eq("delete_flag", "0"));
+                            //非垫付订单
+                            if ("0".equals(orderInfo.getFreightAdvance())) {
+                                freightInfo.setPayableFreight(freightInfo.getActualFreight());
+                                freightInfo.setNopayableFreight(freightInfo.getPayableFreight() - freightInfo.getPayabledFreight());
+                                freightInfo.setOwnerFreightBalance(freightInfo.getActualFreight() - freightInfo.getPrepaidFreight());
+                                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                                String Time = df.format(new Date());
+                                freightInfo.setOwnerFreightBalanceDate(df.parse(Time));
+//                        Double d = freightInfo.getReceivableFreight();
+//                        freightInfo.setReceivableFreight(d + freightInfo.getOwnerFreightBalance() + freightInfo.getOwnerServiceCharge());
+//                        freightInfo.setReceivabledFreight(freightInfo.getReceivableFreight());
+                                freightInfo.setTotalCollection(freightInfo.getActualFreight() - freightInfo.getDriverServiceCharge());
+                                freightInfo.setTotalPayment(freightInfo.getActualFreight() + freightInfo.getOwnerServiceCharge());
+
+                                //生成货主冻结金额流向信息
+                                HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
+                                hyFreezingMoneyInfo.setId(IdGenerator.generateUUID());
+                                hyFreezingMoneyInfo.setOrderId(orderInfo.getId());
+                                hyFreezingMoneyInfo.setType("扣除");
+                                hyFreezingMoneyInfo.setAmountMoney(freightInfo.getOwnerFreightBalance() + freightInfo.getOwnerServiceCharge());
+
+                                if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()) {
+                                    //货主是公司
+                                    HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo.getCompId());
+                                    //将货主冻结金额减去
+                                    Double d1 = hyCompanyInfo.getFrozenAmount();
+                                    hyCompanyInfo.setFrozenAmount(d1 - freightInfo.getOwnerFreightBalance() - freightInfo.getOwnerServiceCharge());
+                                    companyInfoService.updateById(hyCompanyInfo);
+                                    hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
+                                    //生成货主账单信息
+                                    HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo = new HyCargoOwnerCapitalInfo();
+                                    hyCargoOwnerCapitalInfo.setId(IdGenerator.generateUUID());
+                                    hyCargoOwnerCapitalInfo.setCompanyId(hyCompanyInfo.getId());
+                                    hyCargoOwnerCapitalInfo.setTypes("支付尾款");
+                                    hyCargoOwnerCapitalInfo.setAmountMoney(freightInfo.getOwnerFreightBalance() + freightInfo.getOwnerServiceCharge());
+                                    hyCargoOwnerCapitalInfo.setOrderId(orderInfo.getId());
+                                    hyCargoOwnerCapitalInfo.setOrderNo(orderInfo.getOrderNo());
+                                    hyCargoOwnerCapitalInfoService.insert(hyCargoOwnerCapitalInfo);
+                                } else {
+                                    //货主是个人
+                                    HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
+                                            .eq("common_id", orderInfo.getCargoCommonId()).eq("delete_flag", "0"));
+                                    //将货主冻结金额减去
+                                    Double d1 = hyCargoOwnerInfo.getFrozenAmount();
+                                    hyCargoOwnerInfo.setFrozenAmount(d1 - freightInfo.getOwnerFreightBalance() - freightInfo.getOwnerServiceCharge());
+                                    cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+                                    hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
+                                    //生成货主账单信息
+                                    HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo = new HyCargoOwnerCapitalInfo();
+                                    hyCargoOwnerCapitalInfo.setId(IdGenerator.generateUUID());
+                                    hyCargoOwnerCapitalInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
+                                    hyCargoOwnerCapitalInfo.setTypes("支付尾款");
+                                    hyCargoOwnerCapitalInfo.setAmountMoney(freightInfo.getOwnerFreightBalance() + freightInfo.getOwnerServiceCharge());
+                                    hyCargoOwnerCapitalInfo.setOrderId(orderInfo.getId());
+                                    hyCargoOwnerCapitalInfo.setOrderNo(orderInfo.getOrderNo());
+                                    hyCargoOwnerCapitalInfoService.insert(hyCargoOwnerCapitalInfo);
+                                }
+                                hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
+                                //查询货主
+                                HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
+                                        .eq("common_id", orderInfo.getCargoCommonId()).eq("delete_flag", "0"));
+                                //货主是公司
+                                if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()) {
+                                    //计算公司累计支付运费
+                                    HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo.getCompId());
+                                    if (hyCompanyInfo != null) {
+                                        Double d3 = hyCompanyInfo.getAccumulatedFreight();
+                                        hyCompanyInfo.setAccumulatedFreight(d3 + freightInfo.getOwnerFreightBalance() + freightInfo.getOwnerServiceCharge());
+                                        companyInfoService.updateById(hyCompanyInfo);
+                                    }
+                                }
+                                //货主是个人
+                                else {
+                                    //计算货主累计支付运费
+                                    if (hyCargoOwnerInfo != null) {
+                                        Double d3 = hyCargoOwnerInfo.getAccumulatedFreight();
+                                        hyCargoOwnerInfo.setAccumulatedFreight(d3 + freightInfo.getOwnerFreightBalance() + freightInfo.getOwnerServiceCharge());
+                                    }
+                                }
+                                //货主发运次数+1
+                                if (hyCargoOwnerInfo != null) {
+                                    Long count = hyCargoOwnerInfo.getShipmentsNumber() + 1;
+                                    hyCargoOwnerInfo.setShipmentsNumber(count);
+                                    cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+                                }
+                            }
+                            //垫付订单
+                            else {
+                                freightInfo.setPayableFreight(freightInfo.getActualFreight() - freightInfo.getDriverServiceCharge());
+                                freightInfo.setNopayableFreight(freightInfo.getPayableFreight() - freightInfo.getPayabledFreight());
+                                freightInfo.setTotalCollection(freightInfo.getPayableFreight());
+                            }
+                            freightInfoService.updateById(freightInfo);
+                            //生成司机运费结算信息
+                            HyFreightSettlementInfo hyFreightSettlementInfo = new HyFreightSettlementInfo();
+                            hyFreightSettlementInfo.setId(IdGenerator.generateUUID());
+                            hyFreightSettlementInfo.setCommonId(orderInfo.getCommonId());
+                            hyFreightSettlementInfo.setOrderId(orderInfo.getId());
+                            hyFreightSettlementInfo.setOrderNo(orderInfo.getOrderNo());
+                            hyFreightSettlementInfo.setDocumentNo(orderInfo.getOrderNo().replace("CY", "ZJLS"));
+                            hyFreightSettlementInfo.setFreightAdvance(orderInfo.getFreightAdvance());
+                            hyFreightSettlementInfo.setDriverName(orderInfo.getDriverName());
+                            hyFreightSettlementInfo.setPayeeName(orderInfo.getPayeeName());
+                            hyFreightSettlementInfo.setPayeeIdCard(orderInfo.getPayeeIdCard());
+                            if (orderInfo.getCarCaptainCommonId() != null && !orderInfo.getCarCaptainCommonId().isEmpty()) {
+                                hyFreightSettlementInfo.setCarCaptainCommonId(orderInfo.getCarCaptainCommonId());
+                            }
+                            hyFreightSettlementInfo.setBankCard(orderInfo.getBankCard());
+                            hyFreightSettlementInfo.setBankDeposit(orderInfo.getBankDeposit());
+                            hyFreightSettlementInfo.setBankDepositBranch(orderInfo.getBankDepositBranch());
+                            hyFreightSettlementInfo.setPaymentType("尾款");
+                            if (freightInfo.getPrepaidFreight() == null) {
+                                throw new YException(YExceptionEnum.PAY_ADVANCE_PAYMENT);
+                            }
+                            hyFreightSettlementInfo.setAmountMoney(freightInfo.getActualFreight() - freightInfo.getPrepaidFreight() - freightInfo.getDriverServiceCharge());
+                            hyFreightSettlementInfo.setStatusKey(StatusEnum.NO_PAYMENT.getFlag());
+                            hyFreightSettlementInfo.setStatus(StatusEnum.NO_PAYMENT.getName());
+//                    hyFreightSettlementInfo.setEscalationStatusKey(StatusEnum.NO_REPORTED.getFlag());
+//                    hyFreightSettlementInfo.setEscalationStatus(StatusEnum.NO_REPORTED.getName());
+                            hyFreightSettlementInfoService.insert(hyFreightSettlementInfo);
+                        }
+                    }
                 } else {
                     //驳回卸车更改订单状态
                     orderInfo.setOrderStatus(StatusEnum.OWNER_REJECT_UNLOAD.getName());

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

@@ -265,7 +265,7 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setReCommonId(hyDriverCarInfo1.getCommonId());
-                newsInfo.setNewsTitle(hyDriverCarInfo1.getCarNumber() + "车辆信息被驳回！");
+                newsInfo.setNewsTitle("审核通知！");
                 newsInfo.setNewsContent(hyDriverCarInfo1.getCarNumber() + "车辆信息被驳回！" + "驳回原因：" + "\n" + hyDriverCarInfo1.getRejectReasonDescription());
                 newsInfo.setBussId(hyDriverCarInfo1.getId());
                 newsInfo.setNewsTypeKey("1");

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

@@ -424,7 +424,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setReCommonId(hyDriverInfo1.getCommonId());
-                newsInfo.setNewsTitle("身份认证已通过！");
+                newsInfo.setNewsTitle("审核通知！");
                 newsInfo.setNewsContent("身份认证已通过！");
                 newsInfo.setBussId(hyDriverInfo1.getId());
                 newsInfo.setNewsTypeKey("1");
@@ -440,7 +440,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setReCommonId(hyDriverInfo1.getCommonId());
-                newsInfo.setNewsTitle("身份认证已驳回！");
+                newsInfo.setNewsTitle("审核通知！");
                 newsInfo.setNewsContent("身份认证已驳回！" + "\n" + "驳回原因：" + hyDriverInfo.getRejectReason() + "\n" + "驳回原因描述：" + hyDriverInfo.getRejectReasonDescription());
                 newsInfo.setBussId(hyDriverInfo1.getId());
                 newsInfo.setNewsTypeKey("1");

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

@@ -162,7 +162,6 @@ public class FeedbackReportServiceImpl extends ServiceImpl<FeedbackReportMapper,
 
             // 向发起方发送消息
             NewsInfo newsInfo = new NewsInfo();
-            newsInfo.setCrtCommonId("000");
             newsInfo.setReCommonId(feedbackReport.getCommonId());
             //投诉
             if ("1".equals(feedbackReport.getFlag())){

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

@@ -245,28 +245,30 @@ public class HyOrderTravelPathServiceImpl extends ServiceImpl<HyOrderTravelPathM
             if (res.contains("1016")) {
 
             }
-            JSONObject jsonObject = JSONObject.parseObject(res);
-            JSONObject jsonData = jsonObject.getJSONObject("result");
-            if (jsonObject.get("status").toString().equals("1001")) {
-                JSONArray jsonArray = jsonData.getJSONArray("trackArray");
-                JSONArray result = new JSONArray();
-                for (int i = 0; i < jsonArray.size(); i++) {
-                    BigDecimal lonResult = jsonArray.getJSONObject(i).getBigDecimal("lon");
-                    Double lon = lonResult.doubleValue() / 600000;
-                    BigDecimal latResult = jsonArray.getJSONObject(i).getBigDecimal("lat");
-                    Double lat = latResult.doubleValue() / 600000;
-                    GpsView gpsView = PositionUtil.gps84_To_Gcj02(lon, lat);
-                    JSONObject data = new JSONObject();
-                    data.put("lon", gpsView.getMgLon());
-                    data.put("lat", gpsView.getMgLat());
-                    result.add(data);
+            if(res != null && !res.isEmpty()){
+                JSONObject jsonObject = JSONObject.parseObject(res);
+                JSONObject jsonData = jsonObject.getJSONObject("result");
+                if (jsonObject.get("status").toString().equals("1001")) {
+                    JSONArray jsonArray = jsonData.getJSONArray("trackArray");
+                    JSONArray result = new JSONArray();
+                    for (int i = 0; i < jsonArray.size(); i++) {
+                        BigDecimal lonResult = jsonArray.getJSONObject(i).getBigDecimal("lon");
+                        Double lon = lonResult.doubleValue() / 600000;
+                        BigDecimal latResult = jsonArray.getJSONObject(i).getBigDecimal("lat");
+                        Double lat = latResult.doubleValue() / 600000;
+                        GpsView gpsView = PositionUtil.gps84_To_Gcj02(lon, lat);
+                        JSONObject data = new JSONObject();
+                        data.put("lon", gpsView.getMgLon());
+                        data.put("lat", gpsView.getMgLat());
+                        result.add(data);
+                    }
+                    //返回当前北斗导航轨迹
+                    HyOrderTravelPath hyOrderTravelPath2 = new HyOrderTravelPath();
+                    hyOrderTravelPath2.setOrderId(hyOrderTravelPath.getOrderId());
+                    hyOrderTravelPath2.setType("2");
+                    hyOrderTravelPath2.setLongitudeLatitude(result.toJSONString());
+                    return hyOrderTravelPath2;
                 }
-                //返回当前北斗导航轨迹
-                HyOrderTravelPath hyOrderTravelPath2 = new HyOrderTravelPath();
-                hyOrderTravelPath2.setOrderId(hyOrderTravelPath.getOrderId());
-                hyOrderTravelPath2.setType("2");
-                hyOrderTravelPath2.setLongitudeLatitude(result.toJSONString());
-                return hyOrderTravelPath2;
             }
         }
         HyOrderTravelPath hyOrderTravelPath2 = new HyOrderTravelPath();

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

@@ -129,7 +129,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
      */
     @Transactional
     @Scheduled(cron = "0 */1 * * * ?")
-    public void queryOrderTimeout(){
+    public void queryOrderTimeout() {
         //查询所有运输中的订单
         List<OrderInfo> orderInfoList = this.selectList(new EntityWrapper<OrderInfo>().eq("order_status_key", 13)
                 .eq("delete_flag", "0"));
@@ -141,7 +141,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 HyCarrierInfo hyCarrierInfo = carrierInfoService.selectOne(new EntityWrapper<HyCarrierInfo>().eq("order_id", orderInfo.getId())
                         .eq("delete_flag", "0"));
                 //获取装车时间和运输时长,计算预计送达时间
-                int min = (int)(hyCarrierInfo.getTransportationDuration() * 60);
+                int min = (int) (hyCarrierInfo.getTransportationDuration() * 60);
                 Calendar calendar = Calendar.getInstance();
                 calendar.setTime(hyCarrierInfo.getLoadingDate());
                 calendar.add(Calendar.MINUTE, min);
@@ -150,8 +150,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 int result = date.compareTo(now);
                 if (result < 0) {
                     //查询是否已给司机发送过通知
-                    NewsInfo newsInfo4 = newsInfoService.selectOne(new EntityWrapper<NewsInfo>().eq("re_common_id",orderInfo.getCommonId())
-                    .eq("news_type_key","5").eq("buss_id",orderInfo.getId()));
+                    NewsInfo newsInfo4 = newsInfoService.selectOne(new EntityWrapper<NewsInfo>().eq("re_common_id", orderInfo.getCommonId())
+                            .eq("news_type_key", "5").eq("buss_id", orderInfo.getId()));
                     if (newsInfo4 == null) {
                         //给司机发送消息
                         NewsInfo newsInfo = new NewsInfo();
@@ -548,7 +548,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
                 // 向司机发送信息
                 NewsInfo newsInfo = new NewsInfo();
-                newsInfo.setCrtCommonId("000");
                 newsInfo.setReCommonId(orderInfo1.getCommonId());
                 newsInfo.setNewsTitle("平台终止订单");
                 newsInfo.setNewsContent("订单编号" + orderInfo1.getOrderNo() + "已被平台终止");
@@ -1041,12 +1040,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         public void run() {
                             try {
                                 String result = EntityAnalyse.uploadWaybill(orderInfo1);
-                                if ("数据上报成功,数据完整，等待系统校验".equals(result)){
+                                if ("数据上报成功,数据完整，等待系统校验".equals(result)) {
                                     //更改上报状态
                                     orderInfo1.setEscalationStatusKey(StatusEnum.UNDER_REVIEW.getFlag());
                                     orderInfo1.setEscalationStatus(StatusEnum.UNDER_REVIEW.getName());
                                     orderInfoService.updateById(orderInfo1);
-                                }else {
+                                } else {
                                     //更改上报状态
                                     orderInfo1.setEscalationStatusKey(StatusEnum.NOT_ADOPT.getFlag());
                                     orderInfo1.setEscalationStatus(StatusEnum.NOT_ADOPT.getName());
@@ -1082,15 +1081,15 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
                     //驾驶员监测系统上报
                     HyDriverInfo hyDriverInfo1 = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
-                            .eq("common_id",orderInfo1.getCommonId()).eq("delete_flag","0"));
+                            .eq("common_id", orderInfo1.getCommonId()).eq("delete_flag", "0"));
                     //查询车辆信息
                     HyDriverCarInfo hyDriverCarInfo1 = driverCarInfoService.selectOne(new EntityWrapper<HyDriverCarInfo>()
-                            .eq("car_number",orderInfo1.getCarNumber()).eq("delete_flag","0"));
+                            .eq("car_number", orderInfo1.getCarNumber()).eq("delete_flag", "0"));
                     //查询车辆类型key值
                     HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
                             .eq("const_id", "CAR1").eq("const_value", hyDriverCarInfo1.getVehicleType()));
                     hyDriverCarInfo1.setVehicleTypeKey(hyCommonSysParameter.getConstKey());
-                    if(hyDriverCarInfo1.getTrailerVehicleType()!= null && !hyDriverCarInfo1.getTrailerVehicleType().isEmpty()){
+                    if (hyDriverCarInfo1.getTrailerVehicleType() != null && !hyDriverCarInfo1.getTrailerVehicleType().isEmpty()) {
                         //查询挂车车辆类型key值
                         HyCommonSysParameter hyCommonSysParameter3 = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
                                 .eq("const_id", "CAR1").eq("const_value", hyDriverCarInfo1.getTrailerVehicleType()));
@@ -1121,9 +1120,30 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     if (hyCarrierInfo != null) {
                         orderInfo1.setDeliveryTime(hyCarrierInfo.getLoadingDate());
                         orderInfo1.setReceivingTime(hyCarrierInfo.getUnloadingDate());
+                        //查询车辆装车毛重
                         orderInfo1.setGrossWeight(hyCarrierInfo.getLoadingGrossWeight());
-                        orderInfo1.setVolume(hyCarrierInfo.getVolume());
-                        orderInfo1.setPackageNumber(hyCarrierInfo.getPackageNumber());
+                        //判断装车毛重是否大于等于车辆核定载质量
+                        if ("挂车".equals(hyDriverCarInfo1.getCarCategory())) {
+                            if (orderInfo1.getGrossWeight() >= (hyDriverCarInfo1.getGuaCarApprovedWeight() / 1000)) {
+                                int min_val = 1;
+                                int max_val = 4;
+                                double randomNum = Math.random() * ( max_val - min_val );
+                                orderInfo1.setGrossWeight(hyDriverCarInfo1.getGuaCarApprovedWeight() - randomNum);
+                            }
+                        } else {
+                            if (orderInfo1.getGrossWeight() >= (hyDriverCarInfo1.getCarApprovedWeight() / 1000)) {
+                                int min_val = 1;
+                                int max_val = 4;
+                                double randomNum = Math.random() * ( max_val - min_val );
+                                orderInfo1.setGrossWeight(hyDriverCarInfo1.getCarApprovedWeight() - randomNum);
+                            }
+                        }
+                        if (hyCarrierInfo.getVolume() != null) {
+                            orderInfo1.setVolume(hyCarrierInfo.getVolume());
+                        }
+                        if (hyCarrierInfo.getPackageNumber() != null) {
+                            orderInfo1.setPackageNumber(hyCarrierInfo.getPackageNumber());
+                        }
                     }
                     //3.查询托运人信息
                     HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
@@ -1203,7 +1223,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
-                            if(hyDriverCarInfo1.getGuaCarNumber()!= null && !hyDriverCarInfo1.getGuaCarNumber().isEmpty()) {
+                            if (hyDriverCarInfo1.getGuaCarNumber() != null && !hyDriverCarInfo1.getGuaCarNumber().isEmpty()) {
                                 //挂车车辆交管监测系统上报
                                 try {
                                     String result = MonitoringSystemReporting.testTrailerVehicleRoot(hyDriverCarInfo1);
@@ -1437,6 +1457,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             //卸车
             else {
                 if ("1".equals(orderInfo.getExamineFlag())) {
+                    //确认卸车
                     if ("1".equals(orderInfo1.getFreightAdvance())) {
                         //确认卸车更改订单状态
                         orderInfo1.setOrderStatus(StatusEnum.DRIVER_ORDER_SETTLEMENT.getName());
@@ -1664,16 +1685,16 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 if (hyDriverCarInfo == null) {
                     throw new YException(YExceptionEnum.CAR_NOT_EXIST);
                 }
-                //查询车辆核定载重量
-                if ("挂车".equals(hyDriverCarInfo.getCarCategory())) {
-                    if (orderInfo.getGrossWeight() >= (hyDriverCarInfo.getGuaCarApprovedWeight() / 1000)) {
-                        throw new YException(YExceptionEnum.LOADING_NETWEIGHT_OVERLOAD);
-                    }
-                } else {
-                    if (orderInfo.getGrossWeight() >= (hyDriverCarInfo.getCarApprovedWeight() / 1000)) {
-                        throw new YException(YExceptionEnum.LOADING_NETWEIGHT_OVERLOAD);
-                    }
-                }
+//                //查询车辆核定载重量
+//                if ("挂车".equals(hyDriverCarInfo.getCarCategory())) {
+//                    if (orderInfo.getGrossWeight() >= (hyDriverCarInfo.getGuaCarApprovedWeight() / 1000)) {
+//                        throw new YException(YExceptionEnum.LOADING_NETWEIGHT_OVERLOAD);
+//                    }
+//                } else {
+//                    if (orderInfo.getGrossWeight() >= (hyDriverCarInfo.getCarApprovedWeight() / 1000)) {
+//                        throw new YException(YExceptionEnum.LOADING_NETWEIGHT_OVERLOAD);
+//                    }
+//                }
             }
             String pdfUrl = pdfUtil.tranContract(orderInfo);
             //承运信息

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

@@ -689,6 +689,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         //已过期数量
         Integer count3 = this.selectCount(new EntityWrapper<PublishTaskInfo>().eq("common_id", publishTaskInfo.getCommonId())
                 .eq("status_key", "7").eq("delete_flag", "0"));
+        //全部数量
+        publishTaskInfo1.setAllNum(count+count1+count2+count3);
         publishTaskInfo1.setExamieNum(count);
         publishTaskInfo1.setNoNum(count1);
         publishTaskInfo1.setPassNum(count2);
@@ -736,7 +738,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         pageView.put("startRecord", (publishTaskInfo.getCurrentPage() - 1)
                 * publishTaskInfo.getPageSize());
         Page<PublishTaskInfo> page = new Page<>();
-        if (publishTaskInfo.getLoadingPlace() == null || publishTaskInfo.getLoadingPlaceCity() == null) {
+        if (publishTaskInfo.getLoadingPlace() == null && publishTaskInfo.getLoadingPlaceCity() == null) {
             page.setRecords(Lists.newArrayList());
             page.setTotal(0);
             page.setCurrent(publishTaskInfo.getCurrentPage());
@@ -1587,9 +1589,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                 publishTaskInfo1.setBackStageStatus(StatusEnum.TASK_RETURN.getName());
                 // 向货主发送信息
                 NewsInfo newsInfo = new NewsInfo();
-                newsInfo.setCrtCommonId("000");
                 newsInfo.setReCommonId(publishTaskInfo1.getCommonId());
-                newsInfo.setNewsTitle("您发布的货运任务被驳回。");
+                newsInfo.setNewsTitle("审核通知！");
                 newsInfo.setNewsContent("您发布的货运任务被驳回。");
                 newsInfo.setBussId(publishTaskInfo1.getId());
                 newsInfo.setNewsTypeKey("1");