Quellcode durchsuchen

红包 失效时间改成由前端控制

shish vor 4 Jahren
Ursprung
Commit
988dabc646

+ 2 - 4
app-hd/controllers/PurchaseController.php

@@ -76,9 +76,7 @@ class PurchaseController extends BaseController
             $realPrice = $respond->realPrice ?? '';
             $transaction->commit();
             //可以付款的倒计时,实际少120秒,避免支付回调时订单已经自动过期
-            $validTime = dict::getDict('sale_purchase_order_valid');
-            $realTime = $validTime - 120;
-            $count = $realTime > 0 ? $realTime : 100;
+            $count = dict::getDict('sale_purchase_order_valid');
 
             $custom = CustomClass::getById($customId);
             $hasDebtPay = $custom['debt'] ?? 0;
@@ -91,7 +89,7 @@ class PurchaseController extends BaseController
                 'hasPayPassword' => 0,
                 'hasDebtPay' => $hasDebtPay,
                 'count' => $count,
-                'balance'=>$this->shop->balance ?? 0,
+                'balance' => $this->shop->balance ?? 0,
             ];
             util::success($data);
 

+ 2 - 1
biz/shop/classes/ShopClass.php

@@ -391,6 +391,7 @@ class ShopClass extends BaseClass
                 }
             }
         }
+
         $currentBalance = bcsub($shop->balance, $amount, 2);
         $shop->balance = $currentBalance;
 
@@ -417,7 +418,7 @@ class ShopClass extends BaseClass
             'txBalance' => $currentTxBalance,
             'io' => 0,
             'payWay' => $order->payWay,
-            'event' => "余额付{$amount}元",
+            'event' => "采购余额付{$amount}元",
             'sjId' => $sjId,
             'shopId' => $shopId,
             'tx' => $tx,

+ 1 - 1
common/components/dict.php

@@ -156,7 +156,7 @@ class dict
             'xhRenew' => ['id' => 9, 'name' => 'xhRenew'],
             //供应商订单
             'xhGhsOrder' => ['id' => 10, 'name' => 'xhGhsOrder'],
-            //花店采购
+            //零售采购
             'xhPurchase' => ['id' => 11, 'name' => 'xhPurchase'],
             //培训报名
             'pxApply' => ['id' => 12, 'name' => 'pxApply'],