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

213

Browse Source
This commit is contained in:
manghe 2025-04-04 07:49:31 +00:00
parent 710b7e31a2
commit e85bdc0976
5 changed files with 2081 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/admin/view/Goods/type_index.html
View File

@ -1,4 +1,5 @@
{include file="Public:header2"/} {include file="Public:header2"/}
<body> <body>
<style> <style>
.layui-table-cell { .layui-table-cell {
@ -48,17 +49,18 @@
url: '{:url("goodstype/getTypeList")}', // 后端提供的数据接口 url: '{:url("goodstype/getTypeList")}', // 后端提供的数据接口
page: true, // 开启分页 page: true, // 开启分页
height: 'full-100', height: 'full-100',
limit: 15, // 每页显示的条数 limit: 20, // 每页显示的条数
limits: [15, 30, 50, 100], // 每页条数的选择项 limits: [20, 30, 50, 100], // 每页条数的选择项
cols: [[ // 表头 cols: [[ // 表头
{field: 'id', title: 'ID', width: 80, sort: true, fixed: 'left'}, { field: 'id', title: 'ID', width: 80, sort: true },
{ field: 'name', title: '类型名称', width: 150 }, { field: 'name', title: '类型名称', width: 150 },
{ field: 'value', title: '类型Key', width: 100 }, { field: 'value', title: '类型Key', width: 100 },
{ field: 'sort_order', title: '排序', width: 100, sort: true }, { field: 'sort_order', title: '排序', width: 100, sort: true },
{ field: 'is_show', title: '首页显示', width: 120, templet: '#isShowTpl' }, { field: 'is_show', title: '首页显示', width: 120, templet: '#isShowTpl' },
{ field: 'is_fenlei', title: '分类显示', width: 120, templet: '#isFenleiTpl' }, { field: 'is_fenlei', title: '分类显示', width: 120, templet: '#isFenleiTpl' },
{ field: 'fl_name', title: '分类名称', width: 150 }, { field: 'fl_name', title: '分类名称', width: 150 },
{title: '支付方式', minWidth: 200, templet: function(d){ {
title: '支付方式', minWidth: 200, templet: function (d) {
var html = ''; var html = '';
if (d.pay_wechat == 1) html += '<span class="layui-badge layui-bg-green">微信</span> '; if (d.pay_wechat == 1) html += '<span class="layui-badge layui-bg-green">微信</span> ';
if (d.pay_balance == 1) html += '<span class="layui-badge layui-bg-blue">余额</span> '; if (d.pay_balance == 1) html += '<span class="layui-badge layui-bg-blue">余额</span> ';
@ -66,14 +68,17 @@
if (d.pay_currency2 == 1) html += '<span class="layui-badge layui-bg-cyan">货币2</span> '; if (d.pay_currency2 == 1) html += '<span class="layui-badge layui-bg-cyan">货币2</span> ';
if (d.pay_coupon == 1) html += '<span class="layui-badge layui-bg-red">优惠券</span> '; if (d.pay_coupon == 1) html += '<span class="layui-badge layui-bg-red">优惠券</span> ';
return html; return html;
}}, }
{title: '支付类型', width: 100, templet: function(d){ },
{
title: '支付类型', width: 100, templet: function (d) {
if (d.is_deduction == 1) { if (d.is_deduction == 1) {
return '<span class="layui-badge layui-bg-blue">抵扣</span>'; return '<span class="layui-badge layui-bg-blue">抵扣</span>';
} else { } else {
return '<span class="layui-badge layui-bg-orange">支付</span>'; return '<span class="layui-badge layui-bg-orange">支付</span>';
} }
}}, }
},
{ field: 'remark', title: '备注', width: 200 }, { field: 'remark', title: '备注', width: 200 },
{ fixed: 'right', title: '操作', toolbar: '#operationTpl', width: 150 } { fixed: 'right', title: '操作', toolbar: '#operationTpl', width: 150 }
]], ]],
@ -191,4 +196,5 @@
}); });
</script> </script>
</body> </body>
</html> </html>

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

