liu
|
63428d5015
|
回调处理限制
|
2024-06-26 17:14:46 +08:00 |
|
liu
|
9d54b4dea1
|
增加采购款 余额支付冻结礼品券逻辑
|
2024-06-26 17:07:56 +08:00 |
|
|
|
dba7e7ec8c
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 16:50:40 +08:00 |
|
|
|
6cfc2c773e
|
feat(order): 修改订单逻辑以处理用户信息变更
|
2024-06-26 16:50:35 +08:00 |
|
liu
|
fdddbbec51
|
测试短信调用
|
2024-06-26 16:38:04 +08:00 |
|
liu
|
338354ee77
|
调试收银台短信验证
|
2024-06-26 16:30:06 +08:00 |
|
liu
|
fc36227b33
|
调试
|
2024-06-26 16:13:47 +08:00 |
|
liu
|
4cb0f02df1
|
调试短信
|
2024-06-26 16:11:56 +08:00 |
|
liu
|
a2da972b9b
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 16:03:03 +08:00 |
|
liu
|
f9b10e51ce
|
新增后台商品列表一级分类查询商品逻辑
|
2024-06-26 16:02:54 +08:00 |
|
|
|
6c34f028a2
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 15:51:11 +08:00 |
|
|
|
4f2e432d10
|
feat(order): 修改订单逻辑，统一计算价格字段
|
2024-06-26 15:51:00 +08:00 |
|
liu
|
379c8aea4c
|
切换冻结相关得值返回
|
2024-06-26 15:47:03 +08:00 |
|
liu
|
bfb85eecd1
|
切换冻结相关得值返回
|
2024-06-26 15:44:14 +08:00 |
|
liu
|
3f7d500347
|
处理价格按照订单下单价格展示
|
2024-06-26 15:41:01 +08:00 |
|
|
|
d4184391fb
|
feat(CartList.php): 修正购物车价格计算逻辑
|
2024-06-26 15:29:39 +08:00 |
|
|
|
cdfd35b936
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 15:28:19 +08:00 |
|
|
|
41c77533b8
|
feat(CartList): 根据活动状态调整商品价格和支付价格计算逻辑
|
2024-06-26 15:28:13 +08:00 |
|
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 |
|
