通知和打印移到订单外围

app-ghs/controllers/OrderController.php

@@ -23,6 +23,9 @@ use common\components\qrCodeUtil;
 use Yii;
 use common\components\util;
 use biz\shop\classes\ShopAdminClass;
+use biz\notice\classes\NoticeClass;
+use biz\wx\classes\WxMessageClass;
+use biz\shop\classes\ShopClass;
 
 class OrderController extends BaseController
 {
@@ -796,6 +799,25 @@ class OrderController extends BaseController
             $post['deadline'] = date("Y-m-d H:i:s", $totalTime);
             $return = OrderService::createFinishOrder($post, $custom, $hasPay);
             $transaction->commit();
+
+            $saleId = $return->id ?? 0;
+            $order = OrderClass::getById($saleId, true);
+            if (!empty($order)) {
+                $shopId = $order->shopId ?? 0;
+                $shop = ShopClass::getById($shopId, true);
+                if (!empty($shop)) {
+                    WxMessageClass::ghsHasNewOrderInform($shop, $order);
+                }
+                //订单生成时唤起在线打印
+                if (isset($order->needPrint) && $order->needPrint == dict::getDict('needPrint', 'need')) {
+                    OrderClass::onlinePrint($order);
+                    $order->printNum += 1;
+                    $order->save();
+                }
+                //花店采购供货商端收到通知
+                NoticeClass::ghsNewOrderNotice($order);
+            }
+
             util::success($return);
         } catch (\Exception $e) {
             $transaction->rollBack();

app-hd/controllers/NoticeController.php

@@ -2,15 +2,19 @@
 
 namespace hd\controllers;
 
-use biz\shop\classes\ShopExtClass;
+use biz\shop\classes\ShopClass;
+use biz\notice\classes\NoticeClass;
 use bizGhs\order\classes\RefundOrderClass;
 use bizHd\cg\classes\CgRefundClass;
+use bizHd\purchase\classes\PurchaseClass;
 use bizHd\wx\classes\WxOpenClass;
 use common\components\dict;
 use common\components\noticeUtil;
 use common\components\payUtil;
 use Yii;
 use common\components\util;
+use biz\wx\classes\WxMessageClass;
+use bizGhs\order\classes\OrderClass;
 
 class NoticeController extends PublicController
 {
@@ -49,8 +53,27 @@ class NoticeController extends PublicController
             //支付成功后续流程
             payUtil::thirdPay($wxPay, $capitalType, $orderSn, $totalFee, $attach, $transactionId);
             $transaction->commit();
-            //花店采购供货商端收到通知
-            ShopExtClass::hdCgGhsReport($orderSn);
+            $cg = PurchaseClass::getByCondition(['orderSn' => $orderSn], true);
+            if (!empty($cg)) {
+                //微信通知
+                $saleId = $cg->saleId ?? 0;
+                $order = OrderClass::getById($saleId, true);
+                if (!empty($order)) {
+                    $shopId = $order->shopId ?? 0;
+                    $shop = ShopClass::getById($shopId, true);
+                    if (!empty($shop)) {
+                        WxMessageClass::ghsHasNewOrderInform($shop, $order);
+                    }
+                    //订单生成时唤起在线打印
+                    if (isset($order->needPrint) && $order->needPrint == dict::getDict('needPrint', 'need')) {
+                        OrderClass::onlinePrint($order);
+                        $order->printNum += 1;
+                        $order->save();
+                    }
+                    //花店采购供货商端收到通知
+                    NoticeClass::ghsNewOrderNotice($order);
+                }
+            }
             echo '<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>';
         } catch (\Exception $e) {
             $transaction->rollBack();

app-hd/controllers/PurchaseController.php

@@ -21,6 +21,7 @@ use common\components\httpUtil;
 use common\components\noticeUtil;
 use Yii;
 use common\components\util;
+use biz\wx\classes\WxMessageClass;
 
 class PurchaseController extends BaseController
 {
@@ -171,7 +172,22 @@ class PurchaseController extends BaseController
             //app新订单通知
             $saleId = $info->saleId ?? 0;
             $order = OrderClass::getById($saleId, true);
-            NoticeClass::ghsNewOrderNotice($order);
+            if (!empty($order)) {
+
+                $shopId = $order->shopId ?? 0;
+                $shop = ShopClass::getById($shopId, true);
+                if (!empty($shop)) {
+                    WxMessageClass::ghsHasNewOrderInform($shop, $order);
+                }
+                //订单生成时唤起在线打印
+                if (isset($order->needPrint) && $order->needPrint == dict::getDict('needPrint', 'need')) {
+                    OrderClass::onlinePrint($order);
+                    $order->printNum += 1;
+                    $order->save();
+                }
+                //花店采购供货商端收到通知
+                NoticeClass::ghsNewOrderNotice($order);
+            }
         } catch (Exception $e) {
             $transaction->rollBack();
             util::fail('支付失败');

biz-ghs/order/services/OrderService.php

@@ -804,17 +804,6 @@ class OrderService extends BaseService
         StatSaleClass::replace($main, $shop, $amount);
         //客户采购统计
         StatKhCgClass::replace($order, $amount);
-
-        //微信通知
-        WxMessageClass::ghsHasNewOrderInform($shop, $order);
-
-        //订单生成时唤起在线打印
-        if (isset($order->needPrint) && $order->needPrint == dict::getDict('needPrint', 'need')) {
-            OrderClass::onlinePrint($order);
-            $order->printNum += 1;
-            $order->save();
-        }
-
     }
 
     //发起退款