duan
|
ef5f3e1fe5
|
Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-11-22 10:07:57 +08:00 |
|
duan
|
9f91ea0c27
|
员工新增管理
|
2024-11-22 10:07:40 +08:00 |
魏啾
|
433479fee7
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into wwz
|
2024-11-22 10:03:22 +08:00 |
|
魏啾
|
eb640a1fde
|
1
|
2024-11-22 10:02:28 +08:00 |
 YeMingfei666
|
b69159d965
|
订单管理详情，支付价格计算逻辑修改
|
2024-11-21 18:10:42 +08:00 |
|
YeMingfei666
|
84855194e8
|
修改商品券抵扣商品也可以退款
|
2024-11-21 18:10:05 +08:00 |
|
YeMingfei666
|
47da4d3041
|
修改折扣返回数据
|
2024-11-21 18:09:36 +08:00 |
|
YeMingfei666
|
7e994f84f0
|
代客下单增加临时菜
|
2024-11-21 09:53:00 +08:00 |
|
YeMingfei666
|
d8738f4e74
|
Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0
|
2024-11-20 16:48:33 +08:00 |
|
YeMingfei666
|
2e77c6a842
|
Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev
|
2024-11-20 15:34:10 +08:00 |
|
YeMingfei666
|
975921014f
|
修改订单详情客座费判断是否退款方法
|
2024-11-20 15:33:50 +08:00 |
|
YeMingfei666
|
10ced0d770
|
Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev
|
2024-11-20 15:19:45 +08:00 |
|
YeMingfei666
|
4f566f37c7
|
修复客座费退款后还有退款按钮问题
|
2024-11-20 15:19:20 +08:00 |
|
YeMingfei666
|
fb811fa07e
|
Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev
|
2024-11-20 15:10:47 +08:00 |
|
YeMingfei666
|
698184d561
|
修改订单详情展示
|
2024-11-20 15:10:28 +08:00 |
|
YeMingfei666
|
4204ec8021
|
Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev
|
2024-11-20 15:07:02 +08:00 |
|
YeMingfei666
|
b0986065f4
|
修改订单详情优惠计算公司
|
2024-11-20 15:06:44 +08:00 |
|
YeMingfei666
|
d588fd16ce
|
增加判断是否退菜方法
|
2024-11-20 14:53:25 +08:00 |
|
YeMingfei666
|
0ff2e8f770
|
修改订单详情优惠逻辑
|
2024-11-20 14:52:14 +08:00 |
|
YeMingfei666
|
fe441fc471
|
修改霸王餐输入框类型为number
|
2024-11-20 14:51:52 +08:00 |
GaoHao
|
df2125f14e
|
Merge branch 'gaohao2.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev
|
2024-11-20 14:19:45 +08:00 |
|
GaoHao
|
8c44bbee30
|
优惠券更新
|
2024-11-20 14:19:17 +08:00 |
|
YeMingfei666
|
d6fe2eac53
|
订单支付逻辑代码优化
|
2024-11-20 14:02:33 +08:00 |
|
YeMingfei666
|
95c404a7f1
|
修改订单支付，0元禁止扫码和储值卡支付，修复扫码支付未传比例问题
|
2024-11-20 13:54:28 +08:00 |
|
YeMingfei666
|
33e872afab
|
订单详情增加打折优惠展示
|
2024-11-20 13:53:08 +08:00 |
|
YeMingfei666
|
0366e6d595
|
修改霸王餐部分字
|
2024-11-20 13:37:13 +08:00 |
|
YeMingfei666
|
757b87f33d
|
修改积分抵扣展示
|
2024-11-20 11:08:46 +08:00 |
|
YeMingfei666
|
da7474c9d5
|
修复确认订单会员价未展示问题，以及增加总优惠金额
|
2024-11-20 11:00:50 +08:00 |
|
YeMingfei666
|
cad9e052bc
|
修复扫码支付缺少部分参数问题
|
2024-11-20 11:00:04 +08:00 |
|
YeMingfei666
|
61938a6947
|
修复当支付金额为0时，抵扣券选中后会变不可用
|
2024-11-20 10:13:37 +08:00 |
|
YeMingfei666
|
0069b7c6fd
|
修改使用优惠券逻辑
|
2024-11-19 17:49:00 +08:00 |
|
YeMingfei666
|
3c5d89ab99
|
修改测试环境
|
2024-11-19 16:12:53 +08:00 |
|
YeMingfei666
|
4751d695ea
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0
|
2024-11-19 16:11:31 +08:00 |
|
YeMingfei666
|
3316c470d2
|
订单详情修改优惠计算公示
|
2024-11-19 16:07:49 +08:00 |
|
YeMingfei666
|
688ff10833
|
修改商品抵扣券抵扣逻辑
|
2024-11-19 15:52:37 +08:00 |
|
YeMingfei666
|
27d641e06e
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0
|
2024-11-19 15:00:45 +08:00 |
|
YeMingfei666
|
31df2b99d4
|
会员信息将没有的字段改为订单数量
|
2024-11-19 14:51:43 +08:00 |
|
YeMingfei666
|
3935ec7960
|
增加临时菜页面
|
2024-11-19 14:46:27 +08:00 |
|
YeMingfei666
|
704fee1e2d
|
增加临时菜页面
|
2024-11-19 14:35:36 +08:00 |
|
YeMingfei666
|
7f19b6b586
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-11-19 11:36:59 +08:00 |
|
YeMingfei666
|
f99fcad9bf
|
代客下单确认订单修改根据购物车数据选中就餐模式
|
2024-11-19 11:35:34 +08:00 |
|
YeMingfei666
|
6cf47c6365
|
修改订单支付输入积分弹窗样式
|
2024-11-19 11:34:38 +08:00 |
|
YeMingfei666
|
66685c3d7e
|
修改代客下单确认订单时获取就餐模式代码
|
2024-11-19 11:29:49 +08:00 |
|
YeMingfei666
|
173d73ae70
|
修改是否启用会员价的字段
|
2024-11-19 10:18:19 +08:00 |
|
YeMingfei666
|
8e201b7554
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev
|
2024-11-18 16:23:05 +08:00 |
|
YeMingfei666
|
86e920017b
|
订单支付增加编辑积分
|
2024-11-18 16:22:37 +08:00 |
|
YeMingfei666
|
66e415051b
|
修复判断是否使用会员价报错问题
|
2024-11-18 16:22:14 +08:00 |
|
YeMingfei666
|
e0ea0f32b0
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev
|
2024-11-18 15:20:38 +08:00 |
|
YeMingfei666
|
94d91a14b4
|
修改代客下单布局节点信息不再获取缓存，缓存会导致左右联动出现问题
|
2024-11-18 15:20:25 +08:00 |
|
YeMingfei666
|
28cb87202b
|
修改为预发布环境
|
2024-11-18 15:18:39 +08:00 |