Merge remote-tracking branch 'origin/dev/one' into dev/one

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

@@ -60,4 +60,9 @@ public class GetConsoleOpenedDTO implements Serializable {
      */
     private String accessTypeMsg;
     
+    /**
+     * 是否续费中，0-否  1-是
+     */
+    private Integer renewalsStutas;
+    
 }

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

@@ -65,8 +65,10 @@
 			DATE_FORMAT(a.start_time,'%Y-%m-%d') as startTime,
 			DATE_FORMAT(a.end_time,'%Y-%m-%d') as endTime,
 			a.service_status as serviceStatus,
-			b.access_type as accessType
+			b.access_type as accessType,
+			case when c.id is null then 0 else 1 end as renewalsStutas
 		from diag_opened_products a join diag_lantone_product b on a.product_id=b.id
+		left join diag_user_renewals c on a.user_id=c.user_id and a.product_id=c.product_id 
 		where a.is_deleted='N' and b.is_deleted='N' and a.user_id=#{userId};
     </select>
 

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -1045,7 +1045,7 @@ public class UserFacade extends UserServiceImpl {
             }
         }
         }
-        System.out.println("====================" + GsonUtil.toJson(userData));
+        //System.out.println("====================" + GsonUtil.toJson(userData));
         user.setRecords(userData);
         return RespDTO.onSuc(user);
   	}

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -95,7 +95,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     //审核用户信息和机构信息
     @Override
     public boolean auditUserInfoAll(Map<String, Object> auditMap) {
-        // TODO Auto-generated method stub
+        
         return baseMapper.auditUserInfoAll(auditMap);
     }
     //导出用户和机构信息
@@ -137,20 +137,20 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 	//超管修改用户信息接口
 	@Override
 	public boolean updateUserInfo(Map<String, Object> amendUserInfo) {
-		// TODO Auto-generated method stub
+		
 		return baseMapper.updateUserInfo(amendUserInfo);
 	}
 
 	//机构信息修改接口
 	@Override
 	public boolean updateOrganizations(Map<String, Object> amendOrg) {
-		// TODO Auto-generated method stub
+		
 		return baseMapper.updateOrganizations(amendOrg);
 	}
 
 	@Override
 	public List<UserInfoDTO> exportOrganizations(Map<String, Object> map) {
-		// TODO Auto-generated method stub
+		
 		return baseMapper.exportOrganizations(map);
 	}