供求问题

app-ghs/controllers/NoticeController.php

@@ -6,6 +6,7 @@ use bizGhs\express\services\DadaExpressServices;
 use bizGhs\order\classes\OrderClass;
 use bizGhs\order\classes\OrderExpressClass;
 use bizGhs\order\classes\OrderSendClass;
+use bizGhs\order\services\OrderService;
 use common\components\dict;
 use common\components\pay;
 use Yii;
@@ -189,8 +190,8 @@ class NoticeController extends PublicController
             case DadaExpressServices::ORDER_COMPLETE:
                 //订单完成 todo
                 OrderExpressClass::reach($orderInfo);
-                OrderSendClass::reach($orderInfo);
-                OrderClass::reach($orderInfo);
+                //OrderSendClass::reach($orderInfo);
+                OrderService::reach($orderInfo);
                 break;
             case DadaExpressServices::ORDER_CANCEL:
                 //取消 todo

app-ghs/controllers/OrderController.php

@@ -214,14 +214,14 @@ class OrderController extends BaseController
         util::success($info);
     }
 
-    //自取和免发货流程处理 ssh 2021.1.22
+    //自取免发货流程处理 ssh 2021.1.22
     public function actionWithoutSend()
     {
         $get = Yii::$app->request->get();
         $id = $get['id'] ?? 0;
         $info = OrderClass::getOrderInfo($id);
         OrderClass::valid($info, $this->shopId);
-        OrderClass::withoutSend($info);
+        OrderService::withoutSend($info);
         util::complete();
     }
 
