From 41564375dca2f98adf784b55a18f365b88235301 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 24 Mar 2021 15:07:23 +0800
Subject: [PATCH] 分销设置自购返佣
---
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java | 82 +++++++++++++++++++++++-----------------
1 files changed, 47 insertions(+), 35 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
index 3acf923..df2e1dc 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
@@ -54,7 +54,7 @@
ShopSalesmanGradeDao shopSalesmanGradeDao;
@Autowired
- private BizUserDao bizUserDao;
+ BizUserDao bizUserDao;
@Autowired
BizUserService bizUserService;
@@ -139,41 +139,47 @@
public VerificationResult isAbleToBeAnSalesman(String openId,Long companyId) {
VerificationResult verificationResult=null;
- //申请条件
- BusParameterSettings applyCondition = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_CONDITION, companyId);
- switch (applyCondition.getParamValue()){
- case FenxiaoSettingConstant.FX_APPLY_CONDITION_WTJ:
- verificationResult= VerificationResult.buildVerificationResult(true);
- break;
- case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFZDCP:
- int buyZdcpCount= shopOrderV2Dao.countBuyZdcp(openId,applyCondition.getParamValue1());
- if(buyZdcpCount>0){
- verificationResult= VerificationResult.buildVerificationResult(true);
- }else{
- verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件，请消费指定产品后再申请！");
- }
- break;
- case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFRYCP:
- //判断用户是否有确认收货的产品
- int receivedOrderCount= shopOrderV2Dao.selectReceivedOrderCount(openId);
- if(receivedOrderCount>0){
- verificationResult= VerificationResult.buildVerificationResult(true);
- }else{
- verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件，请消费任意产品后再申请！");
- }
- break;
- case FenxiaoSettingConstant.FX_APPLY_CONDITION_XCZDJE:
- Double zdje=Double.parseDouble(applyCondition.getParamValue2());
- Double yxfje=shopOrderV2Dao.countOrderAmount(openId);
- if(zdje<yxfje){
- verificationResult=VerificationResult.buildVerificationResult(true);
- }else{
- verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件，请消费满"+zdje+"元后再申请！");
- }
- break;
- default:
- verificationResult= VerificationResult.buildVerificationResult(true);
+ //申请模式
+ BusParameterSettings applyWay = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_WAY, companyId);
+ if (applyWay.getParamValue().equals(FenxiaoSettingConstant.FX_APPLY_WAY_AUTO)) {
+ verificationResult= VerificationResult.buildVerificationResult(true);
+ }else{
+ //申请条件
+ BusParameterSettings applyCondition = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_CONDITION, companyId);
+ switch (applyCondition.getParamValue()){
+ case FenxiaoSettingConstant.FX_APPLY_CONDITION_WTJ:
+ verificationResult= VerificationResult.buildVerificationResult(true);
+ break;
+ case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFZDCP:
+ int buyZdcpCount= shopOrderV2Dao.countBuyZdcp(openId,applyCondition.getParamValue1());
+ if(buyZdcpCount>0){
+ verificationResult= VerificationResult.buildVerificationResult(true);
+ }else{
+ verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件，请消费指定产品后再申请！");
+ }
+ break;
+ case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFRYCP:
+ //判断用户是否有确认收货的产品
+ int receivedOrderCount= shopOrderV2Dao.selectReceivedOrderCount(openId);
+ if(receivedOrderCount>0){
+ verificationResult= VerificationResult.buildVerificationResult(true);
+ }else{
+ verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件，请消费任意产品后再申请！");
+ }
+ break;
+ case FenxiaoSettingConstant.FX_APPLY_CONDITION_XCZDJE:
+ Double zdje=Double.parseDouble(applyCondition.getParamValue2());
+ Double yxfje=shopOrderV2Dao.countOrderAmount(openId);
+ if(zdje<yxfje){
+ verificationResult=VerificationResult.buildVerificationResult(true);
+ }else{
+ verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件，请消费满"+zdje+"元后再申请！");
+ }
+ break;
+ default:
+ verificationResult= VerificationResult.buildVerificationResult(true);
+ }
}
return verificationResult;
}
@@ -365,6 +371,10 @@
if(StrUtil.isEmpty(name)) {
return AjaxResult.buildFailInstance("请输入方案名称");
}
+ Double selfCommission = updateFyfaDto.getSelfCommission();
+ if(ObjectUtil.isEmpty(selfCommission)) {
+ return AjaxResult.buildFailInstance("请输入正确的自购返佣");
+ }
Double sealesCommission = updateFyfaDto.getSealesCommission();
if(ObjectUtil.isEmpty(sealesCommission)) {
return AjaxResult.buildFailInstance("请输入正确的推广提成");
@@ -378,6 +388,7 @@
ShopSalesmanGrade shopSalesmanGrade = new ShopSalesmanGrade();
shopSalesmanGrade.setCompanyId(updateFyfaDto.getCompanyId());
shopSalesmanGrade.setName(updateFyfaDto.getName());
+ shopSalesmanGrade.setSelfCommission(selfCommission);
shopSalesmanGrade.setSealesCommission(sealesCommission);
shopSalesmanGrade.setInvitationCommission(invitationCommission);
shopSalesmanGrade.setGradeCondition(updateFyfaDto.getGradeCondition());
@@ -392,6 +403,7 @@
}
selectById.setCompanyId(updateFyfaDto.getCompanyId());
selectById.setName(updateFyfaDto.getName());
+ selectById.setSelfCommission(selfCommission);
selectById.setSealesCommission(sealesCommission);
selectById.setInvitationCommission(invitationCommission);
selectById.setGradeCondition(updateFyfaDto.getGradeCondition());
--
Gitblit v1.9.1