1

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

@@ -582,19 +582,19 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
                     .eq("customer_phone", purchaseOrder.getSellerPhone())
                     .eq("delete_flag", "0"));
             if (customerInfo != null) {
-                if (customerInfo.getFreezingDeposit() != null && customerInfo.getFreezingDeposit() >= purchaseOrder.getFreezingDeposit()) {
-                    if(customerInfo.getTotalDeposit() ==null){
-                        customerInfo.setFreezingDeposit(0.0f);
-                    }
-                    else if(customerInfo.getTotalDeposit() >= purchaseOrder.getFreezingDeposit()){
-                        customerInfo.setFreezingDeposit(purchaseOrder.getFreezingDeposit());
-                    }
-                    else{
-                        customerInfo.setFreezingDeposit(customerInfo.getTotalDeposit());
-                    }
-                    customerInfo.setFreezingDeposit(customerInfo.getFreezingDeposit() - purchaseOrder.getFreezingDeposit());
-                    customerInfoService.updateById(customerInfo);
+                //客户可用预存>=应冻结定金
+                if (customerInfo.getTotalDeposit()-customerInfo.getFreezingDeposit()>= purchaseOrder.getFreezingDeposit()) {
+                    customerInfo.setFreezingDeposit(customerInfo.getFreezingDeposit()+purchaseOrder.getFreezingDeposit());
+
+                }
+                else if(customerInfo.getTotalDeposit()-customerInfo.getFreezingDeposit()- purchaseOrder.getFreezingDeposit()<=0){
+                    customerInfo.setFreezingDeposit(customerInfo.getTotalDeposit()-customerInfo.getFreezingDeposit());
+                    //订单冻结定金
+                    purchaseOrder.setFreezingDeposit(customerInfo.getTotalDeposit()-customerInfo.getFreezingDeposit());
+                    //订单拖欠定金
+                    purchaseOrder.setDefaultDeposit( purchaseOrder.getFreezingDeposit()-customerInfo.getTotalDeposit()-customerInfo.getFreezingDeposit());
                 }
+                customerInfoService.updateById(customerInfo);
             }
         }
         boolean one = this.updateById(purchaseOrder);