张松
|
96247fab7d
|
Merge remote-tracking branch 'origin/dev-3.0.0' into dev
|
2024-12-17 13:34:09 +08:00 |
|
张松
|
ad776d7ff4
|
fix: 商品列表不查询优惠券商品
|
2024-12-17 13:26:51 +08:00 |
|
张松
|
929a694284
|
fix: 购物车角标数量修复
|
2024-12-16 16:43:12 +08:00 |
|
张松
|
cff2c0e38a
|
fix: 购物车角标数量修复
|
2024-12-16 16:41:02 +08:00 |
|
张松
|
9543878cd1
|
fix: 购物车角标数目不准确修复
|
2024-12-16 09:32:55 +08:00 |
|
张松
|
b1a9894a33
|
feat: 上传接口实现
|
2024-12-11 10:27:47 +08:00 |
|
张松
|
eea45c05d8
|
Merge remote-tracking branch 'origin/test' into test-3.0.1
|
2024-12-10 11:08:25 +08:00 |
|
张松
|
84971187ca
|
feat: 排队叫号接口实现
|
2024-12-10 11:07:22 +08:00 |
|
谭凯凯
|
999a9f6af7
|
小票打印bug修复
|
2024-12-09 10:10:13 +08:00 |
|
张松
|
8332589647
|
feat: findOrder价格返回改价后的价格
|
2024-12-06 15:52:57 +08:00 |
|
张松
|
2f0b80a8db
|
feat: findOrder价格返回改价后的价格
|
2024-12-06 15:49:43 +08:00 |
|
张松
|
8fa00c9c48
|
feat: findOrder价格返回改价后的价格
|
2024-12-06 15:45:22 +08:00 |
|
张松
|
e95640a4ad
|
feat: 订单查询返回套餐信息
|
2024-12-05 13:47:35 +08:00 |
|
张松
|
3fca6a7cb8
|
feat: 订单查询返回套餐信息
|
2024-12-05 13:41:58 +08:00 |
|
张松
|
85a5ae848d
|
feat: 订单查询返回套餐信息
|
2024-12-05 13:38:43 +08:00 |
|
谭凯凯
|
2eeb90758a
|
点餐机商品支持套餐点餐
|
2024-12-04 09:46:33 +08:00 |
|
谭凯凯
|
355510e3bd
|
点餐机商品支持套餐点餐
|
2024-12-03 18:03:23 +08:00 |
|
谭凯凯
|
9b817bf27d
|
等叫菜小票打印
|
2024-12-02 09:59:26 +08:00 |
|
谭凯凯
|
136e119a2b
|
小票打印bug修复
|
2024-11-29 09:56:45 +08:00 |
|
张松
|
c5646c5de8
|
fix: 查询订单sku查询不到修复
|
2024-11-26 15:43:01 +08:00 |
|
张松
|
d7c55da8c6
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
|
2024-11-26 15:26:37 +08:00 |
|
张松
|
2d65fc817c
|
feat: 1.美团团购券相关接口
|
2024-11-26 15:26:07 +08:00 |
|
谭凯凯
|
04dc7091e2
|
临时菜小票打印
|
2024-11-26 14:45:02 +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 |
|
张松
|
4c209ac27b
|
feat: dev增加预发布地址
|
2024-11-25 11:09:26 +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 |
|
|
|
e66aea31af
|
回调配置修改
|
2024-10-22 15:24:56 +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 |
|
