续费返回相关修改

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

@@ -162,7 +162,9 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
             if(uo != null) {
                 BeanUtil.copyProperties(uo,bean);
             }
-            bean.setRejectTypeName(NotPassEnum.getName(bean.getRejectType()));
+            if(bean.getRejectType().intValue() != 0){
+                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

@@ -119,7 +119,7 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
 //                }
 //            }
             for (OpenedProducts openedProducts:opendList) {
-                if(openedProducts.getUserId()==bean.getUserId()&&openedProducts.getProductId()==bean.getProductId()){
+                if(openedProducts.getUserId().longValue() == bean.getUserId().longValue()&&openedProducts.getProductId().longValue() == bean.getProductId().longValue()){
                     bean.setEndTime(openedProducts.getEndTime());
                 }
             }