续费返回相关修改

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

@@ -68,4 +68,8 @@ public class RenewalsInfosDTO {
      */
     private String renewalsNo;
 
+    /**
+     * 到期时间
+     */
+    private Date endTime;
 }

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/OrderDetailsWapper.java

@@ -39,6 +39,11 @@ public class OrderDetailsWapper {
      */
     private Integer rejectType;
 
+    /**
+     * 不通过类型说明
+     */
+    private String rejectTypeName;
+
     /**
      * 不通过原因
      */

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

@@ -12,6 +12,7 @@ import com.diagbot.entity.OrderDetailsIndex;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ServiceInfo;
 import com.diagbot.enums.AuditStatusEnum;
+import com.diagbot.enums.NotPassEnum;
 import com.diagbot.enums.PaymentMethodEnum;
 import com.diagbot.enums.ServiceTypeEnum;
 import com.diagbot.enums.TokenTypeEnum;
@@ -79,8 +80,12 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
         orderDetails.setModifier(UserUtils.getCurrentPrincipleID());
         orderDetails.setAuditStatus(auditStatusVO.getAuditStatus());
         if(auditStatusVO.getAuditStatus()== AuditStatusEnum.Veto.getKey()){
-            orderDetails.setRejectType(auditStatusVO.getRejectType());
-            orderDetails.setRejectReason(auditStatusVO.getRejectReason());
+            if(auditStatusVO.getRejectReason() != null){
+                orderDetails.setRejectType(-1);
+                orderDetails.setRejectReason(auditStatusVO.getRejectReason());
+            }else {
+                orderDetails.setRejectType(auditStatusVO.getRejectType());
+            }
             if(!this.updateById(orderDetails)){
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                         "审核状态修改失败");
@@ -157,6 +162,7 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
             if(uo != null) {
                 BeanUtil.copyProperties(uo,bean);
             }
+            bean.setRejectTypeName(NotPassEnum.getName(bean.getRejectType()));
             if(bean.getAuditStatus() == AuditStatusEnum.Adopt.getKey()){
                 for (UserAndProdutDTO openedProducts:openedProductTime) {
                     if(bean.getUserId().intValue() == openedProducts.getUserId().intValue() && bean.getProductId().intValue() == openedProducts.getProductId().intValue()){

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

@@ -103,6 +103,7 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
             Long userId = renewalsInfosDTO.getUserId();
             userIds.add(userId);
         }
+        List<OpenedProducts> opendList = openedProductsFacade.getOpendInfos();
         RespDTO<Map<Long, UserOrgDTO>> mapRespDTO = userServiceClient.getUserAndOrg(userIds);
         if(mapRespDTO == null || !"0".equals(mapRespDTO.code) ) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
@@ -117,6 +118,11 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
 //                    bean.setProductName(productLineDTO.getName());
 //                }
 //            }
+            for (OpenedProducts openedProducts:opendList) {
+                if(openedProducts.getUserId()==bean.getUserId()&&openedProducts.getProductId()==bean.getProductId()){
+                    bean.setEndTime(openedProducts.getEndTime());
+                }
+            }
             if (null != productMap && null != productMap.get(bean.getProductId())){
                 bean.setProductName(productMap.get(bean.getProductId()).getName());
             }

diagbotman-service/src/main/java/com/diagbot/mapper/OpenedProductsMapper.java

@@ -121,4 +121,10 @@ public interface OpenedProductsMapper extends BaseMapper<OpenedProducts> {
      * @return
      */
     public List<Long> getOpendCountByUserId(Long userId);
+
+    /**
+     * 根据用户id和产品id获取用户已开通信息
+     * @return
+     */
+    public List<OpenedProducts> getOpendInfos();
 }

diagbotman-service/src/main/java/com/diagbot/service/OpenedProductsService.java

@@ -86,4 +86,10 @@ public interface OpenedProductsService extends IService<OpenedProducts> {
      * @return list
      */
     public List<Long> getOpendCountByUserId(Long userId);
+
+    /**
+     * 根据用户id和产品id获取用户已开通信息
+     * @return
+     */
+    public List<OpenedProducts> getOpendInfos();
 }

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

@@ -64,6 +64,11 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
         return baseMapper.delInformationAvailable(openedProducts);
     }
 
+    @Override
+    public List<OpenedProducts> getOpendInfos() {
+        return baseMapper.getOpendInfos();
+    }
+
     @Override
     public boolean modifyOpeningTime(OpenedProducts openedProducts) {
         // TODO Auto-generated method stub

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

@@ -241,4 +241,8 @@
     <select id="getOpendCountByUserId" resultType="java.lang.Long">
         SELECT a.product_id FROM diag_opened_products a WHERE a.is_deleted ='N' and a.user_id = #{userId}
     </select>
+    
+    <select id="getOpendInfos" resultType="com.diagbot.entity.OpenedProducts">
+        SELECT * FROM `diag_opened_products` WHERE is_deleted = "N"
+    </select>
 </mapper>