fanzherong_v 1 月之前
父节点
当前提交
90e61c32a6

+ 3 - 3
snowy-admin-web/src/views/biz/rechargeplanconfig/form.vue

@@ -29,9 +29,9 @@
 				<a-input-number v-model:value="formData.rechargeAmount" style="width: 100%" :min="0" :max="99999999"
 								:precision="2" placeholder="请输入充值金额及以上" allow-clear/>
 			</a-form-item>
-			<a-form-item label="蛋糕券金额:" name="couponAmount">
+			<a-form-item label="蛋糕券大小(寸):" name="couponAmount">
 				<a-input-number v-model:value="formData.couponAmount" style="width: 100%" :min="0" :max="99999999"
-								:precision="2" placeholder="请输入优惠券金额" allow-clear/>
+								:precision="2" placeholder="请输入蛋糕券大小(寸)" allow-clear/>
 			</a-form-item>
 			<a-form-item label="蛋糕券数量:" name="couponNum">
 				<a-input-number v-model:value="formData.couponNum" style="width: 100%" :min="0" :max="99999999"
@@ -118,7 +118,7 @@ bizOrgApi.orgTreeSelector().then((res) => {
 // 默认要校验的
 const formRules = {
 	rechargeAmount: [required('请输入充值金额及以上')],
-	couponAmount: [required('请输入蛋糕券金额')],
+	couponAmount: [required('请输入蛋糕券大小(寸)')],
 	couponNum: [required('请输入蛋糕券数量')],
 	accountBalance: [required('请输入账户到账糕点')],
 	rebateRatio: [required('请输入店员返点比例(积分)')],

+ 1 - 1
snowy-admin-web/src/views/biz/rechargeplanconfig/index.vue

@@ -156,7 +156,7 @@
 			align: 'center',
 		},
 		{
-			title: '蛋糕券金额(元)',
+			title: '蛋糕券大小(寸)',
 			dataIndex: 'couponAmount',
 			align: 'center',
 		},

+ 1 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rechargerecord/service/impl/BizRechargeRecordServiceImpl.java

@@ -167,7 +167,7 @@ public class BizRechargeRecordServiceImpl extends ServiceImpl<BizRechargeRecordM
             StringBuffer content = new StringBuffer();
             content.append("充值方案:").append(bizRechargePlanConfig.getRechargeAmount()).append("元及以上,");
             if (bizRechargePlanConfig.getCouponAmount().compareTo(BigDecimal.ZERO) != 0) {
-                content.append("赠送蛋糕券 ").append(bizRechargePlanConfig.getCouponAmount())
+                content.append("赠送"+bizRechargePlanConfig.getCouponAmount()+"寸蛋糕券 ")
                         .append(" x ").append(bizRechargePlanConfig.getCouponNum())
                         .append("(线下核销领蛋糕)");
             }