fix 前培次数

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -270,18 +270,20 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             update.setBeforeId(bo.getBeforeId());
             update.setBeforeStatus(bo.getBeforeStatus());
             if (bo.getBeforeStatus() != null && bo.getBeforeStatus().equals(1)){
-                update.setBeforeExpend(1);
-                UserExamGoodsQueryBo userExamGoodsQueryBo = new UserExamGoodsQueryBo();
-                userExamGoodsQueryBo.setGoodsId(userSubscribeVo.getGoodsId());
-                userExamGoodsQueryBo.setUserId(userSubscribeVo.getUserId());
-                List<UserExamGoodsVo> userExamGoodsVos = userExamGoodsService.queryList(userExamGoodsQueryBo);
-                if (!org.springframework.util.CollectionUtils.isEmpty(userExamGoodsVos)){
-                    UserExamGoodsVo userExamGoodsVo = userExamGoodsVos.get(0);
-                    UserExamGoods userExamGoods = new UserExamGoods();
-                    userExamGoods.setUpdateTime(DateUtils.getNowTime());
-                    userExamGoods.setUserExamGoodsId(userExamGoodsVo.getUserExamGoodsId());
-                    userExamGoods.setExpendBefore(userExamGoodsVo.getExpendBefore()+1);
-                    userExamGoodsService.updateById(userExamGoods);
+                if(Validator.isEmpty(userSubscribeVo.getBeforeStatus())||userSubscribeVo.getBeforeStatus().equals(0)){
+                    update.setBeforeExpend(1);
+                    UserExamGoodsQueryBo userExamGoodsQueryBo = new UserExamGoodsQueryBo();
+                    userExamGoodsQueryBo.setGoodsId(userSubscribeVo.getGoodsId());
+                    userExamGoodsQueryBo.setUserId(userSubscribeVo.getUserId());
+                    List<UserExamGoodsVo> userExamGoodsVos = userExamGoodsService.queryList(userExamGoodsQueryBo);
+                    if (!org.springframework.util.CollectionUtils.isEmpty(userExamGoodsVos)){
+                        UserExamGoodsVo userExamGoodsVo = userExamGoodsVos.get(0);
+                        UserExamGoods userExamGoods = new UserExamGoods();
+                        userExamGoods.setUpdateTime(DateUtils.getNowTime());
+                        userExamGoods.setUserExamGoodsId(userExamGoodsVo.getUserExamGoodsId());
+                        userExamGoods.setExpendBefore(userExamGoodsVo.getExpendBefore()+1);
+                        userExamGoodsService.updateById(userExamGoods);
+                    }
                 }
             }
             else if (bo.getBeforeStatus() != null && bo.getBeforeStatus().equals(0)){
@@ -347,19 +349,23 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             update.setBeforeId(editBo.getBeforeId());
             update.setBeforeStatus(editBo.getBeforeStatus());
             if (editBo.getBeforeStatus() != null && editBo.getBeforeStatus().equals(1)){
-                update.setBeforeExpend(1);
-                UserExamGoodsQueryBo userExamGoodsQueryBo = new UserExamGoodsQueryBo();
-                userExamGoodsQueryBo.setGoodsId(userSubscribeVo.getGoodsId());
-                userExamGoodsQueryBo.setUserId(userSubscribeVo.getUserId());
-                List<UserExamGoodsVo> userExamGoodsVos = userExamGoodsService.queryList(userExamGoodsQueryBo);
-                if (!org.springframework.util.CollectionUtils.isEmpty(userExamGoodsVos)){
-                    UserExamGoodsVo userExamGoodsVo = userExamGoodsVos.get(0);
-                    UserExamGoods userExamGoods = new UserExamGoods();
-                    userExamGoods.setUpdateTime(DateUtils.getNowTime());
-                    userExamGoods.setUserExamGoodsId(userExamGoodsVo.getUserExamGoodsId());
-                    userExamGoods.setExpendBefore(userExamGoodsVo.getExpendBefore()+1);
-                    userExamGoodsService.updateById(userExamGoods);
+                if(Validator.isEmpty(userSubscribeVo.getBeforeStatus())||userSubscribeVo.getBeforeStatus().equals(0)){
+                    //之前是关闭的，现在标记则消耗次数
+                    update.setBeforeExpend(1);
+                    UserExamGoodsQueryBo userExamGoodsQueryBo = new UserExamGoodsQueryBo();
+                    userExamGoodsQueryBo.setGoodsId(userSubscribeVo.getGoodsId());
+                    userExamGoodsQueryBo.setUserId(userSubscribeVo.getUserId());
+                    List<UserExamGoodsVo> userExamGoodsVos = userExamGoodsService.queryList(userExamGoodsQueryBo);
+                    if (!org.springframework.util.CollectionUtils.isEmpty(userExamGoodsVos)){
+                        UserExamGoodsVo userExamGoodsVo = userExamGoodsVos.get(0);
+                        UserExamGoods userExamGoods = new UserExamGoods();
+                        userExamGoods.setUpdateTime(DateUtils.getNowTime());
+                        userExamGoods.setUserExamGoodsId(userExamGoodsVo.getUserExamGoodsId());
+                        userExamGoods.setExpendBefore(userExamGoodsVo.getExpendBefore()+1);
+                        userExamGoodsService.updateById(userExamGoods);
+                    }
                 }
+
             }
             else if (editBo.getBeforeStatus() != null && editBo.getBeforeStatus().equals(0)){
                 update.setBeforeExpend(0);