|
|
|
@ -6,7 +6,7 @@ import cn.hutool.core.date.DateUtil;
|
|
|
|
|
import com.baiye.modules.system.domain.PayCombo;
|
|
|
|
|
import com.baiye.modules.system.domain.PayComboUser;
|
|
|
|
|
import com.baiye.modules.system.repository.PayComboRepository;
|
|
|
|
|
import com.baiye.modules.system.repository.PayTemplateUserRepository;
|
|
|
|
|
import com.baiye.modules.system.repository.PayComboUserRepository;
|
|
|
|
|
import com.baiye.modules.system.repository.UserRepository;
|
|
|
|
|
import com.baiye.modules.system.service.PayTemplateUserService;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
@ -27,7 +27,7 @@ import java.util.List;
|
|
|
|
|
public class PayTemplateUserServiceImpl implements PayTemplateUserService {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private final PayTemplateUserRepository payTemplateUserRepository;
|
|
|
|
|
private final PayComboUserRepository payComboUserRepository;
|
|
|
|
|
private final PayComboRepository payComboRepository;
|
|
|
|
|
|
|
|
|
|
private final UserRepository userRepository;
|
|
|
|
@ -38,7 +38,7 @@ public class PayTemplateUserServiceImpl implements PayTemplateUserService {
|
|
|
|
|
Long userId = payComboUser.getUserId();
|
|
|
|
|
Long payTemplateId = payComboUser.getPayComboId();
|
|
|
|
|
if (userId != null && payTemplateId != null) {
|
|
|
|
|
List<PayComboUser> userList = payTemplateUserRepository.findByUserId(userId);
|
|
|
|
|
List<PayComboUser> userList = payComboUserRepository.findByUserId(userId);
|
|
|
|
|
PayCombo payCombo = payComboRepository.findById(payTemplateId).orElseGet(PayCombo::new);
|
|
|
|
|
//当前时间
|
|
|
|
|
Date createTime = DateUtil.date();
|
|
|
|
@ -58,7 +58,7 @@ public class PayTemplateUserServiceImpl implements PayTemplateUserService {
|
|
|
|
|
payComboUserOne.setEndTime(newDate);
|
|
|
|
|
}
|
|
|
|
|
userRepository.updateExpirationTimeById(newDate,userId);
|
|
|
|
|
return payTemplateUserRepository.save(payComboUserOne).getId() != null;
|
|
|
|
|
return payComboUserRepository.save(payComboUserOne).getId() != null;
|
|
|
|
|
} else {
|
|
|
|
|
PayComboUser addPayComboUser = new PayComboUser();
|
|
|
|
|
addPayComboUser.setPayComboId(payTemplateId);
|
|
|
|
@ -66,7 +66,7 @@ public class PayTemplateUserServiceImpl implements PayTemplateUserService {
|
|
|
|
|
addPayComboUser.setBeginTime(createTime);
|
|
|
|
|
addPayComboUser.setEndTime(newDate);
|
|
|
|
|
userRepository.updateExpirationTimeById(newDate, userId);
|
|
|
|
|
return payTemplateUserRepository.save(addPayComboUser).getId() != null;
|
|
|
|
|
return payComboUserRepository.save(addPayComboUser).getId() != null;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return Boolean.FALSE;
|
|
|
|
@ -74,6 +74,6 @@ public class PayTemplateUserServiceImpl implements PayTemplateUserService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public PayComboUser queryUserByUserId(Long id) {
|
|
|
|
|
return payTemplateUserRepository.findTemplateByUserId(id);
|
|
|
|
|
return payComboUserRepository.findTemplateByUserId(id);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|