|
|
@@ -6,6 +6,7 @@ use biz\common\classes\GhsNotifyClass;
|
|
|
use biz\shop\classes\ShopClass;
|
|
|
use bizGhs\custom\classes\CustomClass;
|
|
|
use bizGhs\custom\classes\CustomRechargeClass;
|
|
|
+use bizGhs\express\classes\GhsDeliveryOrderClass;
|
|
|
use bizGhs\order\classes\OrderClearClass;
|
|
|
use bizGhs\order\classes\RefundOrderClass;
|
|
|
use bizHd\cg\classes\CgRefundClass;
|
|
|
@@ -154,6 +155,11 @@ class NoticeController extends PublicController
|
|
|
$saleId = $cg->saleId ?? 0;
|
|
|
$order = OrderClass::getById($saleId, true);
|
|
|
|
|
|
+ if(!empty($order)){
|
|
|
+ //付款成功之后呼叫跑腿,关键词 pay_after_call_pt,多处要同步修改
|
|
|
+ GhsDeliveryOrderClass::payAfter($order);
|
|
|
+ }
|
|
|
+
|
|
|
//不是预订单,并且供货商不是源花汇、小明鲜花、淄博花超、云漫梦金鹏、海翔,则订单直接完成掉。是预订单,则确认发货时直接完成掉。有多个地方要修改,请搜索关键词zjFinish
|
|
|
if (!empty($cg) && !empty($order)) {
|
|
|
if (isset($cg->book) && $cg->book == 0) {
|
|
|
@@ -247,14 +253,7 @@ class NoticeController extends PublicController
|
|
|
$shopId = $order->shopId ?? 0;
|
|
|
$shop = ShopClass::getById($shopId, true);
|
|
|
if (!empty($shop)) {
|
|
|
-
|
|
|
- //花店采购,供货商端微信收到通知
|
|
|
-// $noticeText = json_encode(['orderId' => $saleId]);
|
|
|
-// $noticeKey = "hdCgNoticeGhs";
|
|
|
-// Yii::$app->redis->executeCommand('LPUSH', [$noticeKey, $noticeText]);
|
|
|
-
|
|
|
GhsNotifyClass::newOrderNotify($saleId);
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -373,6 +372,11 @@ class NoticeController extends PublicController
|
|
|
$saleId = $cg->saleId ?? 0;
|
|
|
$order = OrderClass::getById($saleId, true);
|
|
|
|
|
|
+ if(!empty($order)){
|
|
|
+ //付款成功之后呼叫跑腿,关键词 pay_after_call_pt,多处要同步修改
|
|
|
+ GhsDeliveryOrderClass::payAfter($order);
|
|
|
+ }
|
|
|
+
|
|
|
//不是预订单,并且供货商不是源花汇、小明鲜花、淄博花超、云漫梦金鹏、海翔、镜中花卉,则订单直接完成掉。是预订单,则确认发货时直接完成掉。有多个地方要修改,请搜索关键词zjFinish
|
|
|
if (!empty($cg) && !empty($order)) {
|
|
|
if (isset($cg->book) && $cg->book == 0) {
|