返利

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

@@ -55,9 +55,13 @@
 				<a-input-number v-model:value="formData.helpCount" style="width: 100%" :min="1" :max="99999999"
 								:precision="0" placeholder="请输入帮助激活糕点到账人数" allow-clear/>
 			</a-form-item>
-			<a-form-item label="返点比例（积分）：" name="rebateRatio">
-				<a-input-number v-model:value="formData.rebateRatio" style="width: 100%" :min="0" :max="100"
-								:precision="2" placeholder="请输入返点比例（积分）" addon-after="%" allow-clear/>
+			<a-form-item label="店员返点比例：" name="rebateRatio">
+				<a-input-number v-model:value="formData.rebateRatio" style="width: 100%" :min="1" :max="100"
+								:precision="2" placeholder="请输入店员返点比例（积分）" addon-after="%" allow-clear/>
+			</a-form-item>
+			<a-form-item label="用户返点比例：" name="rebateUserRatio">
+				<a-input-number v-model:value="formData.rebateUserRatio" style="width: 100%" :min="1" :max="100"
+								:precision="2" placeholder="请输入店员返点比例（积分）" addon-after="%" allow-clear/>
 			</a-form-item>
 		</a-form>
 		<template #footer>
@@ -117,7 +121,8 @@ const formRules = {
 	couponAmount: [required('请输入蛋糕券金额')],
 	couponNum: [required('请输入蛋糕券数量')],
 	accountBalance: [required('请输入账户到账糕点')],
-	rebateRatio: [required('请输入返点比例（积分）')],
+	rebateRatio: [required('请输入店员返点比例（积分）')],
+	rebateUserRatio:[required('请输入用户返点比例（积分）')],
 	orgId: [required('请选择充值门店')],
 	isAccount: [required('请选择是否立即到账')],
 }

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

@@ -67,6 +67,9 @@
 				<template v-if="column.dataIndex === 'rebateRatio'">
 					{{ record.rebateRatio + ' %' }}
 				</template>
+				<template v-if="column.dataIndex === 'rebateUserRatio'">
+					{{ record.rebateUserRatio + ' %' }}
+				</template>
 				<template v-if="column.dataIndex === 'status'">
 					<a-switch
 						:loading="loading"
@@ -173,10 +176,15 @@
 			align: 'center',
 		},
 		{
-			title: '返点比例（积分）',
+			title: '店员返点比例',
 			dataIndex: 'rebateRatio',
 			align: 'center',
 		},
+		{
+			title: '用户返点比例',
+			dataIndex: 'rebateUserRatio',
+			align: 'center',
+		},
 		{
 			title: '状态',
 			dataIndex: 'status',

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rechargeplanconfig/entity/BizRechargePlanConfig.java

@@ -53,10 +53,14 @@ public class BizRechargePlanConfig extends CommonEntity {
     @Schema(description = "账户余额增加金额")
     private BigDecimal accountBalance;
 
-    /** 返点比例（代金券） */
-    @Schema(description = "返点比例（代金券）")
+    /** 店员返点比例（代金券） */
+    @Schema(description = "店员返点比例（积分）")
     private BigDecimal rebateRatio;
 
+    /** 用户返点比例（代金券） */
+    @Schema(description = "用户返点比例（积分）")
+    private BigDecimal rebateUserRatio;
+
     /** 状态：ENABLE.启用 DISABLED.停用 */
     @Schema(description = "状态：ENABLE.启用 DISABLED.停用")
     private String status;

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rechargeplanconfig/mapper/mapping/BizRechargePlanConfigMapper.xml

@@ -11,6 +11,7 @@
             brpc.coupon_num,
             brpc.account_balance,
             brpc.rebate_ratio,
+            brpc.rebate_user_ratio,
             brpc.status,
             brpc.org_id,
             brpc.is_account,

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rechargeplanconfig/param/BizRechargePlanConfigAddParam.java

@@ -48,7 +48,7 @@ public class BizRechargePlanConfigAddParam {
     private BigDecimal accountBalance;
 
     /** 返点比例（代金券） */
-    @Schema(description = "返点比例（代金券）")
+    @Schema(description = "店员返点比例（代金券）")
     private BigDecimal rebateRatio;
 
     /**门店id*/
@@ -60,4 +60,7 @@ public class BizRechargePlanConfigAddParam {
     /**帮助激活人数*/
     private Integer helpCount;
 
+    /** 用户返点比例（代金券） */
+    private BigDecimal rebateUserRatio;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rechargeplanconfig/param/BizRechargePlanConfigEditParam.java

@@ -65,4 +65,7 @@ public class BizRechargePlanConfigEditParam {
     /**帮助激活人数*/
     private Integer helpCount;
 
+    /** 用户返点比例（代金券） */
+    private BigDecimal rebateUserRatio;
+
 }

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

@@ -192,29 +192,14 @@ public class BizRechargeRecordServiceImpl extends ServiceImpl<BizRechargeRecordM
                     if(StringUtils.equals(roleCodeList.get(0),"YK8PsRXAdf")){
                         //店员角色
                         //查询当日推荐人推荐人数
-                        String format = DateUtil.format(DateUtil.date(), "yyyy-MM-dd");
-                        long count = bizRecommendRecordService.count(new QueryWrapper<BizRecommendRecord>().lambda().
-                                eq(BizRecommendRecord::getRecommendUserId, bizUser.getReferralUser()).
-                                between(BizRecommendRecord::getCreateTime, format + " 00:00:00", format + " 23:59:59"));
-                        if(count>=10){
-                            BigDecimal rebate = bizRechargePlanConfig.getRebateRatio().divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
-                            BigDecimal rebateAmount = bizRechargeRecordAddParam.getRechargeAmount().multiply(rebate);
-                            bizRechargeRecord.setRebateAmount(rebateAmount);
-                        }else{
-                            if(count == 0){
-                                BigDecimal rebate = new BigDecimal(1).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
-                                BigDecimal rebateAmount = bizRechargeRecordAddParam.getRechargeAmount().multiply(rebate);
-                                bizRechargeRecord.setRebateAmount(rebateAmount);
-                            }else{
-                                BigDecimal rebate = new BigDecimal(count).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
-                                BigDecimal rebateAmount = bizRechargeRecordAddParam.getRechargeAmount().multiply(rebate);
-                                bizRechargeRecord.setRebateAmount(rebateAmount);
-                            }
-                        }
-                    }else{
                         BigDecimal rebate = bizRechargePlanConfig.getRebateRatio().divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
                         BigDecimal rebateAmount = bizRechargeRecordAddParam.getRechargeAmount().multiply(rebate);
                         bizRechargeRecord.setRebateAmount(rebateAmount);
+                    }else if(StringUtils.equals(roleCodeList.get(0),"vVA3owyWwx")){
+                        //用户角色
+                        BigDecimal rebate = bizRechargePlanConfig.getRebateUserRatio().divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
+                        BigDecimal rebateAmount = bizRechargeRecordAddParam.getRechargeAmount().multiply(rebate);
+                        bizRechargeRecord.setRebateAmount(rebateAmount);
                     }
                 }
             }