张松
|
2d65fc817c
|
feat: 1.美团团购券相关接口
|
2024-11-26 15:26:07 +08:00 |
|
张松
|
7797edd813
|
feat: 1.增加商品单位列表接口
|
2024-11-26 09:42:50 +08:00 |
|
张松
|
c6aff238c1
|
feat: 1.去除product无用字段
|
2024-11-25 17:11:19 +08:00 |
|
张松
|
b8b3de5226
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
# src/main/resources/mapper/TbProductMapper.xml
|
2024-11-25 14:09:32 +08:00 |
|
张松
|
9b1352360d
|
feat: 1.临时菜接口 2.购物车数量字段修改为decimal类型
|
2024-11-25 10:56:22 +08:00 |
|
|
|
43c51fff6e
|
商品删除字段
|
2024-11-21 15:39:12 +08:00 |
|
|
|
2b58a6f0ba
|
优惠券发放 初始化新建时间
|
2024-11-20 14:32:18 +08:00 |
|
|
|
51c160aa26
|
商品校验调整
|
2024-11-19 16:37:03 +08:00 |
|
|
|
2fce514c38
|
商品字段调整
|
2024-11-19 10:25:21 +08:00 |
|
|
|
5bf6bc4fed
|
商品多余字段删除
|
2024-11-18 15:16:52 +08:00 |
|
|
|
2fffee3c55
|
活动赠送券 来源字段
|
2024-11-13 18:08:26 +08:00 |
|
|
|
6834a313cc
|
优惠券 字段修改为浮点数
|
2024-11-12 10:44:45 +08:00 |
|
谭凯凯
|
9304543b96
|
储值送积分活动
|
2024-11-09 09:55:16 +08:00 |
|
|
|
8bf63d821d
|
充值活动 满足金额
|
2024-11-08 17:25:26 +08:00 |
|
|
|
c04d8faabd
|
店铺信息 增加小票logo返回
|
2024-11-01 10:02:31 +08:00 |
|
|
|
b3264ad1b3
|
Merge branch 'refs/heads/dev' into test
|
2024-10-30 10:40:17 +08:00 |
|
|
|
a3c364030d
|
fix: 台桌关联订单查询修改
|
2024-10-29 16:21:59 +08:00 |
|
|
|
cbdbe16cd0
|
多余内容删除
充值会员优惠券赠送
店铺信息增加字段
|
2024-10-24 16:53:37 +08:00 |
|
|
|
20416c7774
|
Merge branch 'refs/heads/test' into dev
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
|
2024-10-22 15:26:31 +08:00 |
|
|
|
e8f0147ada
|
订单查询返回单价
|
2024-10-16 18:19:54 +08:00 |
|
|
|
e2db8e0a3f
|
订单查询返回单价
|
2024-10-16 18:15:53 +08:00 |
|
Tankaikai
|
e5da3ebb30
|
打印样式修改
|
2024-10-15 16:31:18 +08:00 |
|
|
|
eb8a91ad41
|
Merge branch 'ww' into test
|
2024-10-12 17:38:26 +08:00 |
|
|
|
440558c590
|
耗材 销售扣除
|
2024-10-12 17:37:49 +08:00 |
|
谭凯凯
|
3b77cfb33d
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-10-12 10:42:45 +08:00 |
|
谭凯凯
|
493f8563b3
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-10-11 10:45:33 +08:00 |
|
谭凯凯
|
ba710c854e
|
配置测试环境支付成功回调
|
2024-10-10 16:46:34 +08:00 |
|
谭凯凯
|
2b0ca2b5b8
|
店铺小票打印记录需求
|
2024-10-09 18:25:17 +08:00 |
|
|
|
43e832826b
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
|
2024-10-08 11:45:54 +08:00 |
|
|
|
88b189b1c4
|
Merge branch 'ww' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
|
2024-10-08 11:43:56 +08:00 |
|
|
|
d4cc9deed0
|
商品库存警戒线
|
2024-10-08 11:36:46 +08:00 |
|
|
|
44fc9927b4
|
退菜接口，sku mapper结构修改
|
2024-10-08 11:27:42 +08:00 |
|
|
|
0f919e5a5d
|
pc不校验自取模式
|
2024-09-28 16:04:03 +08:00 |
|
|
|
628ef133ff
|
Merge branch 'ww' into test
|
2024-09-25 16:49:28 +08:00 |
|
|
|
4bbc2408bf
|
新增会员时 填充加入会员时间
|
2024-09-25 16:49:03 +08:00 |
|
Tankaikai
|
9970799cf7
|
Merge branch 'tkk' into test
|
2024-09-25 11:18:36 +08:00 |
|
谭凯凯
|
caaa3196b3
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-09-25 11:17:51 +08:00 |
|
|
|
ca49d31260
|
调整订单逻辑，增加店内外带用餐方式，增加多次下单标记
|
2024-09-24 09:55:21 +08:00 |
|
|
|
905063987a
|
增加排号小票打印处理
|
2024-09-19 15:30:50 +08:00 |
|
|
|
724d5fc2da
|
店铺信息
运营模式
restaurant 餐饮版 先下单后支付
munchies 快餐版（先支付后下单）
是否开启桌位费 0否1是
桌位费
就餐模式 堂食 dine-in 外带 take-out
|
2024-09-13 10:45:03 +08:00 |
|
|
|
20d2683708
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/dao/TbCashierCartMapper.java
# src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CartVo.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
|
2024-09-13 10:06:15 +08:00 |
|
牛叉闪闪
|
c2555d890f
|
修改
|
2024-09-06 10:23:21 +08:00 |
|
牛叉闪闪
|
13fedb841b
|
修改
|
2024-09-05 15:24:49 +08:00 |
|
牛叉闪闪
|
637a0cf315
|
修改
|
2024-09-02 10:55:37 +08:00 |
|
牛叉闪闪
|
35b9132eda
|
修改
|
2024-08-29 15:52:13 +08:00 |
|
牛叉闪闪
|
08a9a26f2d
|
修改
|
2024-08-29 15:43:12 +08:00 |
|
牛叉闪闪
|
445551f0d5
|
修改
|
2024-08-29 14:45:45 +08:00 |
|
|
|
35e039a530
|
1.代客下单 已下单商品不支持删除
|
2024-08-27 10:36:05 +08:00 |
|
|
|
f585a4f46a
|
1.代客下单
|
2024-08-27 09:11:55 +08:00 |
|
牛叉闪闪
|
ed5bb107d0
|
添加员工折扣
|
2024-08-26 15:42:21 +08:00 |
|
