From 6a4a32d2f0489d5b1577a7400d1756ca4e3416f9 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 17 Mar 2021 11:01:39 +0800
Subject: [PATCH] 新增查询申请条件接口

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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 9cf5e16..2a743c2 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
@@ -71,7 +71,7 @@
 
         BizUser loginUser=bizUserDao.findByOpenId(openId);
         //验证申请条件
-        VerificationResult verificationResult = isAbleToBeAnSalesman(openId);
+        VerificationResult verificationResult = isAbleToBeAnSalesman(openId,loginUser.getCompanyId());
         if(verificationResult.isJudgeResult()){
             //校验审核状态,和是否重复发起
             QueryWrapper<ShopSalesmanApply> queryWrapper = new QueryWrapper<>();
@@ -135,14 +135,15 @@
     /**
      * 判断是否满足申请成为分销员的条件
      */
-    public VerificationResult isAbleToBeAnSalesman(String openId) {
-        BizUser bizUser = bizUserDao.findByOpenId(openId);
+    public VerificationResult isAbleToBeAnSalesman(String openId,Long companyId) {
+
         VerificationResult verificationResult=null;
         //申请条件
-        BusParameterSettings applyCondition = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_CONDITION, bizUser.getCompanyId());
+        BusParameterSettings applyCondition = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_CONDITION, companyId);
         switch (applyCondition.getParamValue()){
             case FenxiaoSettingConstant.FX_APPLY_CONDITION_WTJ:
                 VerificationResult.buildVerificationResult(true);
+                break;
             case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFZDCP:
                 VerificationResult.buildVerificationResult(true);
                 int buyZdcpCount= shopOrderV2Dao.countBuyZdcp(openId,applyCondition.getParamValue1());
@@ -151,7 +152,7 @@
                 }else{
                     verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件,请消费指定产品后再申请!");
                 }
-
+                break;
             case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFRYCP:
                 //判断用户是否有确认收货的产品
                 int receivedOrderCount= shopOrderV2Dao.selectReceivedOrderCount(openId);
@@ -160,6 +161,7 @@
                 }else{
                     verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件,请消费任意产品后再申请!");
                 }
+                break;
             case FenxiaoSettingConstant.FX_APPLY_CONDITION_XCZDJE:
                 Double zdje=Double.parseDouble(applyCondition.getParamValue2());
                 Double yxfje=shopOrderV2Dao.countOrderAmount(openId);
@@ -169,8 +171,10 @@
                     verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件,请消费满"+zdje+"元后再申请!");
                 }
                 VerificationResult.buildVerificationResult(true);
+                break;
             default:
                 VerificationResult.buildVerificationResult(true);
+
         }
         return verificationResult;
     }

--
Gitblit v1.9.1