张松
|
2d65fc817c
|
feat: 1.美团团购券相关接口
|
2024-11-26 15:26:07 +08:00 |
|
张松
|
94285f68d0
|
feat: 1.单品改价实现
|
2024-11-26 13:43:38 +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 |
|
张松
|
e5c74051c7
|
feat: 1.单品改价 2.免厨打
|
2024-11-25 14:08:34 +08:00 |
|
张松
|
9b1352360d
|
feat: 1.临时菜接口 2.购物车数量字段修改为decimal类型
|
2024-11-25 10:56:22 +08:00 |
|
|
|
1157d4eb16
|
商品校验调整
|
2024-11-19 16:47:05 +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 |
|
张松
|
be8c796254
|
fix: 订单详情增加是否会员价字段标识
|
2024-11-18 13:56:44 +08:00 |
|
|
|
2fffee3c55
|
活动赠送券 来源字段
|
2024-11-13 18:08:26 +08:00 |
|
张松
|
7a8ae2b5bc
|
fix: 订单保存先付费后付费
|
2024-11-13 13:24:03 +08:00 |
|
|
|
6834a313cc
|
优惠券 字段修改为浮点数
|
2024-11-12 10:44:45 +08:00 |
|
谭凯凯
|
9304543b96
|
储值送积分活动
|
2024-11-09 09:55:16 +08:00 |
|
张松
|
0d8052d620
|
feat: 会员价根据店铺设置返回
|
2024-11-07 16:10:57 +08:00 |
|
张松
|
896667018a
|
feat: 1. 添加商品会员价 2.空订单直接删除
|
2024-11-07 10:25:52 +08:00 |
|
|
|
d783ac93d0
|
fix: 数据库没有tickLogo字段修复
|
2024-11-01 10:35:03 +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 |
|
|
|
15a4537bfd
|
feat: 1.餐位费允许增减数量 2.选择人数根据店铺配置决定是否操作
|
2024-10-30 10:39:11 +08:00 |
|
|
|
cbdbe16cd0
|
多余内容删除
充值会员优惠券赠送
店铺信息增加字段
|
2024-10-24 16:53:37 +08:00 |
|
|
|
e2db8e0a3f
|
订单查询返回单价
|
2024-10-16 18:15:53 +08:00 |
|
Tankaikai
|
e5da3ebb30
|
打印样式修改
|
2024-10-15 16:31:18 +08:00 |
|
谭凯凯
|
98942f6ea7
|
调整打印机配置，修改打印机参数
|
2024-10-14 10:30:24 +08:00 |
|
谭凯凯
|
3b77cfb33d
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-10-12 10:42:45 +08:00 |
|
谭凯凯
|
1183132bcf
|
配置测试环境支付成功回调
|
2024-10-11 17:08:41 +08:00 |
|
谭凯凯
|
493f8563b3
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-10-11 10:45:33 +08:00 |
|
|
|
fbd8f306e7
|
创建订单修改
|
2024-10-10 09:34:13 +08:00 |
|
Tankaikai
|
5fdd361789
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-09 18:25:28 +08:00 |
|
谭凯凯
|
2b0ca2b5b8
|
店铺小票打印记录需求
|
2024-10-09 18:25:17 +08:00 |
|
|
|
5c5ffd10da
|
手动清台设置
|
2024-10-09 13:40:58 +08:00 |
|
|
|
f96c47ecac
|
创建订单携带就餐人数
|
2024-10-09 13:29:13 +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 |
|
|
|
ea21e97e29
|
打印简化
|
2024-09-28 10:40:52 +08:00 |
|
|
|
57800dab04
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-27 10:38:09 +08:00 |
|
|
|
19eacd1550
|
创建订单保存sendType
|
2024-09-27 10:37:57 +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 |
|
|
|
a27f64dafa
|
增加异常反打实现，避免异常堆栈信息过长
|
2024-09-24 09:56:27 +08:00 |
|
|
|
ca49d31260
|
调整订单逻辑，增加店内外带用餐方式，增加多次下单标记
|
2024-09-24 09:55:21 +08:00 |
|
|
|
fa94b0b1bf
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-19 15:31:10 +08:00 |
|
|
|
905063987a
|
增加排号小票打印处理
|
2024-09-19 15:30:50 +08:00 |
|
|
|
a84f3f39b3
|
请求员工权限
|
2024-09-14 18:04:47 +08:00 |
|
