修改

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

@@ -158,7 +158,7 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, HyCom
     }
 
     /**
-     * 审核/ 禁用
+     * 审核/禁用
      *
      * @param hyCompanyInfo
      * @return
@@ -177,8 +177,8 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, HyCom
             }
             //驳回
             else if("2".equals(hyCompanyInfo.getFlag())){
-                hyCompanyInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
-                hyCompanyInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
+                hyCompanyInfo1.setStatusKey(StatusEnum.TASK_RETURN.getFlag());
+                hyCompanyInfo1.setStatus(StatusEnum.TASK_RETURN.getName());
             }
             //更改信息
             this.updateById(hyCompanyInfo1);

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

@@ -680,6 +680,32 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     orderInfo1.setOrderStatusKey(StatusEnum.PLATFORM_REJECT_LOADING.getFlag());
                     orderInfo1.setCargoOwnerStatus(StatusEnum.PLATFORM_REJECT_LOADING.getName());
                     orderInfo1.setCargoOwnerStatusKey(StatusEnum.PLATFORM_REJECT_LOADING.getFlag());
+                    //非垫付订单
+                    if ("0".equals(orderInfo1.getFreightAdvance())) {
+                        //查询费用信息
+                        FreightInfo freightInfo = freightInfoService.selectOne(new EntityWrapper<FreightInfo>()
+                                .eq("order_id", orderInfo1.getId()).eq("delete_flag", "0"));
+                        if (orderInfo1.getCompId() != null && !orderInfo1.getCompId().isEmpty()) {
+                            //货主是公司
+                            HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo1.getCompId());
+                            //将货主冻结金额解冻
+                            Double d = hyCompanyInfo.getAccountBalance();
+                            Double d1 = hyCompanyInfo.getFrozenAmount();
+                            hyCompanyInfo.setAccountBalance(d + freightInfo.getPrepaidFreight());
+                            hyCompanyInfo.setFrozenAmount(d1 - freightInfo.getPrepaidFreight());
+                            companyInfoService.updateById(hyCompanyInfo);
+                        } else {
+                            //货主是个人
+                            HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
+                                    .eq("common_id", orderInfo1.getCargoCommonId()).eq("delete_flag", "0"));
+                            //将货主冻结金额解冻
+                            Double d = hyCargoOwnerInfo.getAccountBalance();
+                            Double d1 = hyCargoOwnerInfo.getFrozenAmount();
+                            hyCargoOwnerInfo.setAccountBalance(d + freightInfo.getPrepaidFreight());
+                            hyCargoOwnerInfo.setFrozenAmount(d1 - freightInfo.getPrepaidFreight());
+                            cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+                        }
+                    }
                 }
             }
             //卸车

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/PdfUtil.java

@@ -187,7 +187,7 @@ public class PdfUtil  implements InitializingBean{
                 case "Text21" :
                     form.setField(name, orderInfo.getWeight());break;
                 case "Text2" :
-                    form.setField(name, String.valueOf(orderInfo.getAdvanceCharge()));break;
+                    form.setField(name, String.valueOf(orderInfo.getAdvanceCharge() == null ? 0 : orderInfo.getAdvanceCharge()));break;
                 case "fill_1_2" :
                     form.setField(name, hyDriverPayeeInfo.getBankCard());break;
                 case "fill_1_3" :
@@ -197,25 +197,13 @@ public class PdfUtil  implements InitializingBean{
                 case "Text4" :
                     form.setField(name, "甲方");break;
                 case "Text5" :
-                    if(orderInfo1.getDriverAutograph() == null || orderInfo1.getDriverAutograph().isEmpty()){
-                        break;
-                    }
-                    Image image1 = Image.getInstance(new URL(orderInfo1.getDriverAutograph()));
+                    Image image1 = Image.getInstance(new URL("https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/gongzhang.png"));
                     image1.scaleToFit(signRect.getWidth(), signRect.getHeight());
                     image1.setAbsolutePosition(x, y);
                     under.addImage(image1);
                         break;
-                case "Text6" :
-                    if(orderInfo1.getDriverAutograph() == null || orderInfo1.getDriverAutograph().isEmpty()){
-                        break;
-                    }
-                    Image image2 = Image.getInstance(new URL(orderInfo1.getDriverAutograph()));
-                    image2.scaleToFit(signRect.getWidth(), signRect.getHeight());
-                    image2.setAbsolutePosition(x, y);
-                    under.addImage(image2);
-                        break;
                 case "Text7" :
-                    form.setField(name, "辽宁省营口市鲅鱼圈区蝴蝶泉路龙港花园北一门");break;
+                    form.setField(name, "辽宁省营口市鲅鱼圈区青龙山大街8号");break;
                 case "Text8" :
                     form.setField(name, "123456");break;
                 case "Text9" :

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/OrderInfoMapper.xml

@@ -418,7 +418,7 @@
                 AND o.order_status_key = '25'
             </if>
         </if>
-        ORDER BY o.order_status_key DESC, o.update_date DESC
+        ORDER BY o.create_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>