修改消息发送

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

@@ -40,6 +40,7 @@ import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.DateHelper;
+import com.yanzuoguang.util.helper.JsonHelper;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -518,10 +519,10 @@ public class CompanyServiceImpl implements CompanyService {
             }
             CompanyBankCardReqVo resVo = result.getData();
             ObjectHelper.writeWithFrom(companyBankCardVo, resVo);
-            companyBankCardVo.setIsDefault(0);
+            companyBankCardVo.setIsDefault(1);
             companyBankCardDao.update(companyBankCardVo);
             if (1 == companyBankCardVo.getStatus()) {
-                return ResponseResult.error("99", "该银行卡已绑定");
+                return ResponseResult.result(companyBankCardVo);
             }
         } else {
             companyBankCardVo = new CompanyBankCardVo();
@@ -549,7 +550,7 @@ public class CompanyServiceImpl implements CompanyService {
             reqVo.setStatus(0);
             companyBankCardDao.create(companyBankCardVo);
             if (1 == companyBankCardVo.getStatus()) {
-                return ResponseResult.error("99", "该银行卡已绑定");
+                return ResponseResult.result(companyBankCardVo);
             }
         }
         return ResponseResult.result(companyBankCardVo);
@@ -914,9 +915,14 @@ public class CompanyServiceImpl implements CompanyService {
         List<GetCompanyReqVo> companyList = req.getCompanyIdList();
         for (int i = 0; i < companyList.size(); i++) {
             GetCompanyReqVo getCompanyReqVo = companyList.get(i);
+            if("1ef73ca537fb494ca02b9e320a6883cf".equals(getCompanyReqVo.getCompanyId())){
+                getCompanyReqVo.setCompanyId("6da527f930be4aa1904fe17fcb41874f");
+            }
             GetCompanyDivideResVo companyDivideResVo = companyDivideRuleDao.findCompanyDivideInfo(getCompanyReqVo);
-            companyDivideResVo.setCompanyChannelType(getCompanyReqVo.getCompanyChannelType());
-            companyDivideResVoList.add(companyDivideResVo);
+            if(!StringHelper.isEmpty(companyDivideResVo)){
+                companyDivideResVo.setCompanyChannelType(getCompanyReqVo.getCompanyChannelType());
+                companyDivideResVoList.add(companyDivideResVo);
+            }
         }
         return companyDivideResVoList;
     }

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

@@ -219,8 +219,6 @@ public class RegisterServiceImpl implements RegisterService {
         } else {
             req.setId(reqVo.getMerchantId());
         }
-
-
         SaveCompanyResVo resVo = new SaveCompanyResVo();
         ResponseResult result1 = storeFeign.merchantCreate(req);
         if (result1.getCode().equals("00")) {
@@ -413,7 +411,7 @@ public class RegisterServiceImpl implements RegisterService {
         CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
         getReqVo.setCompanyId(companyVo.getId());
         List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(getReqVo, CompanyBankCardVo.class);
-        getReqVo.setIsDefault(0);
+        getReqVo.setIsDefault(1);
         CompanyBankCardVo companyBankCardVo = companyBankCardDaoImpl.load(getReqVo, CompanyBankCardVo.class);
         loginCompanyResVo.setCompanyBankCardVo(companyBankCardVo);
         resVo.setCompanyResVo(loginCompanyResVo);

src/main/resources/bootstrap-dev.yml

@@ -9,4 +9,4 @@ yzg:
 
 msg:
   payMsgId: 4
-  groupProductMsgId: 7
\ No newline at end of file
+  groupProductMsgId: 10
\ No newline at end of file