修改用户二维码生成

src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java

@@ -669,10 +669,10 @@ public class CompanyServiceImpl implements CompanyService {
             reqVo.setReservedPhone(reqVo.getPhone());
             reqVo.setStatus(0);
             ResponseResult<CompanyBankCardReqVo> result = new ResponseResult<>();
-            if(2 == reqVo.getType()){
+            if (2 == reqVo.getType()) {
                 result = payFeign.bindCompanyAccount(reqVo);
-            }else{
-                result =  payFeign.bindBack(reqVo);
+            } else {
+                result = payFeign.bindBack(reqVo);
             }
             if (null == result || !"00".equals(result.getCode())) {
                 throw new CodeException("绑定银行卡失败，请重试");
@@ -739,7 +739,7 @@ public class CompanyServiceImpl implements CompanyService {
     public void setDefault(CompanyBankCardVo reqVo) {
         // 查询银行卡
         CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(reqVo, CompanyBankCardVo.class);
-        if(StringHelper.isEmpty(companyBankCardVo)){
+        if (StringHelper.isEmpty(companyBankCardVo)) {
             throw new CodeException("银行卡未找到。");
         }
         // 将该公司下所有银行卡设为非默认
@@ -1178,13 +1178,17 @@ public class CompanyServiceImpl implements CompanyService {
         companyDao.update(companyVo);
 
         // 更新或新增提现规则表
-        saveCompanyRule(reqVo.getCompanyRuleVoList(), companyVo);
+        if (1 == reqVo.getDiscountRule()) {
+            saveCompanyRule(reqVo.getCompanyRuleVoList(), companyVo);
+        }
 
-        // 更新或新增邀请规则表
-        saveCompanyInvitationRule(reqVo.getCompanyInvitationActivatRuleVoList(), companyVo, 0);
+        if(1 == reqVo.getInvitationStatus()){
+            // 更新或新增邀请规则表
+            saveCompanyInvitationRule(reqVo.getCompanyInvitationActivatRuleVoList(), companyVo, 0);
 
-        // 更新或新增邀请规则表
-        saveCompanyInvitationRule(reqVo.getCompanyInvitationRewardRuleVoList(), companyVo, 1);
+            // 更新或新增邀请规则表
+            saveCompanyInvitationRule(reqVo.getCompanyInvitationRewardRuleVoList(), companyVo, 1);
+        }
 
         /*新增或更新pd_company_divide_rule表*/
         CompanyDivideRuleVo companyDivideRuleVo = new CompanyDivideRuleVo();
@@ -1351,7 +1355,7 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyResVo companyResVo = companyDao.load(req.getCompanyVo().getId(), CompanyResVo.class);
         if (StringHelper.isEmpty(companyResVo)) {
             // 公司信息为空
-            return (ResponseResult)ResponseResult.error("99", "注册信息有误");
+            return (ResponseResult) ResponseResult.error("99", "注册信息有误");
         }
         ObjectHelper.writeWithFrom(companyResVo, req.getCompanyVo());
         companyResVo.setAddress(req.getCompanyVo().getAddress());
@@ -1455,7 +1459,7 @@ public class CompanyServiceImpl implements CompanyService {
             // 错误信息为空，发送验证码成功 修改信息成功
             return responseResult;
         } else {
-            return (ResponseResult)ResponseResult.error("99", saveCompanyReqVo.getErrorMessage());
+            return (ResponseResult) ResponseResult.error("99", saveCompanyReqVo.getErrorMessage());
         }
     }