@@ -344,7 +344,7 @@ class OrderController extends BaseController
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
-            OrderClass::reach($info);
+            OrderService::reach($info);
             $transaction->commit();
         } catch (\Exception $exception) {
             $transaction->rollBack();

app-hd/controllers/PurchaseController.php

@@ -88,7 +88,8 @@ class PurchaseController extends BaseController
         $connection = Yii::$app->db;//事务处理
         $transaction = $connection->beginTransaction();
         try {
-            PurchaseClass::debt($info);
+            //延期支付
+            PurchaseService::debt($info);
             $transaction->commit();
         } catch (Exception $e) {
             $transaction->rollBack();
@@ -117,7 +118,8 @@ class PurchaseController extends BaseController
         $connection = Yii::$app->db;//事务处理
         $transaction = $connection->beginTransaction();
         try {
-            purchaseClass::balancePay($info);
+            //余额支付
+            purchaseService::balancePay($info);
             $transaction->commit();
         } catch (Exception $e) {
             $transaction->rollBack();

biz-ghs/order/classes/OrderClass.php

@@ -374,17 +374,6 @@ class OrderClass extends BaseClass
         }
     }
 
-    //确认送达 ssh 2021.3.4
-    public static function reach($order)
-    {
-        if ($order['status'] != OrderClass::ORDER_STATUS_SENDING) {
-            util::fail('订单没有在配送状态');
-        }
-        $id = $order['id'];
-        self::updateById($id, ['status' => self::ORDER_STATUS_COMPLETE, 'totalFlow' => OrderClass::TOTAL_FLOW, 'currentFlow' => OrderClass::TOTAL_FLOW]);
-        OrderSendClass::reach($order);
-    }
-
     //快递送 ssh 2021.3.16
     public static function thirdSend($order, $expressInfo)
     {
@@ -460,35 +449,6 @@ class OrderClass extends BaseClass
         OrderSendClass::selfSend($info);
     }
 
-    //自取和免发货流程的处理 ssh 2021.1.24
-    public static function withoutSend($order)
-    {
-        $id = $order->id ?? 0;
-        if (isset($order->status) == false) {
-            util::fail('没有订单状态');
-        }
-        if ($order->status == self::ORDER_STATUS_COMPLETE) {
-            util::fail('订单已完成');
-        }
-
-        //自取订单，订单直接完成。【现在有三个地方有订单完成操作】，找不到请搜索【】内关键词。
-        $currentOrder = self::getById($id, true);
-        $shopId = $order->shopId ?? 0;
-        $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
-        if (empty($shop)) {
-            util::fail('没有找到门店');
-        }
-        $shop->unSendOrder -= 1;
-        $shop->sendingOrder += 1;
-        $shop->save();
-
-        self::complete($currentOrder, $shop, self::TOTAL_FLOW, OrderClass::TOTAL_FLOW, self::SEND_TYPE_NO);
-
-        OrderSendClass::withoutSend($order);
-
-        return self::TOTAL_FLOW;
-    }
-
     //订单完成 ssh 2020.3.12
     public static function complete($order, $shop, $currentFlow, $totalFlow = false, $sendType = false)
     {
@@ -507,84 +467,6 @@ class OrderClass extends BaseClass
         $shop->save();
     }
 
-    public static function payAfter($order, $payWay)
-    {
-        if (isset($order->status) == false) {
-            util::fail('没有订单状态');
-        }
-        if ($order->status != self::ORDER_STATUS_UN_PAY) {
-            util::fail('重复操作');
-        }
-        if (isset($order->debt) == false) {
-            util::fail('订单有问题，没有欠款项');
-        }
-        /**门店资产变化**/
-        $amount = $order->actPrice ?? 0.00;
-        $currentShopId = $order->shopId ?? 0;
-        $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $currentShopId])->one();
-        if (empty($shop)) {
-            util::fail('没有找到门店');
-        }
-        $shop->unPayOrder -= 1;
-        $shop->unSendOrder += 1;
-        $shop->totalOrderNum += 1;
-        $shop->totalIncome = bcadd($shop->totalIncome, $amount, 2);
-        $shop->save();
-
-        //更新订单基础状态和支付状态
-        $orderId = $order->id;
-        $orderSn = $order->orderSn;
-        $order->payWay = $payWay;
-        $order->status = self::ORDER_STATUS_UN_SEND;
-        if ($payWay == dict::getDict('payWay', 'debtPay')) {
-            $order->debt = self::DEBT_YES;
-        }
-        $order->save();
-
-        //员工业绩、总业绩增加
-        $shopAdminId = $order->shopAdminId ?? 0;
-        if (!empty($shopAdminId)) {
-            $shopAdmin = ShopAdminClass::getById($shopAdminId, true);
-            $shopAdmin->kdAmount = bcadd($shopAdmin->kdAmount, $amount, 2);
-            $shopAdmin->save();
-        }
-        StatYjClass::addYj($order);
-
-        /**客户资产变化**/
-        $customId = $order->customId;
-        $custom = Custom::findBySql('select * from ' . Custom::tableName() . ' where id = :id for update', ['id' => $customId])->one();
-        if (empty($custom)) {
-            util::fail('没有找到客户信息');
-        }
-        if ($payWay == dict::getDict('payWay', 'debtPay')) {
-            //欠款支付
-            $custom->isDebt = CustomClass::IS_DEBT_YES;
-            $custom->debtAmount = bcadd($custom->debtAmount, $amount, 2);
-            $custom->debtNum += 1;
-        }
-        $custom->buyNum += 1;
-        $custom->buyAmount = bcadd($custom->buyAmount, $amount, 2);
-        $custom->save();
-
-        //每天和每月收入
-        StatIncomeClass::updateOrInsert($shop, $order->actPrice);
-        //今日订单+1
-        StatOrderClass::updateOrInsert($shop);
-
-        //显示已下单流程
-        $time = date("Y-m-d H:i:s");
-        $placeData = ['payTime' => $time, 'orderSn' => $orderSn, 'orderId' => $orderId];
-        OrderSendClass::placeOrder($placeData);
-
-        //自取订单，订单直接完成，【现在有三个地方有订单完成操作】，找不到请搜索【】内关键词。
-        if (isset($order->sendType) == false) {
-            util::fail('没有找到配送方式');
-        }
-        if ($order->sendType == OrderClass::SEND_TYPE_NO) {
-            self::withoutSend($order);
-        }
-    }
-
     //修改订单表的配送信息 linqh 2021.3.28
     public static function updateCustomExpressInfo($id, $expressAddInfo)
     {

biz-ghs/order/services/OrderSendService.php

@@ -125,7 +125,7 @@ class OrderSendService extends BaseService
         }
         OrderSendClass::reach($order);
 
-        //送达，订单完成。【现在有三个地方有订单完成操作】，找不到请搜索【】内关键词。
+        //送达，订单完成。【现在有三个地方有订单完成操作】
         $id = $order['id'];
         $currentOrder = self::getById($id, true);
         $shopId = $order['shopId'] ?? 0;

