产品续费——显示（返回格式修改）

diagbotman-service/src/main/java/com/diagbot/dto/RenewalsInfosDTO.java

@@ -1,12 +1,9 @@
 package com.diagbot.dto;
 
-import com.diagbot.enums.RenewalsEnum;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @Description:
@@ -31,6 +28,11 @@ public class RenewalsInfosDTO {
      */
     private Integer renewalsStutas;
 
+    /**
+     * 续费状态（1.已续费0.未续费）名字
+     */
+    private String renewalsStutasName;
+
     /**
      * 申请时间
      */
@@ -66,9 +68,4 @@ public class RenewalsInfosDTO {
      */
     private String renewalsNo;
 
-    public Map getRenewalsStutas(){
-        Map map = new HashMap();
-        map.put(Integer.valueOf(renewalsStutas), RenewalsEnum.getName(Integer.valueOf(renewalsStutas)));
-        return map;
-    }
 }

diagbotman-service/src/main/java/com/diagbot/facade/UserRenewalsFacade.java

@@ -9,6 +9,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.UserRenewals;
 import com.diagbot.entity.wrapper.UserRenewalsWrapper;
+import com.diagbot.enums.RenewalsEnum;
 import com.diagbot.enums.VisibleIdTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -86,6 +87,7 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
         Map<Long, UserOrgDTO> dataMap = mapRespDTO.data;
         for(RenewalsInfosDTO bean : list) {
             UserOrgDTO uo = dataMap.get(bean.getUserId());
+            bean.setRenewalsStutasName(RenewalsEnum.getName(bean.getRenewalsStutas()));
             for (ProductLineDTO productLineDTO:productList) {
                 if (productLineDTO.getId()==bean.getProductId()){
                     bean.setProductName(productLineDTO.getName());

diagbotman-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -5,6 +5,7 @@ import com.diagbot.enums.AuditStatusEnum;
 import com.diagbot.enums.ChargeTypeEnum;
 import com.diagbot.enums.NotPassEnum;
 import com.diagbot.enums.ProductAuditEnum;
+import com.diagbot.enums.RenewalsEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.enums.TokenTypeEnum;
 import com.diagbot.enums.TrialStatusEnum;
@@ -38,6 +39,7 @@ public class EnumsDataServiceImpl implements EnumsDataService {
                 .addEnums("tokenTypeEnum", TokenTypeEnum.values())
                 .addEnums("trialStatusEnum", TrialStatusEnum.values())
                 .addEnums("productAuditEnum", ProductAuditEnum.values())
+                .addEnums("renewalsEnum", RenewalsEnum.values())
                 .build();
         return enumMap;
     }

diagbotman-service/src/main/resources/mapper/UserRenewalsMapper.xml

@@ -23,7 +23,7 @@
 
     <select id="selectUserRenewals" resultType="com.diagbot.dto.RenewalsInfosDTO">
         SELECT * FROM `diag_user_renewals` WHERE is_deleted = 'N'
-        <if test="renewalsInfosVO.renewalsStutas != null and renewalsInfosVO.renewalsStutas != ''">
+        <if test="renewalsInfosVO.renewalsStutas != null">
               AND renewals_stutas = #{renewalsInfosVO.renewalsStutas}
         </if>
         <if test="renewalsInfosVO.startTime != null and renewalsInfosVO.endTime != null">