shish 4 years ago
parent
commit
7ddbdf3d79

+ 1 - 1
app-hd/controllers/PurchaseController.php

@@ -42,7 +42,7 @@ class PurchaseController extends BaseController
 
         $shop = $this->shop;
         $pfShopId = $shop->pfShopId ?? 0;
-        if (empty($pfShopId)) {
+        if (!empty($pfShopId)) {
             util::fail('请在批发店进行采购');
         }
 

+ 4 - 2
biz-ghs/custom/classes/CustomClass.php

@@ -147,8 +147,10 @@ class CustomClass extends BaseClass
         $amount = $order->realPrice ?? 0;
         $custom->isDebt = CustomClass::IS_DEBT_YES;
         $debtLimit = $custom->debtLimit ?? 0;
-        if ($custom->debtAmount > $debtLimit) {
-            util::fail("您已欠款{$custom->debtAmount},请先结账哦");
+        if ($bookOrder == false) {
+            if ($custom->debtAmount > $debtLimit) {
+                util::fail("您已欠款{$custom->debtAmount},请先结账哦");
+            }
         }
         $balance = bcadd($custom->debtAmount, $amount, 2);
         $custom->debtAmount = $balance;

+ 4 - 0
biz-ghs/order/classes/OrderClass.php

@@ -307,6 +307,10 @@ class OrderClass extends BaseClass
 
                 $payWay = dict::getDict('payWay', 'debtPay');
 
+                $custom = CustomClass::getLockById($customId);
+                if (empty($custom)) {
+                    util::fail('没有找到客户');
+                }
                 CustomClass::cgDebtAmountAdd($custom, $order, true);
 
                 //收入增加