Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-hd/controllers/PurchaseController.php

@@ -115,6 +115,7 @@ class PurchaseController extends BaseController
         if (empty($info)) {
             util::fail('没有找到采购单');
         }
+
         PurchaseClass::valid($info->attributes, $this->shopId);
         $connection = Yii::$app->db;//事务处理
         $transaction = $connection->beginTransaction();

biz-hd/purchase/classes/PurchaseClass.php

@@ -273,6 +273,12 @@ class PurchaseClass extends BaseClass
             util::fail('没有找到门店');
         }
         $actPrice = $info->actPrice;
+        if ($payWay == dict::getDict('payWay', 'balancePay')) {
+            if (bccomp($actPrice, $shop->balance, 2) == 1) {
+                util::fail('余额不足');
+            }
+            $shop->balance = bcsub($shop->balance, $actPrice, 2);
+        }
         $shop->totalPurchase = bcadd($shop->totalPurchase, $actPrice, 2);
         $shop->totalPurchaseOrder += 1;
         $shop->save();