biz-ghs/order/services/OrderService.php

@@ -3,9 +3,16 @@
 namespace bizGhs\order\services;
 
 use biz\ghs\classes\GhsClass;
+use biz\shop\classes\ShopAdminClass;
 use biz\shop\models\Shop;
 use bizGhs\base\services\BaseService;
+use bizGhs\custom\classes\CustomClass;
+use bizGhs\custom\models\Custom;
 use bizGhs\order\classes\OrderClass;
+use bizGhs\order\classes\OrderSendClass;
+use bizGhs\stat\classes\StatYjClass;
+use bizHd\stat\classes\StatIncomeClass;
+use bizHd\stat\classes\StatOrderClass;
 use common\components\dict;
 use common\components\util;
 use bizHd\purchase\classes\PurchaseClass;
@@ -64,17 +71,58 @@ class OrderService extends BaseService
 
         $return->purchaseId = $purchaseId;
         $return->save();
-        OrderClass::payAfter($return);
+        OrderService::payAfter($return);
         PurchaseClass::payAfter($purchase);
 
         //自取订单直接完成
         if (isset($data['sendType']) && $data['sendType'] == OrderClass::SEND_TYPE_NO) {
-            OrderClass::withoutSend($return);
+            self::withoutSend($return);
         }
 
         return $return->attributes;
     }
 
+    //自取免发货流程处理 ssh 2021.1.24
+    public static function withoutSend($order)
+    {
+        $id = $order->id ?? 0;
+        if (isset($order->status) == false) {
+            util::fail('没有订单状态');
+        }
+        if ($order->status == self::ORDER_STATUS_COMPLETE) {
+            util::fail('订单已完成');
+        }
+
+        //自取订单，订单直接完成。【现在有三个地方有订单完成操作】
+        $currentOrder = self::getById($id, true);
+        $shopId = $order->shopId ?? 0;
+        $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
+        if (empty($shop)) {
+            util::fail('没有找到门店');
+        }
+        $shop->unSendOrder -= 1;
+        $shop->sendingOrder += 1;
+        $shop->save();
+
+        OrderClass::complete($currentOrder, $shop, self::TOTAL_FLOW, OrderClass::TOTAL_FLOW, self::SEND_TYPE_NO);
+
+        OrderSendClass::withoutSend($order);
+
+        return OrderClass::TOTAL_FLOW;
+    }
+
+    //确认送达 ssh 2021.3.4
+    public static function reach($order)
+    {
+        if ($order['status'] != OrderClass::ORDER_STATUS_SENDING) {
+            util::fail('订单没有在配送状态');
+        }
+        $id = $order['id'];
+        //送达订单完成。【现在有三个地方有订单完成操作】
+        OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_COMPLETE, 'totalFlow' => OrderClass::TOTAL_FLOW, 'currentFlow' => OrderClass::TOTAL_FLOW]);
+        OrderSendClass::reach($order);
+    }
+
     //获取订单信息 ssh 2019.11.28
     public static function getOrderList($where)
     {
@@ -298,4 +346,83 @@ class OrderService extends BaseService
         PurchaseClass::cancel($purchaseId);
     }
 
