zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
wangjinlei
2024-06-24 15:06:35 +08:00
parent 7e6274b9da
commit d080631a7c
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
View File

@@ -979,15 +979,17 @@ public class BuyOrderController {
LambdaQueryWrapper<UserCourseBuyEntity> wrapper2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UserCourseBuyEntity> wrapper2 = new LambdaQueryWrapper<>();
wrapper2.eq(UserCourseBuyEntity::getUserId,orderEntity.getUserId()); wrapper2.eq(UserCourseBuyEntity::getUserId,orderEntity.getUserId());
wrapper2.eq(UserCourseBuyEntity::getCatalogueId,s.getCatalogueId()); wrapper2.eq(UserCourseBuyEntity::getCatalogueId,s.getCatalogueId());
wrapper2.gt(UserCourseBuyEntity::getEndTime,new Date()); wrapper2.and(r->r.isNull(UserCourseBuyEntity::getEndTime).or().gt(UserCourseBuyEntity::getEndTime,new Date()));
List<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2); List<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2);
if(userCourseBuyEntities.size()>0){//延长有效期 if(userCourseBuyEntities.size()>0){//延长有效期
UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0); UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0);
userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays());
if(userCourseBuyEntity.getEndTime()==null){
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(userCourseBuyEntity.getEndTime()); calendar.setTime(userCourseBuyEntity.getEndTime());
calendar.add(Calendar.DAY_OF_MONTH,s.getDays()); calendar.add(Calendar.DAY_OF_MONTH,s.getDays());
userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays());
userCourseBuyEntity.setEndTime(calendar.getTime()); userCourseBuyEntity.setEndTime(calendar.getTime());
}
userCourseBuyDao.updateById(userCourseBuyEntity); userCourseBuyDao.updateById(userCourseBuyEntity);
}else{ }else{
UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity(); UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity();

6
src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
View File

@@ -252,15 +252,17 @@ public class AliPayServiceImpl implements AliPayService {
LambdaQueryWrapper<UserCourseBuyEntity> wrapper2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UserCourseBuyEntity> wrapper2 = new LambdaQueryWrapper<>();
wrapper2.eq(UserCourseBuyEntity::getUserId,orderEntity.getUserId()); wrapper2.eq(UserCourseBuyEntity::getUserId,orderEntity.getUserId());
wrapper2.eq(UserCourseBuyEntity::getCatalogueId,s.getCatalogueId()); wrapper2.eq(UserCourseBuyEntity::getCatalogueId,s.getCatalogueId());
wrapper2.gt(UserCourseBuyEntity::getEndTime,new Date()); wrapper2.and(r->r.isNull(UserCourseBuyEntity::getEndTime).or().gt(UserCourseBuyEntity::getEndTime,new Date()));
List<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2); List<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2);
if(userCourseBuyEntities.size()>0){ if(userCourseBuyEntities.size()>0){
UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0); UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0);
userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays());
if(userCourseBuyEntity.getEndTime()==null){
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(userCourseBuyEntity.getEndTime()); calendar.setTime(userCourseBuyEntity.getEndTime());
calendar.add(Calendar.DAY_OF_MONTH,s.getDays()); calendar.add(Calendar.DAY_OF_MONTH,s.getDays());
userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays());
userCourseBuyEntity.setEndTime(calendar.getTime()); userCourseBuyEntity.setEndTime(calendar.getTime());
}
userCourseBuyDao.updateById(userCourseBuyEntity); userCourseBuyDao.updateById(userCourseBuyEntity);
}else{ }else{
UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity(); UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity();

6
src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
View File

@@ -195,15 +195,17 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
LambdaQueryWrapper<UserCourseBuyEntity> wrapper2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UserCourseBuyEntity> wrapper2 = new LambdaQueryWrapper<>();
wrapper2.eq(UserCourseBuyEntity::getUserId,order.getUserId()); wrapper2.eq(UserCourseBuyEntity::getUserId,order.getUserId());
wrapper2.eq(UserCourseBuyEntity::getCatalogueId,s.getCatalogueId()); wrapper2.eq(UserCourseBuyEntity::getCatalogueId,s.getCatalogueId());
wrapper2.lt(UserCourseBuyEntity::getEndTime,new Date()); wrapper2.and(r->r.isNull(UserCourseBuyEntity::getEndTime).or().gt(UserCourseBuyEntity::getEndTime,new Date()));
List<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2); List<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(wrapper2);
if(userCourseBuyEntities.size()>0){ if(userCourseBuyEntities.size()>0){
UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0); UserCourseBuyEntity userCourseBuyEntity = userCourseBuyEntities.get(0);
userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays());
if(userCourseBuyEntity.getEndTime()==null){
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(userCourseBuyEntity.getEndTime()); calendar.setTime(userCourseBuyEntity.getEndTime());
calendar.add(Calendar.DAY_OF_MONTH,s.getDays()); calendar.add(Calendar.DAY_OF_MONTH,s.getDays());
userCourseBuyEntity.setDays(userCourseBuyEntity.getDays()+s.getDays());
userCourseBuyEntity.setEndTime(calendar.getTime()); userCourseBuyEntity.setEndTime(calendar.getTime());
}
userCourseBuyDao.updateById(userCourseBuyEntity); userCourseBuyDao.updateById(userCourseBuyEntity);
}else{ }else{
UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity(); UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity();