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

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

@@ -13,14 +13,18 @@ import com.pangding.web.vo.order.tl.SoundContentReqVo;
 import com.pangding.web.vo.order.tl.SoundReqVo;
 import com.pangding.web.vo.system.req.CompanyMsgReqVo;
 import com.pangding.web.vo.system.req.DeviceReqVo;
+import com.pangding.web.vo.system.req.authority.UserReqVo;
 import com.pangding.web.vo.system.res.CompanyMsgResVo;
 import com.pangding.web.vo.system.res.DeviceResVo;
+import com.pangding.web.vo.system.res.authority.UserResVo;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 @Service
 public class CompanyMsgServiceImpl implements CompanyMsgService {
@@ -47,20 +51,6 @@ public class CompanyMsgServiceImpl implements CompanyMsgService {
 
         companyMsgDao.create(reqVo);
 
-        SoundContentVo soundContentVo = new SoundContentVo();
-        soundContentVo.setTipContent(reqVo.getMsgContent());
-        soundContentVo.setTipSound(reqVo.getMsgSound());
-        soundContentVo.setTipUrl("http://frapp.pangdly.com?msg=" + soundContentVo.getTipContent());
-
-//        UserReqVo userReqVo = new UserReqVo();
-//        userReqVo.setCompanyId(reqVo.getCompanyId());
-//        List<UserResVo> userResList = userDao.loadList(userReqVo, UserResVo.class);
-//        for (int i = 0; i < userResList.size(); i++) {
-//            if (1 == userResList.get(i).getReceiveFlag()) {
-//                partnerProcedure.sendSoundContent(userResList.get(i).getId(), soundContentVo);
-//            }
-//        }
-
         DeviceReqVo deviceReqVo = new DeviceReqVo();
         deviceReqVo.setCompanyId(reqVo.getCompanyId());
         deviceReqVo.setDeviceType(CompanyConstant.DEVICE_SOUND);
@@ -82,6 +72,22 @@ public class CompanyMsgServiceImpl implements CompanyMsgService {
             soundReqVo.setTopicName("/" + deviceCode + "/" + deviceName + "/user/report");
             companyConsumer.sendSound(soundReqVo);
         }
+
+        SoundContentVo soundContentVo = new SoundContentVo();
+        soundContentVo.setTipContent(reqVo.getMsgContent());
+        soundContentVo.setTipSound(reqVo.getMsgSound());
+        soundContentVo.setTipUrl("http://frapp.pangdly.com?msg=" + soundContentVo.getTipContent());
+
+        UserReqVo userReqVo = new UserReqVo();
+        userReqVo.setCompanyId(reqVo.getCompanyId());
+        List<UserResVo> userResList = userDao.loadList(userReqVo, UserResVo.class);
+
+        for (int i = 0; i < userResList.size(); i++) {
+            if (1 == userResList.get(i).getReceiveFlag()) {
+                partnerProcedure.sendSoundContent(userResList.get(i).getId(), soundContentVo);
+            }
+        }
+
         return ResponseResult.result("处理成功");
     }
 

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

@@ -421,15 +421,13 @@ public class RegisterServiceImpl implements RegisterService {
         companyScenicInfoReqVo.setReqId(StringHelper.getNewID());
         companyScenicInfoReqVo.setCompanyId(companyVo.getId());
         companyScenicInfoReqVo.setProductOrInterface(0);
-        ResponseResult result = new ResponseResult();
         try {
-            result = storeFeign.getCompanyScenicInfo(companyScenicInfoReqVo);
+            ResponseResult result = storeFeign.getCompanyScenicInfo(companyScenicInfoReqVo);
+            MerchantVo merchant = (MerchantVo) result.getData();
+            resVo.setMerchant(merchant);
         } catch (Exception e) {
             resVo.setMerchant(null);
         }
-        MerchantVo merchant = (MerchantVo) result.getData();
-        resVo.setMerchant(merchant);
-
 
         /*获取用户权限列表*/
         RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();