+    //支付成功后的流程 shish 2021.5.14
+    public static function payAfter($order, $payWay)
+    {
+        if (isset($order->status) == false) {
+            util::fail('没有订单状态');
+        }
+        if ($order->status != OrderClass::ORDER_STATUS_UN_PAY) {
+            util::fail('重复操作');
+        }
+        if (isset($order->debt) == false) {
+            util::fail('订单有问题，没有欠款项');
+        }
+        /**门店资产变化**/
+        $amount = $order->actPrice ?? 0.00;
+        $currentShopId = $order->shopId ?? 0;
+        $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $currentShopId])->one();
+        if (empty($shop)) {
+            util::fail('没有找到门店');
+        }
+        $shop->unPayOrder -= 1;
+        $shop->unSendOrder += 1;
+        $shop->totalOrderNum += 1;
+        $shop->totalIncome = bcadd($shop->totalIncome, $amount, 2);
+        $shop->save();
+
+        //更新订单基础状态和支付状态
+        $orderId = $order->id;
+        $orderSn = $order->orderSn;
+        $order->payWay = $payWay;
+        $order->status = OrderClass::ORDER_STATUS_UN_SEND;
+        if ($payWay == dict::getDict('payWay', 'debtPay')) {
+            $order->debt = self::DEBT_YES;
+        }
+        $order->save();
+
+        //员工业绩、总业绩增加
+        $shopAdminId = $order->shopAdminId ?? 0;
+        if (!empty($shopAdminId)) {
+            $shopAdmin = ShopAdminClass::getById($shopAdminId, true);
+            $shopAdmin->kdAmount = bcadd($shopAdmin->kdAmount, $amount, 2);
+            $shopAdmin->save();
+        }
+        StatYjClass::addYj($order);
+
+        /**客户资产变化**/
+        $customId = $order->customId;
+        $custom = Custom::findBySql('select * from ' . Custom::tableName() . ' where id = :id for update', ['id' => $customId])->one();
+        if (empty($custom)) {
+            util::fail('没有找到客户信息');
+        }
+        if ($payWay == dict::getDict('payWay', 'debtPay')) {
+            //欠款支付
+            $custom->isDebt = CustomClass::IS_DEBT_YES;
+            $custom->debtAmount = bcadd($custom->debtAmount, $amount, 2);
+            $custom->debtNum += 1;
+        }
+        $custom->buyNum += 1;
+        $custom->buyAmount = bcadd($custom->buyAmount, $amount, 2);
+        $custom->save();
+
+        //每天和每月收入
+        StatIncomeClass::updateOrInsert($shop, $order->actPrice);
+        //今日订单+1
+        StatOrderClass::updateOrInsert($shop);
+
+        //显示已下单流程
+        $time = date("Y-m-d H:i:s");
+        $placeData = ['payTime' => $time, 'orderSn' => $orderSn, 'orderId' => $orderId];
+        OrderSendClass::placeOrder($placeData);
+
+        if (isset($order->sendType) == false) {
+            util::fail('没有找到配送方式');
+        }
+
+        if ($order->sendType == OrderClass::SEND_TYPE_NO) {
+            self::withoutSend($order);
+        }
+    }
+
 }

biz-hd/purchase/classes/PurchaseClass.php

@@ -3,18 +3,10 @@
 namespace bizHd\purchase\classes;
 
 use biz\ghs\classes\GhsClass;
-use biz\ghs\models\Ghs;
-use biz\shop\models\Shop;
 use bizGhs\admin\classes\AdminClass;
-use bizGhs\custom\classes\CustomClass;
-use bizGhs\custom\models\Custom;
-use bizGhs\order\classes\OrderSendClass;
-use bizGhs\order\models\Order;
 use bizGhs\order\traits\OrderTrait;
 use bizGhs\product\classes\ProductClass;
-use bizGhs\order\classes\OrderClass;
 use bizHd\purchase\models\Purchase;
-use common\components\dict;
 use common\components\orderSn;
 use common\components\util;
 use bizHd\base\classes\BaseClass;
@@ -205,27 +197,6 @@ class PurchaseClass extends BaseClass
         return $list;
     }
 
-    //订单延期支付 ssh 2021.1.24
-    public static function debt($info)
-    {
-        $payWay = dict::getDict('payWay', 'debtPay');
-        self::payAfter($info, $payWay);
-
-        $saleId = $info->saleId ?? 0;
-        $order = OrderClass::getById($saleId, true);
-        OrderClass::payAfter($order, $payWay);
-    }
-
-    //余额支付 ssh 2021.1.24
-    public static function balancePay($info)
-    {
-        $payWay = dict::getDict('payWay', 'balancePay');
-        self::payAfter($info, $payWay);
-
-        $saleId = $info->saleId ?? 0;
-        $order = OrderClass::getById($saleId, true);
-        OrderClass::payAfter($order, $payWay);
-    }
 
     //检查采购单
     public static function valid($info, $shopId)
@@ -239,93 +210,6 @@ class PurchaseClass extends BaseClass
         util::fail('没有权限操作');
     }
 
