liu
|
b7218e96e6
|
修改门店收款的商户后台的统计
|
2024-06-25 17:11:35 +08:00 |
|
|
|
0b41bdf59c
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-25 16:55:16 +08:00 |
|
|
|
6e5badd969
|
feat: 增加收银台支付功能及库存处理
|
2024-06-25 16:55:08 +08:00 |
|
liu
|
d6075a5e8b
|
修改门店收款查询为当日全部支付的订单
|
2024-06-25 16:27:36 +08:00 |
|
|
|
0553381ecc
|
Merge pull request 'feat: 修改商品订单相关逻辑' (#13) from aaa into main
Reviewed-on: #13
|
2024-06-25 16:15:01 +08:00 |
|
|
|
596ce9d66d
|
feat: 修改商品订单相关逻辑
|
2024-06-25 16:11:20 +08:00 |
|
|
|
7420769c9c
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-25 16:05:38 +08:00 |
|
|
|
af75268604
|
feat: 添加订单存储功能
|
2024-06-25 16:05:29 +08:00 |
|
liu
|
8330a2ffd7
|
增加商品列表排序
|
2024-06-25 15:46:26 +08:00 |
|
liu
|
4a7a1fa263
|
修改验证码校验相关
|
2024-06-25 15:05:58 +08:00 |
|
|
|
61175aa684
|
Merge pull request 'fix_address' (#12) from fix_address into main
Reviewed-on: #12
|
2024-06-25 14:38:32 +08:00 |
|
liu
|
bcef6451d6
|
修改商品列表查询
|
2024-06-25 14:36:58 +08:00 |
|
|
|
5d5b2a28ca
|
feat: 修改ProductLists类实现搜索、排序和扩展功能
|
2024-06-25 14:34:11 +08:00 |
|
liu
|
da38902072
|
处理搜索的分类问题
|
2024-06-25 14:26:55 +08:00 |
|
liu
|
903573ece2
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-25 14:23:05 +08:00 |
|
liu
|
bbea3f74ee
|
绑定手机号相关和商品相关
|
2024-06-25 14:22:55 +08:00 |
|
|
|
fa3b17123b
|
feat: 重构ListsSearchTrait类中的搜索条件处理逻辑
|
2024-06-25 14:18:32 +08:00 |
|
|
|
f93afed82e
|
feat: 添加订单支付成功推送通知
|
2024-06-25 14:11:39 +08:00 |
|
|
|
2d0dcf8a4b
|
feat: 添加产品类型参数到商品存储逻辑
|
2024-06-25 14:08:10 +08:00 |
|
|
|
a66017a21e
|
feat(StoreController): 添加other_uid到支付订单API
|
2024-06-25 13:34:15 +08:00 |
|
|
|
5856c1903b
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-25 11:50:58 +08:00 |
|
|
|
287cd9d2ff
|
feat(PushService): 日志记录PushService::push方法
|
2024-06-25 11:50:54 +08:00 |
|
liu
|
de20073ad3
|
修改验证器
|
2024-06-25 11:41:49 +08:00 |
|
|
|
d3f90f03af
|
feat: 优化支付通知逻辑并添加成功支付推送通知
|
2024-06-25 11:21:32 +08:00 |
|
|
|
040891bd22
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-25 11:05:23 +08:00 |
|
|
|
8efd106989
|
feat(PayNotifyLogic): 根据配置的金额更新用户等级，增加订单支付成功通知
|
2024-06-25 11:05:19 +08:00 |
|
liu
|
777c3e8e56
|
收银台短信验证码
|
2024-06-25 11:02:49 +08:00 |
|
|
|
087181aabd
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-25 10:53:34 +08:00 |
|
|
|
506073629e
|
feat: 添加按日期查询功能
|
2024-06-25 10:53:25 +08:00 |
|
liu
|
9406d2ba26
|
报备短信相关
|
2024-06-25 10:39:37 +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 |
|
|
|
f52b285dc9
|
Merge pull request 'fix_address' (#11) from fix_address into main
Reviewed-on: #11
|
2024-06-25 09:55:19 +08:00 |
|
liu
|
a75d9fb64e
|
修复地址
|
2024-06-25 09:54:34 +08:00 |
|
liu
|
00ddc6c5c1
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-25 09:51:10 +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 |
|
