后台提示积分购买商品

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/NewMessageVO.java

@@ -28,4 +28,7 @@ public class NewMessageVO {
 
     @ApiModelProperty(value = "未读合伙人信息")
     private int userStateMessage;
+
+    @ApiModelProperty(value = "未发货消息")
+    private int pointsMallMessage;
 }

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

@@ -12,6 +12,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.List;
+
 /**
  * @author Admin
  */
@@ -24,12 +26,12 @@ public class OmsClient {
     @Autowired
     private RestTemplate restTemplate;
 
-    public int getCountNewOrder() {
+    public Object getCountNewOrder() {
         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);
         ResultBody body = responseEntity.getBody();
-        return (int) body.getResult();
+        return body.getResult();
 
     }
 

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

@@ -304,14 +304,19 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
         newMessageVO.setPilotMessage(certificationDao.getPilotAuditSum(0));
         newMessageVO.setJoinApplyMessage(cooperationDao.getAuditSum(0));
 
-        newMessageVO.setOrderMessage(omsClient.getCountNewOrder());
+        List<Integer> list = (List<Integer>) omsClient.getCountNewOrder();
+        newMessageVO.setOrderMessage(list.get(0));
+        newMessageVO.setPointsMallMessage(list.get(1));
         newMessageVO.setDynamicMessage(imsClient.getDynamicMessageSum());
 
         String StringNumber = stringRedisTemplate.opsForValue().get(GeneralConstant.PARTNER_NOT_VIEWED);
+        String StringNumber1;
         if(StringNumber == null){
-            StringNumber = "0";
+            StringNumber1 = "0";
+        }else{
+            StringNumber1 = StringNumber.substring(1, StringNumber.length() - 1); // 去除首尾双引号
         }
-        int num = Integer.parseInt(StringNumber);
+        int num = Integer.parseInt(StringNumber1);
         newMessageVO.setUserStateMessage(num);
         return ResultBody.success(newMessageVO);
     }