@ -847,6 +847,9 @@ class Infinite extends Base
if ($price > 0) { if ($price > 0) {
$body = '购买盒子' . $goods['title']; $body = '购买盒子' . $goods['title'];
$attach = 'order_wxs'; $attach = 'order_wxs';
if ($goods['type'] == 16) {
$attach = 'order_fbs';
}
$payRes = (new Pay())->wxCreateOrder($order_num, $price, $user['openid'], $body, $attach); $payRes = (new Pay())->wxCreateOrder($order_num, $price, $user['openid'], $body, $attach);
if ($payRes['status'] == 1) { if ($payRes['status'] == 1) {
#结果集 #结果集

4
app/api/controller/Notify.php
View File

@ -295,7 +295,7 @@ class Notify extends Base
$tempOrder->save(); $tempOrder->save();
} }
} }
} elseif ($table == 'order_wxs') {#抽赏无限赏 } elseif ($table == 'order_wxs' || $table == 'order_fbs') {#抽赏无限赏
$orderInfo = Order::where('order_num', '=', $out_trade_no) $orderInfo = Order::where('order_num', '=', $out_trade_no)
->where('status', '=', 0) ->where('status', '=', 0)
->find(); ->find();
@ -1076,7 +1076,7 @@ class Notify extends Base
#分销奖励 #分销奖励
#开奖================================================== #开奖==================================================
if ($num == 1) { if ($order['order_type'] == 10) {
$res[] = $this->infinite_shangchengshang($order); $res[] = $this->infinite_shangchengshang($order);
} else { } else {
$res[] = $this->infinite_drawprize($order); $res[] = $this->infinite_drawprize($order);

45
create_sign_tables.sql
View File

@ -1,45 +0,0 @@
-- 创建奖励表
CREATE TABLE IF NOT EXISTS `reward` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`reward_type` tinyint(1) NOT NULL COMMENT '奖励类型(1:优惠券,2:钻石,3:货币1,4:货币2)',
`reward_id` int(11) DEFAULT NULL COMMENT '奖励ID(当reward_type=1时为优惠券ID)',
`reward_value` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '奖励值',
`title` varchar(100) DEFAULT NULL COMMENT '奖励标题',
`description` varchar(255) DEFAULT NULL COMMENT '奖励描述',
`icon` varchar(255) DEFAULT NULL COMMENT '奖励图标',
`status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态(0禁用,1启用)',
`create_time` int(11) DEFAULT NULL,
`update_time` int(11) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='奖励表';
-- 创建签到配置表
CREATE TABLE IF NOT EXISTS `sign_config` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`type` tinyint(1) NOT NULL COMMENT '配置类型(1:累计签到配置,2:每日签到配置)',
`days` int(11) DEFAULT NULL COMMENT '累计天数(type=1时有效)',
`day` tinyint(1) DEFAULT NULL COMMENT '指定星期几(type=2时有效，1-7代表周一到周日)',
`title` varchar(100) DEFAULT NULL COMMENT '配置标题',
`icon` varchar(255) DEFAULT NULL COMMENT '图标',
`status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态(0禁用,1启用)',
`sort` int(11) DEFAULT '0' COMMENT '排序',
`create_time` int(11) DEFAULT NULL,
`update_time` int(11) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='签到配置表';
-- 创建签到配置奖励关联表
CREATE TABLE IF NOT EXISTS `sign_config_reward` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`sign_config_id` int(11) NOT NULL COMMENT '签到配置ID',
`reward_id` int(11) NOT NULL COMMENT '奖励ID',
`create_time` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `idx_sign_config_id` (`sign_config_id`),
KEY `idx_reward_id` (`reward_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='签到配置奖励关联表';
-- 修改用户签到表，添加month和year字段
ALTER TABLE `user_sign`
ADD COLUMN `month` int(11) DEFAULT NULL COMMENT '签到月份' AFTER `days`,
ADD COLUMN `year` int(11) DEFAULT NULL COMMENT '签到年份' AFTER `month`;

1908
table.sql Normal file
View File

File diff suppressed because it is too large Load Diff