 YeMingfei666
|
56b9c1ebf7
|
代码合并
|
2024-11-23 17:58:53 +08:00 |
|
YeMingfei666
|
adfdee835b
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf
|
2024-11-23 17:52:04 +08:00 |
|
YeMingfei666
|
5076efee3a
|
修改订单详情金额展示
|
2024-11-23 17:44:21 +08:00 |
GaoHao
|
fe4d54440e
|
优惠券相关更新
|
2024-11-23 10:03:22 +08:00 |
duan
|
d704253591
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-22 16:52:37 +08:00 |
|
duan
|
a7a9c42126
|
切换店铺
|
2024-11-22 16:52:24 +08:00 |
|
YeMingfei666
|
d1cbebefe9
|
代客下单增加临时菜
|
2024-11-22 15:45:33 +08:00 |
 gyq
|
19aaea4559
|
优化添加店铺选择主账号
|
2024-11-22 15:36:05 +08:00 |
|
gyq
|
f266501a7b
|
去除商品列表多规格操作编辑
|
2024-11-22 14:31:32 +08:00 |
魏啾
|
04efab005c
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz
|
2024-11-22 09:44:51 +08:00 |
|
魏啾
|
cf9a6d03ff
|
台桌预订短信
|
2024-11-22 09:43:57 +08:00 |
|
gyq
|
796fc49fb1
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-11-22 09:34:22 +08:00 |
|
gyq
|
df9a29359f
|
新增商品增加套餐、称重
|
2024-11-22 09:34:14 +08:00 |
|
GaoHao
|
589483bbcc
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into gh
|
2024-11-21 16:56:59 +08:00 |
|
duan
|
c94acd899a
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-11-21 15:25:28 +08:00 |
|
duan
|
224552f546
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-11-21 15:25:10 +08:00 |
|
YeMingfei666
|
270c7350d3
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-11-21 15:24:52 +08:00 |
|
duan
|
e8299f8d12
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-11-21 15:24:44 +08:00 |
|
YeMingfei666
|
862812caa3
|
修改商品券计算时增加打折比例
|
2024-11-21 15:24:31 +08:00 |
|
duan
|
25c030f2a2
|
营销中心-归档 基于当前dev分支修改
|
2024-11-21 15:23:30 +08:00 |
|
duan
|
f7e4fd77aa
|
提交营销中心
|
2024-11-21 14:50:55 +08:00 |
|
duan
|
8cb0d99962
|
开票功能
|
2024-11-21 10:44:36 +08:00 |
|
duan
|
f8130508a2
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-21 09:24:07 +08:00 |
|
duan
|
f5348be1b8
|
应用中心开票功能
|
2024-11-21 09:23:49 +08:00 |
|
YeMingfei666
|
48b8daea75
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-11-20 18:25:57 +08:00 |
|
YeMingfei666
|
9969251050
|
修改订单管理优惠金额计算，修复订单退款时客座费部分退款问题
|
2024-11-20 18:25:37 +08:00 |
|
YeMingfei666
|
edf8e4e254
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-11-20 16:55:13 +08:00 |
|
YeMingfei666
|
d9cf881b62
|
代客下单打折弹窗应付金额文字改为总价
|
2024-11-20 16:54:43 +08:00 |
|
YeMingfei666
|
e00213be32
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-11-20 16:42:53 +08:00 |
|
YeMingfei666
|
c7283a493c
|
修复整单改价时价格不对的问题
|
2024-11-20 16:36:32 +08:00 |
|
YeMingfei666
|
aa8be5e906
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-11-20 16:10:05 +08:00 |
|
YeMingfei666
|
7ff8632af9
|
去除支付完成强制刷新
|
2024-11-20 16:09:44 +08:00 |
|
YeMingfei666
|
d9c789da8f
|
修改代客下单优惠券，积分抵扣逻辑
|
2024-11-20 15:55:31 +08:00 |
|
GaoHao
|
acc3930f48
|
优惠券修改
|
2024-11-20 15:12:37 +08:00 |
|
YeMingfei666
|
8a8de80321
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-11-19 15:27:49 +08:00 |
|
YeMingfei666
|
07d072ce4c
|
修改代客下单切换会员逻辑
|
2024-11-19 15:21:20 +08:00 |
|
gyq
|
315b3e536d
|
优化积分
|
2024-11-19 15:09:43 +08:00 |
|
gyq
|
e0822677ff
|
修复积分中心基本设置文字错误
|
2024-11-19 13:56:31 +08:00 |
|
YeMingfei666
|
8318b9ed80
|
Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf
|
2024-11-19 11:22:43 +08:00 |
|
YeMingfei666
|
f393b91c2d
|
修改选中的抵扣券不展示商品信息
|
2024-11-19 10:38:55 +08:00 |
|
YeMingfei666
|
db7c64fa8b
|
修改是否启用会员价的字段
|
2024-11-19 10:09:49 +08:00 |
|
YeMingfei666
|
638ed75b4d
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf_test
|
2024-11-19 09:26:58 +08:00 |
|
YeMingfei666
|
910fd4b9ad
|
修复代客下单退菜时历史订单会被标识为客座费问题
|
2024-11-19 09:26:32 +08:00 |
|
YeMingfei666
|
3d287016c0
|
代客下单修改商品抵扣券价格计算逻辑
|
2024-11-18 18:24:28 +08:00 |
|
魏啾
|
ef16e62702
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-14 14:04:40 +08:00 |
|
魏啾
|
094a8fc102
|
优惠劵
|
2024-11-14 14:04:31 +08:00 |
|
gyq
|
3045b3f9a5
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-11-14 13:55:58 +08:00 |
|
gyq
|
85c5b86050
|
优化
|
2024-11-14 13:55:51 +08:00 |
|
魏啾
|
460e3b7201
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz
|
2024-11-14 11:40:59 +08:00 |
|
魏啾
|
95713b5df1
|
优惠劵清空
|
2024-11-14 11:39:39 +08:00 |