谭凯凯
|
4b05243c5b
|
支持挂账部分退款
|
2024-12-11 10:07:09 +08:00 |
|
Tankaikai
|
c9ee3cd3e5
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-11 09:48:33 +08:00 |
|
谭凯凯
|
f99b0c64ab
|
支持挂账部分退款
|
2024-12-11 09:48:24 +08:00 |
|
张松
|
2d7747340c
|
Merge branch 'refs/heads/dev' into test
|
2024-12-11 09:30:02 +08:00 |
|
张松
|
5fc070b75e
|
fix: 支付类型增加挂账支付
|
2024-12-11 09:27:45 +08:00 |
|
张松
|
1c8461f420
|
fix: 修改数量返回的购物车信息不正常修复
|
2024-12-11 09:12:38 +08:00 |
|
张松
|
ee7e0a8eb0
|
fix: 转桌并桌实现
|
2024-12-10 18:00:15 +08:00 |
|
张松
|
13855e0fab
|
fix: 转桌并桌实现
|
2024-12-10 17:54:02 +08:00 |
|
张松
|
904357aea9
|
fix: 转桌并桌实现
|
2024-12-10 17:44:51 +08:00 |
|
张松
|
8772d97709
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-10 17:34:27 +08:00 |
|
张松
|
2ede4f3673
|
fix: 转桌并桌实现
|
2024-12-10 17:34:07 +08:00 |
|
谭凯凯
|
7e8c0121e1
|
登录返回店铺授权过期日期
|
2024-12-10 16:19:23 +08:00 |
|
谭凯凯
|
c5a7d86f0b
|
fix配置pad端菜品bug
|
2024-12-10 15:40:33 +08:00 |
|
谭凯凯
|
4a755cfed5
|
登录返回店铺授权过期日期
|
2024-12-10 15:35:49 +08:00 |
|
Tankaikai
|
f1240043e6
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-10 15:29:12 +08:00 |
|
谭凯凯
|
5b1e497bb6
|
登录返回店铺授权过期日期
|
2024-12-10 15:29:06 +08:00 |
|
张松
|
64bc0a81c9
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-12-10 15:21:58 +08:00 |
|
张松
|
209d98745a
|
fix: 添加购物车商品打印状态默认开启
|
2024-12-10 15:21:35 +08:00 |
|
张松
|
cbe190ea71
|
转台相关接口
|
2024-12-10 15:17:19 +08:00 |
|
|
|
a938d0e392
|
版本升级
|
2024-12-10 14:44:18 +08:00 |
|
|
|
a712b5be1d
|
版本查询
|
2024-12-10 11:33:41 +08:00 |
|
张松
|
89fc38e2e1
|
Merge branch 'refs/heads/test' into dev
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
# eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/AddCartDTO.java
# eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/UpdateCartDTO.java
# eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/MpOrderDetailService.java
# eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpOrderDetailServiceImpl.java
# eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
# eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
# eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
|
2024-12-07 09:14:03 +08:00 |
|
张松
|
c82dcd3496
|
fix: 商品列表sku信息返回不全修复
|
2024-12-06 14:23:25 +08:00 |
|
张松
|
c51d8325c2
|
fix:创建订单增加节流操作
|
2024-12-06 13:57:51 +08:00 |
|
张松
|
4229c500ad
|
fix:创建订单增加节流操作
|
2024-12-06 13:54:41 +08:00 |
|
张松
|
99c86e0175
|
fix: 增加提示
|
2024-12-06 13:38:30 +08:00 |
|
张松
|
7f9086eb50
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-06 10:09:00 +08:00 |
|
张松
|
1c585acfd1
|
fix: 优惠券使用数量不正确修改
|
2024-12-06 10:08:48 +08:00 |
|
|
|
09eb3ccfad
|
商品分类未填写 校验返回
|
2024-12-06 09:23:16 +08:00 |
|
谭凯凯
|
11fd24f813
|
修复代客下单多个商品计算总金额错误的bug
|
2024-12-05 13:59:29 +08:00 |
|
谭凯凯
|
df08828673
|
修复代客下单多个商品计算总金额错误的bug
|
2024-12-04 17:53:47 +08:00 |
|
谭凯凯
|
25a6735026
|
修复代客下单多个商品计算总金额错误的bug
|
2024-12-04 17:07:24 +08:00 |
|
张松
|
feceb08a3e
|
fix: 增加购物车商品类型，单位展示
|
2024-12-04 16:25:11 +08:00 |
|
张松
|
cddbe8d195
|
fix: 增加购物车商品类型，单位展示
|
2024-12-04 14:22:07 +08:00 |
|
张松
|
ad27d30d4e
|
fix: 赠送重置改价金额
|
2024-12-04 11:08:27 +08:00 |
|
张松
|
2e46f9ab0f
|
feat: 代客下单支持套餐商品
|
2024-12-04 10:56:19 +08:00 |
|
张松
|
467f6e9434
|
fix: 改价修改提示信息
|
2024-12-04 09:46:57 +08:00 |
|
张松
|
c8abded1fb
|
fix: 临时菜切换自取报错修复
|
2024-12-04 09:39:00 +08:00 |
|
|
|
0a37e4d7c5
|
单位回填
|
2024-12-02 16:02:58 +08:00 |
|
|
|
edcd85933e
|
规格展示
|
2024-12-02 15:52:54 +08:00 |
|
|
|
6e5ed249ad
|
代客下单 单位回填
|
2024-12-02 15:48:25 +08:00 |
|
|
|
87804eba1b
|
代客下单 单位回填
|
2024-12-02 15:43:37 +08:00 |
|
谭凯凯
|
c7633ec875
|
挂账退款bug修复
|
2024-12-02 14:58:31 +08:00 |
|
谭凯凯
|
2ee1b8a0e8
|
挂账退款bug修复
|
2024-12-02 14:51:43 +08:00 |
|
谭凯凯
|
1bbf8a8822
|
挂账退款bug修复
|
2024-12-02 14:31:54 +08:00 |
|
谭凯凯
|
0e41e455ba
|
挂账退款bug修复
|
2024-12-02 14:19:35 +08:00 |
|
|
|
0bc8095e7c
|
数据同步接口 over!
|
2024-12-02 11:07:27 +08:00 |
|
|
|
217a6ed82a
|
回滚
|
2024-11-29 15:51:56 +08:00 |
|
|
|
2830d1d948
|
商品的校验
|
2024-11-29 15:09:24 +08:00 |
|
|
|
b1ba27aa1e
|
校验
|
2024-11-29 14:54:06 +08:00 |
|
