 YeMingfei666
|
b562ccc707
|
Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev
|
2024-11-25 17:02:44 +08:00 |
|
YeMingfei666
|
4e1290fbf7
|
优惠券样式调整
|
2024-11-25 17:01:31 +08:00 |
|
YeMingfei666
|
0a8f5c3a1e
|
Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev
|
2024-11-25 16:27:08 +08:00 |
|
YeMingfei666
|
e59a18ca52
|
修改订单详情未支付时按照订单返回priceAmount展示
|
2024-11-25 16:23:55 +08:00 |
|
YeMingfei666
|
cff33a9875
|
代码合并
|
2024-11-25 13:53:29 +08:00 |
|
YeMingfei666
|
c9caed9579
|
修改订单详情支付逻辑
|
2024-11-25 13:49:39 +08:00 |
|
YeMingfei666
|
a2a4a1bf96
|
更新计算公公式
|
2024-11-23 16:56:26 +08:00 |
|
YeMingfei666
|
35160c63b4
|
修改订单退款金额，客座费金额
|
2024-11-23 15:44:00 +08:00 |
|
YeMingfei666
|
586f30c4c4
|
修改退款计算公式
|
2024-11-23 15:13:32 +08:00 |
|
YeMingfei666
|
5ae1e4b420
|
订单详情结算后只展示已优惠价格
|
2024-11-23 14:26:43 +08:00 |
|
YeMingfei666
|
00b81e9f1b
|
修改可退款金额计算公式
|
2024-11-23 14:23:25 +08:00 |
|
YeMingfei666
|
0906ab8523
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_2.0.0
|
2024-11-23 09:36:22 +08:00 |
|
YeMingfei666
|
0f2e791557
|
订单支付详情修改部分逻辑
|
2024-11-23 09:35:45 +08:00 |
|
YeMingfei666
|
d36afe0969
|
修改订单详情优惠等展示
|
2024-11-22 18:29:52 +08:00 |
|
YeMingfei666
|
3706573eab
|
修改能退金额计算公式
|
2024-11-22 17:12:06 +08:00 |
|
YeMingfei666
|
75161519f2
|
修改订单详情价格展示
|
2024-11-22 16:57:02 +08:00 |
|
YeMingfei666
|
70933ce1e4
|
修改订单支付详情优惠券积分等逻辑
|
2024-11-22 14:41:38 +08:00 |
魏啾
|
8dfd42f20a
|
交班和霸王餐
|
2024-11-22 10:48:11 +08:00 |
duan
|
6f38c95892
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-11-22 10:07:59 +08:00 |
|
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 |