|
@@ -1334,13 +1334,12 @@ public class ReadingCuratorController extends BaseController{
|
|
|
|
|
|
int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
|
|
|
int minDay = 1;
|
|
|
-
|
|
|
+ List<VipSignDayDetailOutDto> list = libUserHistoryService.vipSignInfoList(params);
|
|
|
for (int i = minDay; i <= maxDay; i++) {
|
|
|
VipSignDetailOutDto pdto = new VipSignDetailOutDto();
|
|
|
pdto.setSignDate(month+"-"+(i<10?("0"+i):i));
|
|
|
pdto.setHasData(2);
|
|
|
List<VipSignDayDetailOutDto> cList = new ArrayList<>();
|
|
|
- List<VipSignDayDetailOutDto> list = libUserHistoryService.vipSignInfoList(params);
|
|
|
if(Collections3.isNotEmpty(list)){
|
|
|
for (VipSignDayDetailOutDto dto :list){
|
|
|
if(dto.getSignDate().equals(pdto.getSignDate())){
|
|
@@ -1617,7 +1616,7 @@ public class ReadingCuratorController extends BaseController{
|
|
|
BeanUtils.copyProperties(vip,dto);
|
|
|
TbLibSubscribe sub = subService.findByVipIdAndStat(vip.getId(),"1");
|
|
|
if(sub != null ){
|
|
|
- Integer ptCount2 = libVipServiceService.getVipIdPTServiceCount(req.getVipId(),req.getVipId());
|
|
|
+ Integer ptCount2 = libVipServiceService.getVipIdPTServiceCount(req.getVipId(),req.getLibId());
|
|
|
if(ptCount2 == 0){
|
|
|
dto.setHasService(2);
|
|
|
}else{
|
|
@@ -1625,7 +1624,7 @@ public class ReadingCuratorController extends BaseController{
|
|
|
}
|
|
|
dto.setType(2);
|
|
|
}else{
|
|
|
- Integer ptCount2 = libVipServiceService.getVipIdPTServiceCount(req.getVipId(),req.getVipId());
|
|
|
+ Integer ptCount2 = libVipServiceService.getVipIdPTServiceCount(req.getVipId(),req.getLibId());
|
|
|
if(ptCount2 == 0){
|
|
|
dto.setHasService(2);
|
|
|
}else{
|