Commit Graph

930 Commits

Author SHA1 Message Date
gyq 4aa57227ea Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-11-14 09:05:51 +08:00
gyq 7836222460 优化分享好友演示 2024-11-14 09:05:44 +08:00
魏啾 e9bd9cc2d8 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-13 18:29:11 +08:00
魏啾 528344d6ce 输入金额判断整数 2024-11-13 18:28:50 +08:00
GaoHao b836d1a0b4 分享好友 奖励券提示增加 2024-11-13 18:22:39 +08:00
GaoHao 76774a4ec5 优惠券修改 2024-11-13 17:00:15 +08:00
GaoHao 519b28f746 优惠券编辑修改 2024-11-13 16:21:02 +08:00
GaoHao cb00d913d0 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-13 14:37:30 +08:00
GaoHao 7275bc66e9 门槛限制增加小数点 2024-11-13 14:37:25 +08:00
YeMingfei666 13c473a234 订单列表增加根据isPostpaid判断是否可以退菜 2024-11-13 14:30:57 +08:00
GaoHao 802a8f6ce4 Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-13 13:47:16 +08:00
GaoHao 266674272d 商品券商品ID字段修改 2024-11-13 13:46:40 +08:00
YeMingfei666 e795c49b32 Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-13 13:46:28 +08:00
YeMingfei666 fabe5e3060 修复先付费下现金支付第一次点击时价格为0 2024-11-13 13:45:48 +08:00
YeMingfei666 a425baad52 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-13 10:42:16 +08:00
YeMingfei666 d14ba5e812 代客下单修改支付成功后的处理 2024-11-13 10:41:10 +08:00
gyq aacb9d966a Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-11-13 10:23:46 +08:00
gyq 93854290fe 优化分享好友 2024-11-13 10:23:33 +08:00
YeMingfei666 f931cc882d 修复已退款显示问题 2024-11-13 10:03:59 +08:00
YeMingfei666 7752ce1b8a 代客下单修改结账时优惠券couponId改为id 2024-11-13 09:58:09 +08:00
YeMingfei666 b7da2d0a7b Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf_test 2024-11-13 09:46:20 +08:00
YeMingfei666 f3df88236f 修改先付订单未支付显示已退款问题 2024-11-13 09:45:36 +08:00
GaoHao 42c2d6891d Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-12 16:15:31 +08:00
GaoHao 251353d48e 优惠券满减输入限制 2024-11-12 16:15:06 +08:00
GaoHao ee9405c5a6 优惠券满减输入限制 2024-11-12 16:09:54 +08:00
魏啾 5b0b69bf97 活动修改 2024-11-12 15:54:18 +08:00
魏啾 d8eba6ea2e 解决冲突 2024-11-12 15:07:49 +08:00
魏啾 2a27c5394b 优惠卷 2024-11-12 15:06:13 +08:00
duan 0a081f21ca Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-11-12 10:11:44 +08:00
duan e5ba63d8aa 添加商品分组排列方式 2024-11-12 10:11:33 +08:00
GaoHao 0d37da0a58 Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-12 09:42:08 +08:00
GaoHao 8f8cbae221 限制金额、数量只能输正整数 2024-11-12 09:41:46 +08:00
GaoHao 1df34b598f Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-12 09:40:47 +08:00
GaoHao fea219ee42 限制金额、数量只能输正整数 2024-11-12 09:40:23 +08:00
YeMingfei666 bbbe6275ee 增加临时菜弹窗 2024-11-11 18:23:59 +08:00
duan 964b5a2316 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-11-11 15:39:36 +08:00
duan 0210e61816 Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-11-11 15:36:06 +08:00
YeMingfei666 b75318c146 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-11 14:06:23 +08:00
YeMingfei666 22ae339e30 Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-11-11 14:04:28 +08:00
YeMingfei666 176fc55a5c 增加优惠券,积分抵扣 2024-11-11 14:03:49 +08:00
魏啾 a8f01db5e3 活动管理 2024-11-11 13:36:44 +08:00
魏啾 c79049443a 商品添加缓存 活动 2024-11-11 10:39:45 +08:00
gyq f5368fcf4f Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-11-11 09:53:42 +08:00
gyq af90b029df 新增邀请好友 2024-11-09 18:19:47 +08:00
GaoHao 835809910a Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-08 18:24:46 +08:00
GaoHao 4f6fbf376a 优惠券领取详情更新 2024-11-08 18:24:14 +08:00
GaoHao 43df2b637b Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-08 16:07:25 +08:00
GaoHao 0a470c3d7d 优惠券增加有效天数 2024-11-08 16:06:26 +08:00
YeMingfei666 28fdcd9e5c 增加商品券抵扣以及商品券抵扣后价格计算过滤不满足满减条件的优惠券,修改部分代客下单逻辑 2024-11-07 17:04:00 +08:00
YeMingfei666 a9a4efabe9 修改部分代客下单逻辑 2024-11-07 13:30:58 +08:00