张松
|
610b0f327b
|
fix: 退款修改
|
2024-11-21 09:57:00 +08:00 |
|
张松
|
5364eec11c
|
fix: 退款修改
|
2024-11-21 09:54:52 +08:00 |
|
张松
|
425a3a3f37
|
fix: 退款修改
|
2024-11-21 09:25:12 +08:00 |
|
张松
|
a15eafdb57
|
fix: 会员价修复 创建订单分割detail状态丢失修复
|
2024-11-21 09:17:09 +08:00 |
|
张松
|
515759f05f
|
feat: 1.退款接口修改
|
2024-11-20 17:59:08 +08:00 |
|
张松
|
0d81ab7f47
|
feat: 1.退款接口修改
|
2024-11-20 17:53:36 +08:00 |
|
张松
|
f4f074f075
|
feat: 1.退款接口修改
|
2024-11-20 17:48:13 +08:00 |
|
张松
|
8894d4797e
|
feat: 1.退款接口修改
|
2024-11-20 17:40:37 +08:00 |
|
张松
|
8a7c9d8e2e
|
feat: 1.退款接口修改
|
2024-11-20 17:33:51 +08:00 |
|
张松
|
8b74c09559
|
feat: 1.美团核销券相关接口 2.退款支持优惠券积分退款，金额比例退
|
2024-11-20 16:53:30 +08:00 |
|
张松
|
6786006ed1
|
feat: 1.美团核销券相关接口 2.退款支持优惠券积分退款，金额比例退
|
2024-11-20 16:50:12 +08:00 |
 wangw
|
66af437db6
|
分享 日期格式问题
|
2024-11-20 16:26:12 +08:00 |
|
wangw
|
f3cac2b5d5
|
绑定 开票信息
|
2024-11-20 16:19:46 +08:00 |
|
wangw
|
105671347a
|
绑定 开票信息
|
2024-11-20 16:04:30 +08:00 |
|
wangw
|
118404ecbe
|
时间格式问题
|
2024-11-20 15:44:23 +08:00 |
|
wangw
|
19b78079a4
|
商品列表报错问题
|
2024-11-20 14:46:55 +08:00 |
|
wangw
|
af8934dcba
|
商品列表报错问题
|
2024-11-20 14:20:33 +08:00 |
Tankaikai
|
c1d3760845
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-11-20 14:14:38 +08:00 |
|
wangw
|
24bc7ba3a8
|
优惠券 修改发放数量的校验
|
2024-11-20 14:04:12 +08:00 |
|
Tankaikai
|
09df694d36
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-11-20 13:59:13 +08:00 |
|
谭凯凯
|
d9f6969bcc
|
自动取消超时的积分商品兑换订单
|
2024-11-20 13:59:04 +08:00 |
|
张松
|
5a2cd172a3
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-20 10:48:00 +08:00 |
|
张松
|
d8177bf3a4
|
feat: 单品改价相关接口
|
2024-11-20 10:47:52 +08:00 |
|
wangw
|
e771493474
|
商品删除多余字段
|
2024-11-20 10:47:00 +08:00 |
|
张松
|
01b414aec0
|
fix: 支付订单会员价被覆盖修复
|
2024-11-20 10:24:12 +08:00 |
|
张松
|
92e4f9cb26
|
Merge branch 'refs/heads/dev' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
|
2024-11-20 10:03:13 +08:00 |
|
张松
|
845c9808fe
|
fix: detail增加isMember字段
|
2024-11-20 09:58:04 +08:00 |
|
张松
|
d427fbd53b
|
fix: 懒加载bug修复
|
2024-11-20 09:50:13 +08:00 |
|
张松
|
10ec7e09fb
|
fix: 懒加载bug修复
|
2024-11-20 09:44:11 +08:00 |
|
wangw
|
38e5ec51d8
|
Merge branch 'ww' into test
|
2024-11-19 17:56:36 +08:00 |
|
wangw
|
5e4bb2e71b
|
代客下单 查询校验
|
2024-11-19 17:56:16 +08:00 |
|
wangw
|
8a0551d490
|
代客下单 查询校验
|
2024-11-19 17:54:54 +08:00 |
|
wangw
|
5bef6e19ec
|
代客下单 查询校验
|
2024-11-19 17:41:45 +08:00 |
|
wangw
|
1c3736145f
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
|
2024-11-19 17:29:55 +08:00 |
|
wangw
|
179e5d2d23
|
代客下单 查询校验
|
2024-11-19 17:28:06 +08:00 |
|
wangw
|
110e5db933
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-19 17:16:13 +08:00 |
|
wangw
|
464a216bce
|
Merge branch 'ww' into test
|
2024-11-19 17:15:37 +08:00 |
|
wangw
|
ff5cebf203
|
代客下单 返回套餐商品
|
2024-11-19 17:07:57 +08:00 |
|
张松
|
f4f7e8bf1b
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-19 15:20:08 +08:00 |
|
张松
|
5c7388801f
|
fix: 先点餐后选择会员会员价不正常修复
|
2024-11-19 15:19:51 +08:00 |
|
张松
|
989aed4862
|
Merge branch 'refs/heads/dev' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
|
2024-11-19 15:19:17 +08:00 |
|
张松
|
f74f47fa40
|
fix: 先点餐后选择会员会员价不正常修复
|
2024-11-19 15:16:52 +08:00 |
|
wangw
|
b3d90ef8ef
|
Merge branch 'ww' into test
|
2024-11-19 15:09:16 +08:00 |
|
wangw
|
53e7443817
|
商品 添加称重商品 和 套餐商品
|
2024-11-19 15:08:35 +08:00 |
|
张松
|
a8d45a8843
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-19 15:06:29 +08:00 |
|
张松
|
832d737aa0
|
feat: 单品改价实现
|
2024-11-19 15:06:20 +08:00 |
|
Tankaikai
|
fd91fe655a
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-11-19 14:15:14 +08:00 |
|
Tankaikai
|
b128216c9e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-19 14:14:22 +08:00 |
|
张松
|
d73edc9277
|
feat: 商品表无用字段删除
|
2024-11-19 13:53:38 +08:00 |
|
张松
|
b6e85f897f
|
feat: 购物车数量字段修改为decimal，jpa相关修改
|
2024-11-19 13:41:37 +08:00 |