liu
|
c3378b3f55
|
增加查询可用礼品券和冻结礼品券得拆分
|
2024-06-26 15:28:08 +08:00 |
|
liu
|
982b9c3b46
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 15:18:21 +08:00 |
|
liu
|
11fc23a322
|
新增核销礼品券限制
|
2024-06-26 15:18:12 +08:00 |
|
|
|
02c492c1a4
|
feat(CartList): 修改购物车价格计算方式
|
2024-06-26 15:12:00 +08:00 |
|
|
|
2b6d62b73c
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 15:11:25 +08:00 |
|
|
|
048e5e8d0d
|
feat: 修改购物车商品价格计算逻辑
|
2024-06-26 15:11:22 +08:00 |
|
liu
|
da22981882
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 15:04:41 +08:00 |
|
liu
|
445c070933
|
测试服支付大于500才能获得兑换券得逻辑
|
2024-06-26 15:04:21 +08:00 |
|
|
|
9be16eb9c3
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 14:57:44 +08:00 |
|
|
|
ca086a5156
|
feat(CartList): 修改购物车价格计算逻辑
|
2024-06-26 14:57:39 +08:00 |
|
liu
|
6bd4799890
|
修改限制条件
|
2024-06-26 14:54:41 +08:00 |
|
liu
|
217bfec00e
|
修改店铺限制
|
2024-06-26 14:53:21 +08:00 |
|
liu
|
c92f8a72b6
|
门店订单列表查询更改
|
2024-06-26 14:52:20 +08:00 |
|
|
|
62b5ef67f4
|
feat: 修改订单逻辑和购物车列表，重构用户折扣计算方式
|
2024-06-26 14:50:41 +08:00 |
|
|
|
f919e94ec3
|
feat: 修改购物车商品价格计算方式并增加成本字段
|
2024-06-26 14:09:09 +08:00 |
|
|
|
a2afde5439
|
feat: 修改CartList.php以支持商品成本获取
|
2024-06-26 14:07:53 +08:00 |
|
|
|
d8d4f7f9de
|
feat: 购物车列表增加用户特权价格计算功能
|
2024-06-26 13:56:20 +08:00 |
|
|
|
27b199994a
|
feat: 修改商品列表接口，移除无用代码并优化响应数据
|
2024-06-26 13:40:31 +08:00 |
|
|
|
2d0979333e
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 11:17:16 +08:00 |
|
|
|
42f4e3d1d3
|
feat(CartList): 修改购物车API，根据满减活动调整支付价格和提示信息
|
2024-06-26 11:17:12 +08:00 |
|
liu
|
56f22df5c4
|
商户创建订单默认shipping_type值为3
|
2024-06-26 11:16:31 +08:00 |
|
|
|
2c2baf4135
|
feat: 修改了在StoreOrderLists和StoreOrderController中的代码逻辑，优化了订单创建流程。
|
2024-06-26 11:07:10 +08:00 |
|
|
|
ef99a4e31a
|
Merge pull request '统计图表修改逻辑' (#15) from fix_address into main
Reviewed-on: #15
|
2024-06-25 18:17:59 +08:00 |
|
liu
|
5433c2fbde
|
统计图表修改逻辑
|
2024-06-25 18:16:52 +08:00 |
|
|
|
b7f8c6ad42
|
feat: 修改了统计逻辑以使用正确的日期字段
|
2024-06-25 18:12:07 +08:00 |
|
|
|
c699abfd6f
|
feat(ProductLists.php): 根据off_activity配置动态返回价格
|
2024-06-25 17:37:41 +08:00 |
|
|
|
b40b004e9e
|
feat: 修改IndexController类以优化用户交易统计查询
|
2024-06-25 17:28:07 +08:00 |
|
|
|
d43d66836c
|
Merge pull request '修改门店收款的商户后台的统计' (#14) from fix_address into main
Reviewed-on: #14
|
2024-06-25 17:12:46 +08:00 |
|
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 |
|
