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-12 15:39:14 +08:00
parent 378785af8a
commit 63a2e00f30
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/peanut/modules/common/controller/UserVipController.java
View File

@@ -99,6 +99,7 @@ public class UserVipController {
if(buyOrder.getJfDeduction()!=null&&buyOrder.getJfDeduction().compareTo(BigDecimal.ZERO) > 0){ if(buyOrder.getJfDeduction()!=null&&buyOrder.getJfDeduction().compareTo(BigDecimal.ZERO) > 0){
recordJfTransaction(buyOrder, user, buyOrder.getJfDeduction()); recordJfTransaction(buyOrder, user, buyOrder.getJfDeduction());
} }
//开通用户vip，并且对已开通的课程做延期
openVipForUser(buyOrder); openVipForUser(buyOrder);
} else { } else {
return R.error(500, "余额不足！"); return R.error(500, "余额不足！");
@@ -138,8 +139,9 @@ public class UserVipController {
private void openVipForUser(BuyOrder buyOrder) throws Exception { private void openVipForUser(BuyOrder buyOrder) throws Exception {
VipBuyConfigEntity vipBuyConfigEntity = vipBuyConfigDao.selectById(buyOrder.getVipBuyConfigId()); VipBuyConfigEntity vipBuyConfigEntity = vipBuyConfigDao.selectById(buyOrder.getVipBuyConfigId());
MyUserEntity userEntity = myUserDao.selectById(buyOrder.getUserId()); MyUserEntity userEntity = myUserDao.selectById(buyOrder.getUserId());
String u_v_type = userEntity.getVip();
if(vipBuyConfigEntity.getType()==1){//超v if(vipBuyConfigEntity.getType()==1){//超v
if(userEntity.getVip().equals("0")){//初次办理 if(u_v_type.equals("0")){//初次办理
UserVip userVip = new UserVip(); UserVip userVip = new UserVip();
userVip.setUserId(userEntity.getId()); userVip.setUserId(userEntity.getId());
userVip.setType(1); userVip.setType(1);
@@ -151,8 +153,7 @@ public class UserVipController {
userVipDao.insert(userVip); userVipDao.insert(userVip);
userEntity.setVip("1"); userEntity.setVip("1");
myUserDao.updateById(userEntity); myUserDao.updateById(userEntity);
} }else if(u_v_type.equals("1")){//vip延期
if(userEntity.getVip().equals("1")){//vip延期
List<UserVip> userVips = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, userEntity.getId()).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0)); List<UserVip> userVips = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, userEntity.getId()).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0));
if(userVips.size()!=1){ if(userVips.size()!=1){
throwExceptionMethod(); throwExceptionMethod();
@@ -164,8 +165,7 @@ public class UserVipController {
calendar.add(Calendar.YEAR,vipBuyConfigEntity.getYear()); calendar.add(Calendar.YEAR,vipBuyConfigEntity.getYear());
userVip.setEndTime(calendar.getTime()); userVip.setEndTime(calendar.getTime());
userVipDao.updateById(userVip); userVipDao.updateById(userVip);
} }else if (u_v_type.equals("2")||u_v_type.equals("3")){//医学vip或国学vip升级
if (userEntity.getVip().equals("2")||userEntity.getVip().equals("3")){//医学vip或国学vip升级
List<UserVip> userVips = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, userEntity.getId()).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0)); List<UserVip> userVips = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, userEntity.getId()).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0));
if(userVips.size()!=1){ if(userVips.size()!=1){
throwExceptionMethod(); throwExceptionMethod();

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

@@ -324,8 +324,9 @@ public class AliPayServiceImpl implements AliPayService {
private void openVipForUser(BuyOrder buyOrder) throws Exception { private void openVipForUser(BuyOrder buyOrder) throws Exception {
VipBuyConfigEntity vipBuyConfigEntity = vipBuyConfigDao.selectById(buyOrder.getVipBuyConfigId()); VipBuyConfigEntity vipBuyConfigEntity = vipBuyConfigDao.selectById(buyOrder.getVipBuyConfigId());
MyUserEntity userEntity = myUserDao.selectById(buyOrder.getUserId()); MyUserEntity userEntity = myUserDao.selectById(buyOrder.getUserId());
String u_v_type = userEntity.getVip();
if(vipBuyConfigEntity.getType()==1){//超v if(vipBuyConfigEntity.getType()==1){//超v
if(userEntity.getVip().equals("0")){//初次办理 if(u_v_type.equals("0")){//初次办理
UserVip userVip = new UserVip(); UserVip userVip = new UserVip();
userVip.setUserId(userEntity.getId()); userVip.setUserId(userEntity.getId());
userVip.setType(1); userVip.setType(1);
@@ -337,8 +338,7 @@ public class AliPayServiceImpl implements AliPayService {
userVipDao.insert(userVip); userVipDao.insert(userVip);
userEntity.setVip("1"); userEntity.setVip("1");
myUserDao.updateById(userEntity); myUserDao.updateById(userEntity);
} } else if(u_v_type.equals("1")){//vip延期
if(userEntity.getVip().equals("1")){//vip延期
List<UserVip> userVips = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, userEntity.getId()).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0)); List<UserVip> userVips = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, userEntity.getId()).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0));
if(userVips.size()!=1){ if(userVips.size()!=1){
throwExceptionMethod(); throwExceptionMethod();
@@ -350,8 +350,7 @@ public class AliPayServiceImpl implements AliPayService {
calendar.add(Calendar.YEAR,vipBuyConfigEntity.getYear()); calendar.add(Calendar.YEAR,vipBuyConfigEntity.getYear());
userVip.setEndTime(calendar.getTime()); userVip.setEndTime(calendar.getTime());
userVipDao.updateById(userVip); userVipDao.updateById(userVip);
} }else if (u_v_type.equals("2")||u_v_type.equals("3")){//医学vip或国学vip升级
if (userEntity.getVip().equals("2")||userEntity.getVip().equals("3")){//医学vip或国学vip升级
List<UserVip> userVips = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, userEntity.getId()).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0)); List<UserVip> userVips = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, userEntity.getId()).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0));
if(userVips.size()!=1){ if(userVips.size()!=1){
throwExceptionMethod(); throwExceptionMethod();
@@ -371,7 +370,6 @@ public class AliPayServiceImpl implements AliPayService {
userVipDao.insert(userVip); userVipDao.insert(userVip);
userEntity.setVip("1"); userEntity.setVip("1");
myUserDao.updateById(userEntity); myUserDao.updateById(userEntity);
} }
} }
if(vipBuyConfigEntity.getType()==2||vipBuyConfigEntity.getType()==3){//医学vip或国学vip if(vipBuyConfigEntity.getType()==2||vipBuyConfigEntity.getType()==3){//医学vip或国学vip

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

@@ -285,8 +285,9 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
private void openVipForUser(BuyOrder buyOrder) throws Exception { private void openVipForUser(BuyOrder buyOrder) throws Exception {
VipBuyConfigEntity vipBuyConfigEntity = vipBuyConfigDao.selectById(buyOrder.getVipBuyConfigId()); VipBuyConfigEntity vipBuyConfigEntity = vipBuyConfigDao.selectById(buyOrder.getVipBuyConfigId());
MyUserEntity userEntity = myUserDao.selectById(buyOrder.getUserId()); MyUserEntity userEntity = myUserDao.selectById(buyOrder.getUserId());
String u_v_type = userEntity.getVip();
if(vipBuyConfigEntity.getType()==1){//超v if(vipBuyConfigEntity.getType()==1){//超v
if(userEntity.getVip().equals("0")){//初次办理 if(u_v_type.equals("0")){//初次办理
UserVip userVip = new UserVip(); UserVip userVip = new UserVip();
userVip.setUserId(userEntity.getId()); userVip.setUserId(userEntity.getId());
userVip.setType(1); userVip.setType(1);
@@ -298,8 +299,7 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
userVipDao.insert(userVip); userVipDao.insert(userVip);
userEntity.setVip("1"); userEntity.setVip("1");
myUserDao.updateById(userEntity); myUserDao.updateById(userEntity);
} }else if(u_v_type.equals("1")){//vip延期
if(userEntity.getVip().equals("1")){//vip延期
List<UserVip> userVips = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, userEntity.getId()).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0)); List<UserVip> userVips = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, userEntity.getId()).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0));
if(userVips.size()!=1){ if(userVips.size()!=1){
throwExceptionMethod(); throwExceptionMethod();
@@ -311,8 +311,7 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
calendar.add(Calendar.YEAR,vipBuyConfigEntity.getYear()); calendar.add(Calendar.YEAR,vipBuyConfigEntity.getYear());
userVip.setEndTime(calendar.getTime()); userVip.setEndTime(calendar.getTime());
userVipDao.updateById(userVip); userVipDao.updateById(userVip);
} }else if (u_v_type.equals("2")||u_v_type.equals("3")){//医学vip或国学vip升级
if (userEntity.getVip().equals("2")||userEntity.getVip().equals("3")){//医学vip或国学vip升级
List<UserVip> userVips = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, userEntity.getId()).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0)); List<UserVip> userVips = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, userEntity.getId()).gt(UserVip::getEndTime, new Date()).eq(UserVip::getState, 0));
if(userVips.size()!=1){ if(userVips.size()!=1){
throwExceptionMethod(); throwExceptionMethod();

2
src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
View File

@@ -139,7 +139,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
@Override @Override
public List getCoursePrice() { public List getCoursePrice() {
//获取所有国学标签 //获取所有国学标签
List<CourseSociologyEntity> courseSociologyEntities = courseSociologyDao.selectList(null); List<CourseSociologyEntity> courseSociologyEntities = courseSociologyDao.selectList(new LambdaQueryWrapper<CourseSociologyEntity>().orderByAsc(CourseSociologyEntity::getSort));
ArrayList<Map> flag = new ArrayList<>(); ArrayList<Map> flag = new ArrayList<>();
for (CourseSociologyEntity c : courseSociologyEntities){ for (CourseSociologyEntity c : courseSociologyEntities){
HashMap<String, Object> stringObjectHashMap = new HashMap<>(); HashMap<String, Object> stringObjectHashMap = new HashMap<>();