优化--不同的商家返回未确认订单的个数是不一样的

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/client/OmsClient.java

@@ -26,10 +26,10 @@ public class OmsClient {
     @Autowired
     private RestTemplate restTemplate;
 
-    public Object getCountNewOrder() {
+    public Object getCountNewOrder(Integer backUserId) {
         HttpHeaders headers = new HttpHeaders();
         HttpEntity<String> entity = new HttpEntity<>(null, headers);
-        ResponseEntity<ResultBody> responseEntity = restTemplate.exchange(omsAppUri + "/oms/uav-order/getCountNewOrder", HttpMethod.GET, entity, ResultBody.class);
+        ResponseEntity<ResultBody> responseEntity = restTemplate.exchange(omsAppUri + "/oms/uav-order/getCountNewOrder" + "?backUserId=" + backUserId, HttpMethod.GET, entity, ResultBody.class);
         ResultBody body = responseEntity.getBody();
         return body.getResult();
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/BackUserAccountController.java

@@ -95,8 +95,8 @@ public class BackUserAccountController extends BaseController {
     @ApiOperation("后台——消息提示")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = NewMessageVO.class)})
     @GetMapping("getMessage")
-    public ResultBody getMessage() {
-        return backUserAccountService.getMessage();
+    public ResultBody getMessage(HttpServletRequest request) {
+        return backUserAccountService.getMessage(this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
 
     @ApiOperation("后台--添加(修改)后台用户建议")

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/BackUserAccountService.java

@@ -100,7 +100,7 @@ public interface BackUserAccountService {
      * 获取后台新消息
      * @return {@link ResultBody}
      */
-    ResultBody getMessage();
+    ResultBody getMessage(Integer backUserId);
 
     ResultBody insertCompanySuggestion(BackUserSuggestionDO backUserSuggestionDO,Integer backUserId);
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/BackUserAccountServiceImpl.java

@@ -299,16 +299,19 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
     }
 
     @Override
-    public ResultBody getMessage() {
+    public ResultBody getMessage(Integer backUserId) {
         NewMessageVO newMessageVO = new NewMessageVO();
+        //统计未审核的飞手个数
         newMessageVO.setPilotMessage(certificationDao.getPilotAuditSum(0));
+        //统计加盟入住企业的申请个数
         newMessageVO.setJoinApplyMessage(cooperationDao.getAuditSum(0));
 
-        List<Integer> list = (List<Integer>) omsClient.getCountNewOrder();
+        List<Integer> list = (List<Integer>) omsClient.getCountNewOrder(backUserId);
         newMessageVO.setOrderMessage(list.get(0));
         newMessageVO.setPointsMallMessage(list.get(1));
+        //统计未审核的帖子个数
         newMessageVO.setDynamicMessage(imsClient.getDynamicMessageSum());
-
+        //统计新加城市合伙人个数
         String stringNumber = stringRedisTemplate.opsForValue().get(GeneralConstant.PARTNER_NOT_VIEWED);
         if(stringNumber == null){
             stringNumber = "0";