server/manghe
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

222

Browse Source
This commit is contained in:
youda 2025-05-10 19:14:03 +08:00
parent 31c371235d
commit f75aebe16c
29 changed files with 78 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/controller/CardGoods.php
View File

@ -463,7 +463,7 @@ class CardGoods extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if ($data['goods_type'] == 1) {
$data['sale_time'] = 0;
@ -568,7 +568,7 @@ class CardGoods extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if ($data['goods_type'] == 1) {
$data['sale_time'] = 0;

4
app/admin/controller/Cardextractor.php
View File

@ -715,7 +715,7 @@ class Cardextractor extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if ($data['goods_type'] == 1) {
$data['sale_time'] = 0;
@ -823,7 +823,7 @@ class Cardextractor extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if ($data['goods_type'] == 1) {
$data['sale_time'] = 0;

8
app/admin/controller/Draw.php
View File

@ -437,7 +437,7 @@ class Draw extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if (RegMoney($data['sc_money'])) {
return $this->renderError('参考价格设置错误,最多保留两位小数');
@ -531,7 +531,7 @@ class Draw extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if (RegMoney($data['sc_money'])) {
return $this->renderError('参考价格设置错误,最多保留两位小数');
@ -633,7 +633,7 @@ class Draw extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if (RegInt($data['give_money'])) {
return $this->renderError('消费阀值设置错误,请设置大于0的整数');
@ -688,7 +688,7 @@ class Draw extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if (RegInt($data['give_money'])) {
return $this->renderError('消费阀值设置错误,请设置大于0的整数');

8
app/admin/controller/Goods.php
View File

@ -889,7 +889,7 @@ class Goods extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if (RegMoney($data['sc_money'])) {
return $this->renderError('参考价格设置错误,最多保留两位小数');
@ -1221,7 +1221,7 @@ class Goods extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if (RegMoney($data['sc_money'])) {
return $this->renderError('参考价格设置错误,最多保留两位小数');
@ -1360,7 +1360,7 @@ class Goods extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if (RegInt($data['give_money'])) {
return $this->renderError('消费阀值设置错误,请设置大于0的整数');
@ -1415,7 +1415,7 @@ class Goods extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if (RegInt($data['give_money'])) {
return $this->renderError('消费阀值设置错误,请设置大于0的整数');

8
app/admin/controller/Rank.php
View File

@ -69,7 +69,7 @@ class Rank extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if (empty($data['imgurl'])) {
return $this->renderError('请上传图片');
@ -135,7 +135,7 @@ class Rank extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if (empty($data['imgurl'])) {
return $this->renderError('请上传图片');
@ -261,7 +261,7 @@ class Rank extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if (empty($data['imgurl'])) {
return $this->renderError('请上传图片');
@ -327,7 +327,7 @@ class Rank extends Base
return $this->renderError('奖品售价设置错误,最多保留两位小数');
}
if (RegMoney($data['money'])) {
return $this->renderError('兑换价格设置错误,最多保留两位小数');
return $this->renderError('采购价格设置错误,最多保留两位小数');
}
if (empty($data['imgurl'])) {
return $this->renderError('请上传图片');

2
app/admin/validate/GoodsList.php
View File

@ -29,7 +29,7 @@ class GoodsList extends Validate
protected $message = [
'title.require' => '请输入商品名称',
'price.require' => '请输入商品官方售价',
'money.require' => '请输入商品兑换价格',
'money.require' => '请输入商品采购价格',
'imgurl.require' => '请选择上传的图片'
];

2
app/admin/validate/Product.php
View File

@ -29,7 +29,7 @@ class Product extends Validate
protected $message = [
'title.require' => '请输入商品名称',
'price.require' => '请输入商品官方售价',
'money.require' => '请输入商品兑换价格',
'money.require' => '请输入商品采购价格',
'imgurl.require' => '请选择上传的图片'
];

4
app/admin/view/CardGoods/shang_goods_add.html
View File

@ -41,9 +41,9 @@
<div class="layui-input-inline">
<input type="text" name="price" autocomplete="off" placeholder="请输入奖品售价" class="layui-input">
</div>
<label class="layui-form-label">兑换价格</label>
<label class="layui-form-label">采购价格</label>
<div class="layui-input-inline">
<input type="text" name="money" autocomplete="off" placeholder="请输入兑换价格" class="layui-input">
<input type="text" name="money" autocomplete="off" placeholder="请输入采购价格" class="layui-input">
</div>
</div>
<div class="layui-form-item">

4
app/admin/view/CardGoods/shang_goods_edit.html
View File

@ -42,9 +42,9 @@
<div class="layui-input-inline">
<input type="text" name="price" value="{$goods.price}" autocomplete="off" placeholder="请输入卡售价" class="layui-input">
</div>
<label class="layui-form-label">兑换价格</label>
<label class="layui-form-label">采购价格</label>
<div class="layui-input-inline">
<input type="text" name="money" value="{$goods.money}" autocomplete="off" placeholder="请输入兑换价格" class="layui-input">
<input type="text" name="money" value="{$goods.money}" autocomplete="off" placeholder="请输入采购价格" class="layui-input">
</div>
</div>
<div class="layui-form-item">

4
app/admin/view/Cardextractor/card_goodslist_add.html
View File

@ -41,9 +41,9 @@
<div class="layui-input-inline">
<input type="text" name="price" autocomplete="off" placeholder="请输入奖品售价" class="layui-input">
</div>
<label class="layui-form-label">兑换价格</label>
<label class="layui-form-label">采购价格</label>
<div class="layui-input-inline">
<input type="text" name="money" autocomplete="off" placeholder="请输入兑换价格" class="layui-input">
<input type="text" name="money" autocomplete="off" placeholder="请输入采购价格" class="layui-input">
</div>
</div>
<div class="layui-form-item">

4
app/admin/view/Cardextractor/card_goodslist_edit.html
View File

@ -42,9 +42,9 @@
<div class="layui-input-inline">
<input type="text" name="price" value="{$goods.price}" autocomplete="off" placeholder="请输入卡售价" class="layui-input">
</div>
<label class="layui-form-label">兑换价格</label>
<label class="layui-form-label">采购价格</label>
<div class="layui-input-inline">
<input type="text" name="money" value="{$goods.money}" autocomplete="off" placeholder="请输入兑换价格" class="layui-input">
<input type="text" name="money" value="{$goods.money}" autocomplete="off" placeholder="请输入采购价格" class="layui-input">
</div>
</div>
<div class="layui-form-item">

4
app/admin/view/Draw/drawlist_add.html
View File

@ -29,9 +29,9 @@
<div class="layui-input-inline">
<input type="text" name="price" autocomplete="off" placeholder="请输入奖品售价" class="layui-input">
</div>
<label class="layui-form-label">兑换价格</label>
<label class="layui-form-label">采购价格</label>
<div class="layui-input-inline">
<input type="text" name="money" autocomplete="off" placeholder="请输入兑换价格" class="layui-input">
<input type="text" name="money" autocomplete="off" placeholder="请输入采购价格" class="layui-input">
</div>
</div>

4
app/admin/view/Draw/drawlist_edit.html
View File

@ -29,9 +29,9 @@
<div class="layui-input-inline">
<input type="text" name="price" value="{$goods.price}" autocomplete="off" placeholder="请输入奖品售价" class="layui-input">
</div>
<label class="layui-form-label">兑换价格</label>
<label class="layui-form-label">采购价格</label>
<div class="layui-input-inline">
<input type="text" name="money" value="{$goods.money}" autocomplete="off" placeholder="请输入兑换价格" class="layui-input">
<input type="text" name="money" value="{$goods.money}" autocomplete="off" placeholder="请输入采购价格" class="layui-input">
</div>
</div>
<div class="layui-form-item">

2
app/admin/view/Goods/give.html
View File

@ -38,7 +38,7 @@
<th>奖品名称</th>
<th>奖品图片</th>
<th>官方售价</th>
<th>兑换价格</th>
<th>采购价格</th>
<th>奖赏类型</th>
<th>操作</th>
</tr>

4
app/admin/view/Goods/give_add.html
View File

@ -29,9 +29,9 @@
<div class="layui-input-inline">
<input type="text" name="price" autocomplete="off" placeholder="请输入奖品售价" class="layui-input">
</div>
<label class="layui-form-label">兑换价格</label>
<label class="layui-form-label">采购价格</label>
<div class="layui-input-inline">
<input type="text" name="money" autocomplete="off" placeholder="请输入兑换价格" class="layui-input">
<input type="text" name="money" autocomplete="off" placeholder="请输入采购价格" class="layui-input">
</div>
</div>

4
app/admin/view/Goods/give_edit.html
View File

@ -29,9 +29,9 @@
<div class="layui-input-inline">
<input type="text" name="price" value="{$info.price}" autocomplete="off" placeholder="请输入奖品售价" class="layui-input">
</div>
<label class="layui-form-label">兑换价格</label>
<label class="layui-form-label">采购价格</label>
<div class="layui-input-inline">
<input type="text" name="money" value="{$info.money}" autocomplete="off" placeholder="请输入兑换价格" class="layui-input">
<input type="text" name="money" value="{$info.money}" autocomplete="off" placeholder="请输入采购价格" class="layui-input">
</div>
</div>

4
app/admin/view/Goods/goodslist_add.html
View File

@ -61,9 +61,9 @@
<input type="text" name="price" autocomplete="off" placeholder="请输入奖品售价"
class="layui-input">
</div>
<label class="layui-form-label">兑换价格</label>
<label class="layui-form-label">采购价格</label>
<div class="layui-input-inline">
<input type="text" name="money" autocomplete="off" placeholder="请输入兑换价格"
<input type="text" name="money" autocomplete="off" placeholder="请输入采购价格"
class="layui-input">
</div>

4
app/admin/view/Goods/goodslist_edit.html
View File

@ -61,10 +61,10 @@
<input type="text" name="price" value="{$goods.price}" autocomplete="off"
placeholder="请输入奖品售价" class="layui-input">
</div>
<label class="layui-form-label">兑换价格</label>
<label class="layui-form-label">采购价格</label>
<div class="layui-input-inline">
<input type="text" name="money" value="{$goods.money}" autocomplete="off"
placeholder="请输入兑换价格" class="layui-input">
placeholder="请输入采购价格" class="layui-input">
</div>
</div>
<div class="layui-form-item">

2
app/admin/view/Rank/month.html
View File

@ -16,7 +16,7 @@
<th>奖品名称</th>
<th>奖品图片</th>
<th>官方售价</th>
<th>兑换价格</th>
<th>采购价格</th>
<th>奖赏类型</th>
<th>操作</th>
</tr>

4
app/admin/view/Rank/month_add.html
View File

@ -35,9 +35,9 @@
<div class="layui-input-inline">
<input type="text" name="price" autocomplete="off" placeholder="请输入奖品售价" class="layui-input">
</div>
<label class="layui-form-label">兑换价格</label>
<label class="layui-form-label">采购价格</label>
<div class="layui-input-inline">
<input type="text" name="money" autocomplete="off" placeholder="请输入兑换价格" class="layui-input">
<input type="text" name="money" autocomplete="off" placeholder="请输入采购价格" class="layui-input">
</div>
</div>
<div class="layui-form-item">

4
app/admin/view/Rank/month_edit.html
View File

@ -35,9 +35,9 @@
<div class="layui-input-inline">
<input type="text" name="price" value="{$info.price}" autocomplete="off" placeholder="请输入奖品售价" class="layui-input">
</div>
<label class="layui-form-label">兑换价格</label>
<label class="layui-form-label">采购价格</label>
<div class="layui-input-inline">
<input type="text" name="money" value="{$info.money}" autocomplete="off" placeholder="请输入兑换价格" class="layui-input">
<input type="text" name="money" value="{$info.money}" autocomplete="off" placeholder="请输入采购价格" class="layui-input">
</div>
</div>
<div class="layui-form-item">

2
app/admin/view/Rank/week.html
View File

@ -16,7 +16,7 @@
<th>奖品名称</th>
<th>奖品图片</th>
<th>官方售价</th>
<th>兑换价格</th>
<th>采购价格</th>
<th>奖赏类型</th>
<th>操作</th>
</tr>

4
app/admin/view/Rank/week_add.html
View File

@ -35,9 +35,9 @@
<div class="layui-input-inline">
<input type="text" name="price" autocomplete="off" placeholder="请输入奖品售价" class="layui-input">
</div>
<label class="layui-form-label">兑换价格</label>
<label class="layui-form-label">采购价格</label>
<div class="layui-input-inline">
<input type="text" name="money" autocomplete="off" placeholder="请输入兑换价格" class="layui-input">
<input type="text" name="money" autocomplete="off" placeholder="请输入采购价格" class="layui-input">
</div>
</div>
<div class="layui-form-item">

4
app/admin/view/Rank/week_edit.html
View File

@ -35,9 +35,9 @@
<div class="layui-input-inline">
<input type="text" name="price" value="{$info.price}" autocomplete="off" placeholder="请输入奖品售价" class="layui-input">
</div>
<label class="layui-form-label">兑换价格</label>
<label class="layui-form-label">采购价格</label>
<div class="layui-input-inline">
<input type="text" name="money" value="{$info.money}" autocomplete="off" placeholder="请输入兑换价格" class="layui-input">
<input type="text" name="money" value="{$info.money}" autocomplete="off" placeholder="请输入采购价格" class="layui-input">
</div>
</div>
<div class="layui-form-item">

4
app/admin/view/Statistics/profit.html
View File

@ -75,7 +75,7 @@
<div class="layui-card-header">
总出货价值
<i class="layui-icon layui-icon-about" style="font-size: 14px; color: #FFB800;"
title="出货价值 = 奖品的兑换价格"></i>
title="出货价值 = 奖品的采购价格"></i>
</div>
<div class="layui-card-body" style="font-size: 24px; color: #FFB800;">
¥ <span id="totalCost">0.00</span>
@ -252,7 +252,7 @@
}
},
{
field: 'sc_money', title: '出货价值 <i class="layui-icon layui-icon-about" title="奖品的兑换价格"></i>', width: 140, templet: function (d) {
field: 'sc_money', title: '出货价值 <i class="layui-icon layui-icon-about" title="奖品的采购价格"></i>', width: 140, templet: function (d) {
if (!d.loaded) {
return '<div><i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i></div>';
}

2
app/admin/view/User/user_box.html
View File

@ -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 },
{

7
app/api/controller/Goods.php
View File

@ -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'];

10
app/api/controller/Infinite.php
View File

@ -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();

13
app/common/server/platform/MiniProgramPlatform.php
View File

@ -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;
// }