1.添加机构专辑到期时间

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/StudentController.java

@@ -9,11 +9,13 @@ import com.yonge.cooleshow.biz.dal.dto.search.VipRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.entity.TenantActivationCode;
 import com.yonge.cooleshow.biz.dal.entity.TenantGroup;
+import com.yonge.cooleshow.biz.dal.entity.UserTenantAlbumRecord;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.service.MemberPriceSettingsService;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
 import com.yonge.cooleshow.biz.dal.service.TenantActivationCodeService;
 import com.yonge.cooleshow.biz.dal.service.TenantGroupService;
+import com.yonge.cooleshow.biz.dal.service.UserTenantAlbumRecordService;
 import com.yonge.cooleshow.biz.dal.service.VipCardRecordService;
 import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.biz.dal.vo.VipRecordVo;
@@ -79,6 +81,10 @@ public class StudentController extends BaseController {
     @Autowired
     private TenantActivationCodeService tenantActivationCodeService;
 
+    @Autowired
+    private UserTenantAlbumRecordService userTenantAlbumRecordService;
+
+
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入id")
     @ApiImplicitParams({
@@ -87,9 +93,18 @@ public class StudentController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('student/detail')")
     public HttpResponseResult<StudentVo> detail(@PathVariable("id") Long id) {
         StudentVo detail = studentService.detail(id);
-        if (detail != null && detail.getTenantGroupId() != null) {
-            TenantGroup group = tenantGroupService.getById(detail.getTenantGroupId());
-            detail.setTenantGroupName(group == null ? "" : group.getName());
+        if (detail != null) {
+            UserTenantAlbumRecord one = userTenantAlbumRecordService.lambdaQuery()
+                    .eq(UserTenantAlbumRecord::getUserId, id)
+                    .orderByDesc(UserTenantAlbumRecord::getEndTime)
+                    .last("limit 1").one();
+            if (one != null) {
+                detail.setTenantAlbumEndTime(one.getEndTime());
+            }
+            if (detail.getTenantGroupId() != null) {
+                TenantGroup group = tenantGroupService.getById(detail.getTenantGroupId());
+                detail.setTenantGroupName(group == null ? "" : group.getName());
+            }
         }
         return succeed(detail);
     }

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantStaffController.java

@@ -35,7 +35,7 @@ import javax.annotation.Resource;
 @Slf4j
 @Validated
 @RestController
-@RequestMapping("/tenantStaff")
+@RequestMapping("${app-config.url.admin:}/tenantStaff")
 @Api(tags = "机构员工表")
 public class TenantStaffController extends BaseController {
 

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/UserTenantAlbumRecordController.java

@@ -44,7 +44,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @Validated
 @RestController
-@RequestMapping("/userTenantAlbumRecord")
+@RequestMapping("${app-config.url.admin:}/userTenantAlbumRecord")
 @Api(tags = "购买训练工具记录")
 public class UserTenantAlbumRecordController extends BaseController {
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentVo.java

@@ -76,6 +76,9 @@ public class StudentVo extends Student {
     @ApiModelProperty(value = "小组")
     private String tenantGroupName;
 
+    @ApiModelProperty(value = "机构专辑到期时间")
+    private Date tenantAlbumEndTime;
+
 
     private String imUserId;