修改

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

@@ -72,6 +72,10 @@ public class FreightReceivingDispatching extends BaseModel<FreightReceivingDispa
      * 收货人账号
      */
     private String accountNumber;
+    /**
+     * 发货人手机号
+     */
+    private String shipperPhone;
     /**
      * 代签收
      */

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

@@ -576,6 +576,24 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
         else {
             saleOrder.setStatus(StatusEnum.ORDER_PASSED.getName());
             saleOrder.setStatusFlag(StatusEnum.ORDER_PASSED.getFlag());
+            // 更新客户信息
+            CustomerInfo customerInfo = customerInfoService.selectOne(new EntityWrapper<CustomerInfo>()
+                    .eq("customer_phone", saleOrder.getBuyerPhone())
+                    .eq("delete_flag", "0"));
+            if (customerInfo != null) {
+                //客户可用预存>=应冻结定金
+                if (customerInfo.getTotalDeposit()-customerInfo.getFreezingDeposit()>= saleOrder.getFreezingDeposit()) {
+                    customerInfo.setFreezingDeposit(customerInfo.getFreezingDeposit()+saleOrder.getFreezingDeposit());
+                }
+                else if(customerInfo.getTotalDeposit()-customerInfo.getFreezingDeposit()- saleOrder.getFreezingDeposit()<=0){
+                    //订单拖欠定金
+                    saleOrder.setDefaultDeposit( saleOrder.getFreezingDeposit()-(customerInfo.getTotalDeposit()-customerInfo.getFreezingDeposit()));
+                    //订单冻结定金
+                    saleOrder.setFreezingDeposit(customerInfo.getTotalDeposit()-customerInfo.getFreezingDeposit());
+                    customerInfo.setFreezingDeposit(customerInfo.getTotalDeposit());
+                }
+                customerInfoService.updateById(customerInfo);
+            }
         }
         //向改价记录表插入数据
         PriceChangeRecord priceChangeRecord = new PriceChangeRecord();

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/FreightReceivingDispatchingMapper.xml

@@ -15,6 +15,7 @@
         delete_flag = '0'
         <if test="accountNumber != null and accountNumber != ''">
             AND account_number = #{accountNumber}
+            OR shipper_phone=#{accountNumber}
         </if>
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
@@ -61,6 +62,7 @@
         delete_flag = '0'
         <if test="accountNumber != null and accountNumber != ''">
             AND account_number = #{accountNumber}
+            OR shipper_phone=#{accountNumber}
         </if>
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">