-
-    //采购订单支付成功后回调处理流程
-    public static function thirdPay($payWay, $orderSn, $totalFee, $attach)
-    {
-        $info = self::getByCondition(['orderSn' => $orderSn], true);
-        if (empty($info)) {
-            $msg = "没有找到订单 orderSn:{$orderSn}";
-            Yii::info($msg);
-            util::fail($msg);
-        }
-        if ($info->actPrice != $totalFee) {
-            $msg = "订单金额与回调通知金额不一致 orderSn:{$orderSn} {$info->actPrice} {$totalFee}";
-            Yii::info($msg);
-            util::fail($msg);
-        }
-        self::payAfter($info, $payWay);
-
-        $saleId = $info->saleId ?? 0;
-        $order = OrderClass::getById($saleId, true);
-        OrderClass::payAfter($order, $payWay);
-    }
-
-    //第三方支付、余额支付和欠款支付后调用的流程 shish 2021.4.27
-    public static function payAfter($info, $payWay)
-    {
-        if (empty($info)) {
-            util::fail('没有找到订单');
-        }
-        $deadline = $info->deadline;
-        if ($deadline <= date("Y-m-d H:i:s")) {
-            self::cancel($info->id);
-            util::fail('订单已失效，请重新采购');
-        }
-        if (isset($info->status) == false || $info->status != self::STATUS_UN_PAY) {
-            util::fail('订单不是待付款状态');
-        }
-
-        /**零售采购单状态变化**/
-        $info->payWay = $payWay;
-        $info->status = self::STATUS_UN_SEND;
-        if ($payWay == dict::getDict('payWay', 'debtPay')) {
-            //欠款支付
-            $info->debt = 1;
-        }
-        $info->save();
-
-        /**零售门店资产变化**/
-        $shopId = $info['shopId'] ?? 0;
-        $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
-        if (empty($shop)) {
-            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();
-
-        /**零售的供货商资产变化**/
-        $ghsId = $info->ghsId ?? 0;
-        $ghs = Ghs::findBySql('select * from ' . Ghs::tableName() . ' where id = :id for update', ['id' => $ghsId])->one();
-        if (empty($ghs)) {
-            util::fail('没有找到供货商');
-        }
-        if ($payWay == dict::getDict('payWay', 'debtPay')) {
-            //欠款支付
-            $ghs->debt = 2;
-            $ghs->debtAmount = bcadd($ghs->debtAmount, $actPrice, 2);
-            $ghs->debtNum += 1;
-        }
-        $ghs->expendAmount = bcadd($ghs->expendAmount, $actPrice, 2);
-        $ghs->expendNum += 1;
-        $ghs->save();
-        /********订单完成后加库存 linqh 2021-05-10*********/
-//        $orderSn = $info->orderSn;
-//        $purchaseItem = PurchaseItemClass::getAllByCondition(['orderSn' => $orderSn], null, "*");
-//        foreach ($purchaseItem as $v) {
-//            ProductClass::addStockByItemNum($v['productId'], $v['itemNum']);
-//        }
-
-    }
-
     //订单取消，变更状态，占用库存释放 shish 2021.5.8
     public static function cancel($id)
     {

biz-hd/purchase/services/PurchaseService.php

@@ -2,12 +2,13 @@
 
 namespace bizHd\purchase\services;
 
-use biz\ghs\classes\GhsClass;
+use biz\ghs\models\Ghs;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\order\classes\OrderClass;
+use bizGhs\order\services\OrderService;
 use bizHd\base\services\BaseService;
 use bizHd\purchase\classes\PurchaseClass;
-use bizGhs\admin\classes\AdminClass;
+use common\components\dict;
 use common\components\imgUtil;
 use common\components\util;
 use Yii;
@@ -113,4 +114,105 @@ class PurchaseService extends BaseService
         OrderClass::cancel($saleId);
     }
 
+    //订单延期支付 ssh 2021.1.24
+    public static function debt($info)
+    {
+        $payWay = dict::getDict('payWay', 'debtPay');
+        self::payAfter($info, $payWay);
+
+        $saleId = $info->saleId ?? 0;
+        $order = OrderClass::getById($saleId, true);
+        OrderService::payAfter($order, $payWay);
+    }
+
+    //余额支付 ssh 2021.1.24
+    public static function balancePay($info)
+    {
+        $payWay = dict::getDict('payWay', 'balancePay');
+        self::payAfter($info, $payWay);
+
+        $saleId = $info->saleId ?? 0;
+        $order = OrderClass::getById($saleId, true);
+        OrderService::payAfter($order, $payWay);
+    }
+
+    //采购订单支付成功后回调处理流程
+    public static function thirdPay($payWay, $orderSn, $totalFee, $attach)
+    {
+        $info = self::getByCondition(['orderSn' => $orderSn], true);
+        if (empty($info)) {
+            $msg = "没有找到订单 orderSn:{$orderSn}";
+            Yii::info($msg);
+            util::fail($msg);
+        }
+        if ($info->actPrice != $totalFee) {
+            $msg = "订单金额与回调通知金额不一致 orderSn:{$orderSn} {$info->actPrice} {$totalFee}";
+            Yii::info($msg);
+            util::fail($msg);
+        }
+        self::payAfter($info, $payWay);
+
+        $saleId = $info->saleId ?? 0;
+        $order = OrderClass::getById($saleId, true);
+        OrderService::payAfter($order, $payWay);
+    }
+
+    //第三方支付、余额支付和欠款支付后调用的流程 shish 2021.4.27
+    public static function payAfter($info, $payWay)
+    {
+        if (empty($info)) {
+            util::fail('没有找到订单');
+        }
+        $deadline = $info->deadline;
+        if ($deadline <= date("Y-m-d H:i:s")) {
+            PurchaseClass::cancel($info->id);
+            util::fail('订单已失效，请重新采购');
+        }
+        if (isset($info->status) == false || $info->status != PurchaseClass::STATUS_UN_PAY) {
+            util::fail('订单不是待付款状态');
+        }
+
+        /**零售采购单状态变化**/
+        $info->payWay = $payWay;
+        $info->status = PurchaseClass::STATUS_UN_SEND;
+        if ($payWay == dict::getDict('payWay', 'debtPay')) {
+            //欠款支付
+            $info->debt = 1;
+        }
+        $info->save();
+
+        /**零售门店资产变化**/
+        $shopId = $info['shopId'] ?? 0;
+        $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
+        if (empty($shop)) {
+            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();
+
+        /**零售的供货商资产变化**/
+        $ghsId = $info->ghsId ?? 0;
+        $ghs = Ghs::findBySql('select * from ' . Ghs::tableName() . ' where id = :id for update', ['id' => $ghsId])->one();
+        if (empty($ghs)) {
+            util::fail('没有找到供货商');
+        }
+        if ($payWay == dict::getDict('payWay', 'debtPay')) {
+            //欠款支付
+            $ghs->debt = 2;
+            $ghs->debtAmount = bcadd($ghs->debtAmount, $actPrice, 2);
+            $ghs->debtNum += 1;
+        }
+        $ghs->expendAmount = bcadd($ghs->expendAmount, $actPrice, 2);
+        $ghs->expendNum += 1;
+        $ghs->save();
+    }
+
 }

common/components/pay.php

@@ -6,6 +6,7 @@ use biz\recharge\classes\RechargeClass;
 use bizHd\order\classes\OrderClass;
 use bizHd\purchase\classes\PurchaseClass;
 use bizHd\purchase\classes\PurchaseClearClass;
+use bizHd\purchase\services\PurchaseService;
 use Yii;
 
 class pay
@@ -25,7 +26,7 @@ class pay
                     break;
                 case dict::getDict('capitalType', 'xhPurchase', 'id'):
                     //零售采购订单
-                    PurchaseClass::thirdPay($payWay, $orderSn, $totalFee, $attach);
+                    PurchaseService::thirdPay($payWay, $orderSn, $totalFee, $attach);
                     break;
                 case dict::getDict('capitalType', 'hdPurchaseClear', 'id'):
                     //零售采购订单结算

common/services/xhPayToolService.php

@@ -318,7 +318,6 @@ class xhPayToolService
             $updateData['wxPayType'] = $wxPayType;
             switch ($capitalType) {
                 case $capitalTypeList['xhOrder']['id']:
-                    //OrderClass::payAfter($order);
                     break;
                 case $capitalTypeList['xhActiveOrder']['id']://活动报名
                     xhActiveOrderService::updateById($orderId, $updateData);