shish 1 год назад
Родитель
Сommit
3f29a47c29
2 измененных файлов с 15 добавлено и 1 удалено
  1. 4 0
      biz-hd/cg/classes/CgRefundClass.php
  2. 11 1
      biz-hd/purchase/services/PurchaseService.php

+ 4 - 0
biz-hd/cg/classes/CgRefundClass.php

@@ -66,6 +66,10 @@ class CgRefundClass extends BaseClass
             $errMsg = $response['msg'] ?? '';
             return ['status' => 0, 'msg' => $errMsg];
         } else {
+            $sjName = $ghsShop->merchantName;
+            $shopName = $ghsShop->shopName;
+            $name = $shopName == '首店' ? $sjName : $sjName . '-' . $shopName;
+            noticeUtil::push("订单取消,客户还付款成功,钱已经原路退回 {$orderSn} {$name}", '15280215347');
             return ['status' => 1, 'msg' => '退款成功'];
         }
     }

+ 11 - 1
biz-hd/purchase/services/PurchaseService.php

@@ -20,6 +20,7 @@ use bizGhs\stock\classes\StockRecordClass;
 use bizGhs\ws\services\WsService;
 use bizHd\admin\classes\ShopAdminClass;
 use bizHd\base\services\BaseService;
+use bizHd\cg\classes\CgRefundClass;
 use bizHd\purchase\classes\PurchaseClass;
 use bizHd\purchase\classes\PurchaseItemClass;
 use bizHd\shop\classes\MainClass;
@@ -280,7 +281,7 @@ class PurchaseService extends BaseService
     {
         $info = self::getByCondition(['orderSn' => $orderSn], true);
         if (empty($info)) {
-            noticeUtil::push('花店采购,付款成功,支付回调,单号:' . $orderSn . ',没有找到订单 '.$attach, '15280215347');
+            noticeUtil::push('花店采购,付款成功,支付回调,单号:' . $orderSn . ',没有找到订单 ' . $attach, '15280215347');
             $msg = "没有找到订单 orderSn:{$orderSn}";
             Yii::info($msg);
             util::fail($msg);
@@ -332,6 +333,15 @@ class PurchaseService extends BaseService
         }
         if ($info->status == PurchaseClass::STATUS_CANCEL) {
             noticeUtil::push('重点注意,采购单:' . $orderSn . ',客户付钱了但订单取消状态', '15280215347');
+            $saleId = $info->saleId;
+            $sale = OrderClass::getById($saleId, true);
+            if (!empty($sale)) {
+                $ghsShopId = $sale->shopId;
+                $ghsShop = ShopClass::getById($ghsShopId, true);
+                if (!empty($ghsShop)) {
+                    CgRefundClass::onlyRefundMoney($ghsShop, $info);
+                }
+            }
             sms::send('15280215347,' . $orderSn, '重点注意,采购单:{$var},客户付钱了但订单取消状态');
             util::fail('订单已取消');
         }