|
|
506073629e
|
feat: 添加按日期查询功能
|
2024-06-25 10:53:25 +08:00 |
|
|
|
995443f666
|
feat(CartList.php): 修改购物车价格计算逻辑
|
2024-06-25 10:24:18 +08:00 |
|
|
|
151c24fdf3
|
feat(CartList): 根据off_activity更新activity_price
|
2024-06-25 10:21:24 +08:00 |
|
|
|
008e69f35a
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-25 10:18:37 +08:00 |
|
|
|
af396c6b16
|
feat(CartList): 添加满减活动逻辑和会员价格计算
|
2024-06-25 10:18:33 +08:00 |
|
liu
|
e6becf88b4
|
地址相关修改
|
2024-06-25 09:46:16 +08:00 |
|
|
|
3c2f945514
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-25 09:43:36 +08:00 |
|
|
|
630ef10fd6
|
feat: 实现商品列表查询功能
|
2024-06-25 09:43:30 +08:00 |
|
liu
|
d68f2a992d
|
礼品券修改
|
2024-06-24 18:28:21 +08:00 |
|
liu
|
8837310fd6
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-24 18:25:46 +08:00 |
|
liu
|
b39bf47b89
|
修改查询
|
2024-06-24 18:25:32 +08:00 |
|
|
|
49ee6b0c1c
|
feat(PayNotifyLogic): 修改支付通知逻辑，增加活动价结算功能
|
2024-06-24 18:17:27 +08:00 |
|
|
|
17697bf361
|
feat: 修改商品列表和订单逻辑，根据配置计算价格和抵扣金额
|
2024-06-24 18:14:56 +08:00 |
|
|
|
4a3ba92035
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-24 18:04:37 +08:00 |
|
|
|
57f6cf0e3b
|
feat: 修改了商店控制器以从配置表中获取充值价格
|
2024-06-24 18:04:33 +08:00 |
|
liu
|
d3a44b336b
|
退款字段逻辑修改
|
2024-06-24 18:03:27 +08:00 |
|
|
|
8139416648
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-24 17:58:01 +08:00 |
|
|
|
751ddafe73
|
feat(ConfigLogic): 添加配置表、编辑配置表、删除配置表、获取配置表详情的功能
|
2024-06-24 17:57:51 +08:00 |
|
liu
|
f70792062f
|
修改字段查询
|
2024-06-24 17:56:06 +08:00 |
|
liu
|
5531bb8022
|
处理方式切换
|
2024-06-24 17:47:38 +08:00 |
|
liu
|
02d4a29974
|
充值订单列表数据
|
2024-06-24 17:39:44 +08:00 |
|
liu
|
ba9bc4a8aa
|
微信充值退款逻辑和订单数据处理
|
2024-06-24 17:32:55 +08:00 |
|
|
|
97641a18ce
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-24 17:21:38 +08:00 |
|
|
|
21a16ff999
|
feat: 新增订单ID生成逻辑
|
2024-06-24 17:21:32 +08:00 |
|
liu
|
4fc91a476b
|
充值现金退款,调试微信退款
|
2024-06-24 17:07:39 +08:00 |
|
|
|
c059df525c
|
feat: 添加重新充值会员API功能
|
2024-06-24 16:53:53 +08:00 |
|
|
|
29ffd9f8c5
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-24 16:47:55 +08:00 |
|
|
|
c20c1cf940
|
feat(app/queue/redis): 增加订单支付超时处理逻辑
|
2024-06-24 16:47:51 +08:00 |
|
liu
|
87a492b834
|
收银台逻辑充值方式区分
|
2024-06-24 16:42:41 +08:00 |
|
|
|
6566fcea3d
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-24 16:30:34 +08:00 |
|
|
|
702a4f06bc
|
feat: 修改了IndexController和UserController，增加了积分和签到功能；修改了OrderLogic和UserLogic，增加了积分更新逻辑；更新了PayNotifyLogic，调整了积分增加方式。
|
2024-06-24 16:30:25 +08:00 |
|
liu
|
f649369f08
|
微信退款财务流水
|
2024-06-24 16:23:20 +08:00 |
|
liu
|
291b0dabb1
|
修改返回展示值
|
2024-06-24 15:49:16 +08:00 |
|
liu
|
d28a1ca1ab
|
处理店铺的用户相关的关联信息
|
2024-06-24 15:38:12 +08:00 |
|
liu
|
837d11a88b
|
登录绑定手机号相关
|
2024-06-24 15:18:28 +08:00 |
|
|
|
d0915b4c68
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-24 15:16:26 +08:00 |
|
|
|
9df52eb5ac
|
feat: 修改库存逻辑增加库存类型
|
2024-06-24 15:16:21 +08:00 |
|
|
|
0d41b39a39
|
feat: 优化用户充值列表查询逻辑
|
2024-06-24 15:13:27 +08:00 |
|
liu
|
2e64e690ac
|
微信小程序登录绑定相关
|
2024-06-24 14:24:58 +08:00 |
|
|
|
1c622039c0
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-24 14:15:26 +08:00 |
|
|
|
b89ffb00b4
|
恢复原本价格
|
2024-06-24 14:15:22 +08:00 |
|
liu
|
1cca6ee0ec
|
退款微信进资金流水
|
2024-06-24 14:13:37 +08:00 |
|
|
|
883847e49d
|
feat: 修改 IndexController 中的订单号
|
2024-06-24 14:10:57 +08:00 |
|
|
|
2524a5766c
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-24 12:52:07 +08:00 |
|
|
|
3af9d12ce9
|
feat: 更新了路由、模型、视图等部分的代码，优化了部分逻辑，修复了已知问题，并改进了代码的可读性和可维护性。
|
2024-06-24 12:51:58 +08:00 |
|
|
|
8960188732
|
feat: 更新了workerman/webman-framework依赖版本
|
2024-06-24 12:51:35 +08:00 |
|
liu
|
9d30b7d87c
|
处理校验
|
2024-06-24 12:22:59 +08:00 |
|
liu
|
f319a4e60b
|
地址报错相关处理和退款回调相关处理
|
2024-06-24 11:13:59 +08:00 |
|
liu
|
cbd3f2b34b
|
用户余额,采购款退款相关日志记录
|
2024-06-24 11:01:44 +08:00 |
|
liu
|
b3e010d251
|
增加数量
|
2024-06-24 10:46:52 +08:00 |
|
