 YeMingfei666
|
698184d561
|
修改订单详情展示
|
2024-11-20 15:10:28 +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 |
|
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
|
3316c470d2
|
订单详情修改优惠计算公示
|
2024-11-19 16:07:49 +08:00 |
|
YeMingfei666
|
688ff10833
|
修改商品抵扣券抵扣逻辑
|
2024-11-19 15:52:37 +08:00 |
|
YeMingfei666
|
31df2b99d4
|
会员信息将没有的字段改为订单数量
|
2024-11-19 14:51:43 +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 |
|
YeMingfei666
|
f80de032d8
|
代码合并,放出霸王餐和优惠券
|
2024-11-18 15:08:14 +08:00 |
|
YeMingfei666
|
2776cbe13c
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev
|
2024-11-18 15:06:38 +08:00 |
|
YeMingfei666
|
40514ef243
|
代客下单，订单管理修改会员价的判断依据，增加isMember字段
|
2024-11-18 15:05:49 +08:00 |
|
YeMingfei666
|
09079c3384
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-11-18 11:41:30 +08:00 |
|
YeMingfei666
|
16cfbfec63
|
修改时间选择组件小程序上，选择不包含时分秒时返回了错误的时间字符串问题
|
2024-11-18 11:41:17 +08:00 |
|
YeMingfei666
|
67f92a91b8
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-11-18 11:04:28 +08:00 |
|
YeMingfei666
|
c9825f8df7
|
订单支付增加优惠券积分
|
2024-11-18 11:03:54 +08:00 |
|
YeMingfei666
|
d5dbd51c80
|
修改部分功公共方法
|
2024-11-18 11:03:25 +08:00 |
|
YeMingfei666
|
5a63a8324d
|
修改积分字段
|
2024-11-18 11:02:57 +08:00 |
|
YeMingfei666
|
03d820bc9a
|
代客下单增加扫码选择桌台
|
2024-11-15 15:13:16 +08:00 |
|
YeMingfei666
|
0d1d353830
|
修改代客下单确认订单积分字段
|
2024-11-15 14:26:19 +08:00 |
|
YeMingfei666
|
cb52b972b9
|
修改代客下单选择用户用户积分字段
|
2024-11-15 14:25:50 +08:00 |
|
YeMingfei666
|
fb84f53029
|
修复代客下单左右联动失效问题
|
2024-11-15 14:25:06 +08:00 |
|
YeMingfei666
|
1bf820be53
|
修改支付订单时选择满减券的限制
|
2024-11-13 17:37:53 +08:00 |
|
YeMingfei666
|
d6f148c2a9
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-11-13 10:08:05 +08:00 |
|
YeMingfei666
|
9167ee9a9b
|
增加订单列表优惠券抵扣商品划线，优化价格长度计算
|
2024-11-12 10:51:38 +08:00 |
|
YeMingfei666
|
5476a6af41
|
增加限制，商品券抵扣的商品不可退款
|
2024-11-12 10:01:57 +08:00 |
|
YeMingfei666
|
c41f78fca8
|
增加商品券限制，过滤不满足使用条件的商品券
|
2024-11-12 09:49:34 +08:00 |
duan
|
27deb4db4a
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-11-11 17:06:12 +08:00 |
|
duan
|
2a40135ac0
|
员工管理角色回显
|
2024-11-11 17:05:47 +08:00 |
|
YeMingfei666
|
7d39bc2bee
|
修改订单支付优惠券积分
|
2024-11-11 16:09:25 +08:00 |
|
YeMingfei666
|
2691cf9b53
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf
|
2024-11-11 13:20:45 +08:00 |