Browse Source

余额变动记录

shish 4 years ago
parent
commit
f514c8599f

+ 1 - 1
app-ghs/controllers/ShopYeChangeController.php

@@ -18,7 +18,7 @@ class ShopYeChangeController extends BaseController
         $status = $get['status'] ?? 0;
         $ptStyle = $get['ptStyle'] ?? dict::getDict('ptStyle', 'ghs');
         $where = [];
-        $where['shopId'] = $this->shopId;
+        $where['mainId'] = $this->mainId;
         if (!empty($status)) {
             $where['status'] = $status;
         }

+ 1 - 1
app-hd/controllers/ShopYeChangeController.php

@@ -20,7 +20,7 @@ class ShopYeChangeController extends BaseController
         if (!empty($status)) {
             $where['status'] = $status;
         }
-        $where['shopId'] = $this->shopId;
+        $where['mainId'] = $this->mainId;
         $tx = $get['tx'] ?? 0;
         if (!empty($tx)) {
             $where['tx'] = $tx;

+ 0 - 5
biz-ghs/order/services/OrderService.php

@@ -715,11 +715,6 @@ class OrderService extends BaseService
             if ($order->onlinePay == dict::getDict('onlinePay', 'yes') || $payWay == dict::getDict('payWay', 'balancePay')) {
                 ShopClass::customKdAddBalance($shop, $realPrice, $order, $capitalType);
             }
-            if (isset($order->discountType) && $order->discountType == dict::getDict('discountType', 'usePtCoupon')) {
-                //客户使用优惠券增加的余额
-                $theCapital = dict::getDict('capitalType', 'usePtCoupon', 'id');
-                ShopClass::customKdUseCouponAddBalance($shop, $order, $theCapital);
-            }
         }
 
         //更新订单基础状态和支付状态