diff --git a/app/admin/view/Statistics/profit.html b/app/admin/view/Statistics/profit.html
index 3502ddf..fa92f9d 100755
--- a/app/admin/view/Statistics/profit.html
+++ b/app/admin/view/Statistics/profit.html
@@ -75,7 +75,7 @@
¥
0.00
@@ -252,7 +252,7 @@
}
},
{
- field: 'sc_money', title: '出货价值
', width: 140, templet: function (d) {
+ field: 'sc_money', title: '出货价值
', width: 140, templet: function (d) {
if (!d.loaded) {
return '
';
}
diff --git a/app/admin/view/User/user_box.html b/app/admin/view/User/user_box.html
index 6193504..4e46180 100755
--- a/app/admin/view/User/user_box.html
+++ b/app/admin/view/User/user_box.html
@@ -113,7 +113,7 @@
{ field: 'good_title', title: '盒子名称', width: 140 },
{ field: 'goodslist_title', title: '奖品名称', width: 200 },
{ field: 'shang_title', title: '奖品类型', width: 120 },
- { field: 'goodslist_money', title: '回收价格', width: 100 },
+ { field: 'goodslist_money', title: '调换商品', width: 100 },
{ field: 'goodslist_price', title: '售价', width: 100 },
{ field: 'order_num', title: '订单编号', width: 240 },
{
diff --git a/app/api/controller/Goods.php b/app/api/controller/Goods.php
index 5f5b551..5c6e99b 100755
--- a/app/api/controller/Goods.php
+++ b/app/api/controller/Goods.php
@@ -1074,7 +1074,12 @@ class Goods extends Base
Db::rollback();
#删除redis
$redis->del($redis_key);
- return $this->renderError("购买失败,请刷新重试");
+ $msg ="购买失败,请刷新重试";
+ if (isset($payRes['msg'])) {
+ $msg = $payRes['msg'];
+ }
+ return $this->renderError( $msg);
+
}
$order_num = $payRes['data']['order_no'];
diff --git a/app/api/controller/Infinite.php b/app/api/controller/Infinite.php
index 187595b..d0767fd 100755
--- a/app/api/controller/Infinite.php
+++ b/app/api/controller/Infinite.php
@@ -644,7 +644,11 @@ class Infinite extends Base
Db::rollback();
#删除redis
$redis->del($redis_key);
- return $this->renderError("购买失败,请刷新重试");
+ $msg ="购买失败,请刷新重试";
+ if (isset($payRes['msg'])) {
+ $msg = $payRes['msg'];
+ }
+ return $this->renderError( $msg);
}
$order_num = $payRes['data']['order_no'];
#创建订单
@@ -686,10 +690,10 @@ class Infinite extends Base
'res' => $payRes['data']['res'],
];
} else {
-
+
#记录下单失败日志
Log::error('下单失败: 用户ID=' . $user['id'] . ', 订单号=' . $order_num . ', 商品ID=' . $goods_id . ', 返回信息=' . json_encode($payRes, JSON_UNESCAPED_UNICODE));
-
+
#删除redis
$redis->del($redis_key);
Db::rollback();
diff --git a/app/common/server/platform/MiniProgramPlatform.php b/app/common/server/platform/MiniProgramPlatform.php
index 6ad6ed1..29a00d8 100644
--- a/app/common/server/platform/MiniProgramPlatform.php
+++ b/app/common/server/platform/MiniProgramPlatform.php
@@ -61,6 +61,17 @@ class MiniProgramPlatform extends BasePlatform
*/
public function pay(array $data): array
{
+ $currentHour = (int)date('H');
+ $currentMinute = (int)date('i');
+ $currentTime = $currentHour * 100 + $currentMinute;
+
+ if ($currentTime < 800 || $currentTime >= 2200) {
+ return [
+ 'status' => 0,
+ 'data' => [],
+ 'msg' => '支付未开放，请在08:00-22:00范围内购买'
+ ];
+ }
$data += ['user' => null, 'price' => 0, 'title' => '', 'attach' => 'order_wxs', 'pre' => 'MH_'];
[
'user' => $user,
@@ -101,6 +112,8 @@ class MiniProgramPlatform extends BasePlatform
// 生成新的支付通知URL
$notifyUrl = generatePayNotifyUrl($payment_type, $order_type, $user_id, $order_no, $callback_nonce_str);
$is_test = $user['istest'];
+
+ // throw new \Exception('支付未开放');
// if ($is_test == 2) {
// $price = 0.01;
// }