零售

biz-hd/cg/classes/CgRefundClass.php

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

biz-hd/order/classes/OrderClass.php

@@ -20,6 +20,7 @@ use bizGhs\stock\classes\StockRecordClass;
 use bizGhs\ws\services\WsService;
 use bizHd\custom\classes\CustomClass;
 use bizHd\merchant\classes\SjClass;
+use bizHd\refund\classes\HdRefundClass;
 use bizHd\shop\classes\MainClass;
 use bizHd\shop\classes\ShopMoneyChangeClass;
 use bizHd\stat\classes\StatIncomeClass;
@@ -260,6 +261,11 @@ class OrderClass extends BaseClass
         }
         $orderSn = $order->orderSn ?? '';
         if ($order->status == self::ORDER_STATUS_CANCEL) {
+            $shopId = $order->shopId;
+            $shop = ShopClass::getById($shopId, true);
+            if (!empty($shop)) {
+                HdRefundClass::onlyRefundAmount($shop, $order);
+            }
             noticeUtil::push('特别注意，零售订单：' . $orderSn . '，付款成功但订单是取消状态', '15280215347');
             util::fail('订单已取消');
         }
@@ -605,15 +611,15 @@ class OrderClass extends BaseClass
                 $content .= '<B>到店自取</B><BR><BR>';
             }
         } else {
-            if($order->sendType == 0){
+            if ($order->sendType == 0) {
                 $content .= '<B>送货上门</B><BR><BR>';
-            }else if($order->sendType == 2){
+            } else if ($order->sendType == 2) {
                 $content .= '<B>跑腿到付</B><BR><BR>';
-            }else if($order->sendType == 3){
+            } else if ($order->sendType == 3) {
                 $content .= '<B>物流到付</B><BR><BR>';
-            }else if($order->sendType == 4){
+            } else if ($order->sendType == 4) {
                 $content .= '<B>快递到付</B><BR><BR>';
-            }else{
+            } else {
                 $content .= '';
             }
             if (isset($order->reachDate) && !empty($order->reachDate) && $order->reachDate != '0000-00-00') {

biz-hd/refund/classes/HdRefundClass.php

@@ -51,7 +51,7 @@ class HdRefundClass extends BaseClass
             $sjName = $shop->merchantName;
             $shopName = $shop->shopName;
             $name = $shopName == '首店' ? $sjName : $sjName . '-' . $shopName;
-            noticeUtil::push("零售订单取消，客户还付款成功，钱已经原路退回 {$xsOrderSn} {$name}", '15280215347');
+            noticeUtil::push("零售订单取消，客户还付款成功，钱已经原路退回 success {$xsOrderSn} {$name}", '15280215347');
             return ['status' => 1, 'msg' => '退款成功'];
         }
     }