保存资金流水和商户余额MQ拆分

src/main/java/com/pangding/web/authority/controller/CompanyManagementController.java

@@ -34,12 +34,12 @@ public class CompanyManagementController {
      * @return 公司信息
      */
     @RequestMapping(value = "/saveCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<SaveCompanyResVo> saveCompany(@RequestBody SaveCompanyReqVo reqVo){
+    public ResponseResult<SaveCompanyResVo> saveCompany(@RequestBody OldSaveCompanyReqVo reqVo){
         checkCompany(reqVo);
         return ResponseResult.result(companyServiceImpl.saveCompany(reqVo));
     }
 
-    private void checkCompany(SaveCompanyReqVo reqVo){
+    private void checkCompany(OldSaveCompanyReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("account",reqVo.getAccount())
                 .notBlankCheck("companyType",reqVo.getCompanyType())
@@ -64,7 +64,7 @@ public class CompanyManagementController {
      * @return
      */
     @RequestMapping(value = "/companySubmit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult companySubmit(@RequestBody SaveCompanyReqVo reqVo){
+    public ResponseResult companySubmit(@RequestBody OldSaveCompanyReqVo reqVo){
         checkCompany(reqVo);
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())

src/main/java/com/pangding/web/authority/controller/PangdingManagementController.java

@@ -72,12 +72,12 @@ public class PangdingManagementController {
      * @return 公司信息
      */
     @RequestMapping(value = "/saveCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<SaveCompanyResVo> saveCompany(@RequestBody SaveCompanyReqVo reqVo){
+    public ResponseResult<SaveCompanyResVo> saveCompany(@RequestBody OldSaveCompanyReqVo reqVo){
         checkCompany(reqVo);
         return ResponseResult.result(companyServiceImpl.saveCompany(reqVo));
     }
 
-    private void checkCompany(SaveCompanyReqVo reqVo){
+    private void checkCompany(OldSaveCompanyReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("account",reqVo.getAccount())
                 .notBlankCheck("companyType",reqVo.getCompanyType())
@@ -101,7 +101,7 @@ public class PangdingManagementController {
      * @return
      */
     @RequestMapping(value = "/companySubmit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<SaveCompanyResVo> companySubmit(@RequestBody SaveCompanyReqVo reqVo){
+    public ResponseResult<SaveCompanyResVo> companySubmit(@RequestBody OldSaveCompanyReqVo reqVo){
         checkCompany(reqVo);
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())

src/main/java/com/pangding/web/authority/feign/StoreFeign.java

@@ -21,7 +21,7 @@ public interface StoreFeign {
      * @return
      */
     @RequestMapping("/merchantCreate")
-    ResponseResult<String> merchantCreate(@RequestBody MerchantCreateReqVo req);
+    ResponseResult<MerchantVo> merchantCreate(@RequestBody MerchantCreateReqVo req);
 
     /**
      * 通过公司还是id获取商户信息

src/main/java/com/pangding/web/authority/service/CompanyService.java

@@ -64,14 +64,14 @@ public interface CompanyService{
      * @param reqVo 公司以及公司扩展表信息
      * @return 公司id
      */
-    SaveCompanyResVo saveCompany(SaveCompanyReqVo reqVo);
+    SaveCompanyResVo saveCompany(OldSaveCompanyReqVo reqVo);
 
     /**
      * 添加公司提交按钮
      * @param reqVo 封装了公司id和验证码的请求对象
      * @return
      */
-    SaveCompanyResVo companySubmit(SaveCompanyReqVo reqVo);
+    SaveCompanyResVo companySubmit(OldSaveCompanyReqVo reqVo);
 
     /**
      * 修改公司审核状态

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

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.CompanyDao;
-import com.pangding.web.authority.dao.CompanyMoneyDao;
 import com.pangding.web.authority.service.CompanyNewService;
-import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.req.company.CompanyReqVo;
 import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.yanzuoguang.util.vo.PageSizeData;

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

@@ -14,12 +14,10 @@ import com.pangding.web.authority.util.RsaConstant;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.reqvo.CompanyReqVo;
-import com.pangding.web.authority.vo.reqvo.SaveCompanyReqVo;
+import com.pangding.web.authority.vo.reqvo.OldSaveCompanyReqVo;
 import com.pangding.web.authority.vo.resvo.*;
 import com.pangding.web.constant.CompanyConstant;
-import com.pangding.web.constant.OrderConstant;
 import com.pangding.web.util.RSAUtils;
-import com.pangding.web.vo.order.pd.CapitalFlowVo;
 import com.pangding.web.vo.order.req.CapitalFlowReqVo;
 import com.pangding.web.vo.product.pd.merchant.MerchantVo;
 import com.pangding.web.vo.system.pd.CompanyMsgVo;
@@ -82,13 +80,9 @@ public class CompanyServiceImpl implements CompanyService {
     @Autowired
     private RoleDao roleDao;
     @Autowired
-    private CapitalFlowDao capitalFlowDao;
-    @Autowired
     private CompanyMoneyDetailDao companyMoneyDetailDao;
     @Autowired
     private CompanyConsumer companyConsumer;
-    @Autowired
-    private CompanyCodeService companyCodeService;
     @Value("${msg.payMsgId}")
     private String payMsgId;
     @Value("${msg.groupProductMsgId}")
@@ -204,7 +198,7 @@ public class CompanyServiceImpl implements CompanyService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public SaveCompanyResVo saveCompany(SaveCompanyReqVo reqVo) {
+    public SaveCompanyResVo saveCompany(OldSaveCompanyReqVo reqVo) {
         /*返回结果对象*/
         SaveCompanyResVo resVo = new SaveCompanyResVo();
         /*检查用户名*/
@@ -362,7 +356,7 @@ public class CompanyServiceImpl implements CompanyService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public SaveCompanyResVo companySubmit(SaveCompanyReqVo reqVo) {
+    public SaveCompanyResVo companySubmit(OldSaveCompanyReqVo reqVo) {
         /*返回对象*/
         SaveCompanyResVo resVo = new SaveCompanyResVo();
         /*公司主表*/
@@ -1116,7 +1110,6 @@ public class CompanyServiceImpl implements CompanyService {
         companyResVo.setUpdateTime(DateHelper.getNow());
         if (com.pangding.web.constant.CompanyConstant.COMPANY_STATUS_BIND_PHONE < companyResVo.getStatus()) {
             // 公司状态小于电话已绑定，已经通过通联实名认证，不可修改公司的基本信息
-//            companyExtendDao.update(companyResVo);
         } else {
             CompanyVo companyVo = new CompanyVo();
             ObjectHelper.writeWithFrom(companyResVo, req.getCompanyVo());
@@ -1124,8 +1117,6 @@ public class CompanyServiceImpl implements CompanyService {
             if (StringHelper.isEmpty(req.getCompanyVo().getCompanyName())) {
                 companyResVo.setCompanyName(req.getCompanyVo().getContactName());
             }
-//            companyDao.update(companyResVo);
-//            companyExtendDao.update(companyResVo);
         }
         if (com.pangding.web.constant.CompanyConstant.COMPANY_TYPE_PERSON == companyResVo.getCompanyType()) {
             // 个人 TODO 调用通联实名制
@@ -1175,6 +1166,26 @@ public class CompanyServiceImpl implements CompanyService {
         ObjectHelper.writeWithFrom(companyResVo, saveCompanyReqVo.getCompanyVo());
         companyDao.update(companyResVo);
 
+         /*保存或更新商户表*/
+        MerchantCreateReqVo merchantCreateReqVo = new MerchantCreateReqVo();
+        ObjectHelper.writeWithFrom(merchantCreateReqVo, req.getMerchantVo());
+        merchantCreateReqVo.setAddress(req.getCompanyVo().getAddress());
+        merchantCreateReqVo.setType(req.getCompanyVo().getCompanyAttribute());
+        merchantCreateReqVo.setProductCompanyId(companyResVo.getId());
+        merchantCreateReqVo.setProductCompanyName(req.getCompanyVo().getCompanyName());
+        merchantCreateReqVo.setUserId(req.getUserVo().getId());
+        merchantCreateReqVo.setUsername(req.getUserVo().getAccount());
+        merchantCreateReqVo.setReqId(StringHelper.getNewID());
+        merchantCreateReqVo.setCreateTime(DateHelper.getNow());
+
+        if (!StringHelper.isEmpty(merchantCreateReqVo.getId())) {
+            merchantCreateReqVo.setId(StringHelper.getNewID());
+        }
+        ResponseResult<MerchantVo> merchantResponseResult = storeFeign.merchantCreate(merchantCreateReqVo);
+        if (merchantResponseResult.getCode().equals("00")) {
+            MerchantVo merchantVo =  merchantResponseResult.getData();
+            saveCompanyReqVo.setMerchantVo(merchantVo);
+        }
         if (StringHelper.isEmpty(saveCompanyReqVo.getErrorMessage())) {
             // 错误信息为空，发送验证码成功 修改信息成功
             return responseResult;

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

@@ -662,7 +662,7 @@ public class RegisterServiceImpl implements RegisterService {
 //        if(com.pangding.web.constant.CompanyConstant.USER_PHONE_BACK == reqVo.getPicType()){
 //            companyVo.setUserPhoneBack(reqVo.getUrl());
 //        }
-//        com.pangding.web.vo.system.req.company.SaveCompanyReqVo saveCompanyReqVo = new com.pangding.web.vo.system.req.company.SaveCompanyReqVo();
+//        com.pangding.web.vo.system.req.company.OldSaveCompanyReqVo saveCompanyReqVo = new com.pangding.web.vo.system.req.company.OldSaveCompanyReqVo();
 //        saveCompanyReqVo.setCompanyVo(companyVo);
 //        saveCompanyReqVo.setPicType(reqVo.getPicType());
 //        ResponseResult<Boolean> responseResult = payFeign.idcardCollect(saveCompanyReqVo);

src/main/java/com/pangding/web/authority/vo/reqvo/SaveCompanyReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/OldSaveCompanyReqVo.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @Author zhangjinyao
  * @create 2019/6/4 16:52
  */
-public class SaveCompanyReqVo {
+public class OldSaveCompanyReqVo {
 
     private String reqId;