|
@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
@@ -52,6 +53,7 @@ import com.zhongzheng.modules.polyv.vo.PolyvVideoQuerVo;
|
|
|
import com.zhongzheng.modules.polyv.vo.PolyvVideoVo;
|
|
|
import com.zhongzheng.modules.user.bo.OrderPossessUserAddBo;
|
|
|
import com.zhongzheng.modules.user.bo.UserExamGoodsAddBo;
|
|
|
+import com.zhongzheng.modules.user.bo.UserExamGoodsQueryBo;
|
|
|
import com.zhongzheng.modules.user.bo.UserExamGoodsSupplementAddBo;
|
|
|
import com.zhongzheng.modules.user.domain.User;
|
|
|
import com.zhongzheng.modules.user.domain.UserExamGoods;
|
|
@@ -59,6 +61,7 @@ import com.zhongzheng.modules.user.service.IOrderPossessUserService;
|
|
|
import com.zhongzheng.modules.user.service.IUserExamGoodsService;
|
|
|
import com.zhongzheng.modules.user.service.IUserExamGoodsSupplementService;
|
|
|
import com.zhongzheng.modules.user.service.IUserService;
|
|
|
+import com.zhongzheng.modules.user.vo.UserExamGoodsVo;
|
|
|
import com.zhongzheng.modules.wx.service.IWxPayService;
|
|
|
import com.zhongzheng.modules.wx.vo.WxPayVo;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -346,8 +349,8 @@ public class WxPayServiceImpl implements IWxPayService {
|
|
|
add.setUpdateTime(DateUtils.getNowTime());
|
|
|
userExamGoodsService.save(add);
|
|
|
UserExamGoodsSupplementAddBo userExamGoodsSupplementAddBo = new UserExamGoodsSupplementAddBo();
|
|
|
- userExamGoodsSupplementAddBo.setGoodsId(add.getUserExamGoodsId());
|
|
|
- userExamGoodsSupplementAddBo.setExamNumber(g.getGoodsId());
|
|
|
+ userExamGoodsSupplementAddBo.setGoodsId(goodsVo.getGoodsId());
|
|
|
+ userExamGoodsSupplementAddBo.setUserExamGoodsId(add.getUserExamGoodsId());
|
|
|
userExamGoodsSupplementAddBo.setExamNumber(examNumber.getExamNumber());
|
|
|
userExamGoodsSupplementAddBo.setDoNumber(examNumber.getDoNumber());
|
|
|
userExamGoodsSupplementAddBo.setStatus(3);
|
|
@@ -356,11 +359,43 @@ public class WxPayServiceImpl implements IWxPayService {
|
|
|
}
|
|
|
//增加前培次数
|
|
|
if (goodsVo.getGoodsType().equals(4)){
|
|
|
-
|
|
|
+ UserExamGoodsQueryBo userExamGoodsQueryBo = new UserExamGoodsQueryBo();
|
|
|
+ userExamGoodsQueryBo.setUserId(order.getUserId());
|
|
|
+ userExamGoodsQueryBo.setGoodsId(goodsVo.getMakeGoodsId());
|
|
|
+ List<UserExamGoodsVo> userExamGoodsVos = userExamGoodsService.queryList(userExamGoodsQueryBo);
|
|
|
+ if (!CollectionUtils.isEmpty(userExamGoodsVos)){
|
|
|
+ UserExamGoodsVo userExamGoodsVo = userExamGoodsVos.get(0);
|
|
|
+ UserExamGoodsSupplementAddBo userExamGoodsSupplementAddBo = new UserExamGoodsSupplementAddBo();
|
|
|
+ userExamGoodsSupplementAddBo.setGoodsId(goodsVo.getGoodsId());
|
|
|
+ userExamGoodsSupplementAddBo.setUserExamGoodsId(userExamGoodsVo.getUserExamGoodsId());
|
|
|
+ userExamGoodsSupplementAddBo.setDoNumber(goodsVo.getStudyCount());
|
|
|
+ userExamGoodsSupplementAddBo.setStatus(2);
|
|
|
+ userExamGoodsSupplementService.insertByAddBo(userExamGoodsSupplementAddBo);
|
|
|
+ UserExamGoods userExamGoods = new UserExamGoods();
|
|
|
+ userExamGoods.setUserExamGoodsId(userExamGoodsVo.getUserExamGoodsId());
|
|
|
+ userExamGoods.setDoNumber(userExamGoodsVo.getDoNumber()+goodsVo.getStudyCount());
|
|
|
+ userExamGoodsService.updateById(userExamGoods);
|
|
|
+ }
|
|
|
}
|
|
|
//增加考试次数
|
|
|
if (goodsVo.getGoodsType().equals(3)){
|
|
|
-
|
|
|
+ UserExamGoodsQueryBo userExamGoodsQueryBo = new UserExamGoodsQueryBo();
|
|
|
+ userExamGoodsQueryBo.setUserId(order.getUserId());
|
|
|
+ userExamGoodsQueryBo.setGoodsId(goodsVo.getMakeGoodsId());
|
|
|
+ List<UserExamGoodsVo> userExamGoodsVos = userExamGoodsService.queryList(userExamGoodsQueryBo);
|
|
|
+ if (!CollectionUtils.isEmpty(userExamGoodsVos)){
|
|
|
+ UserExamGoodsVo userExamGoodsVo = userExamGoodsVos.get(0);
|
|
|
+ UserExamGoodsSupplementAddBo userExamGoodsSupplementAddBo = new UserExamGoodsSupplementAddBo();
|
|
|
+ userExamGoodsSupplementAddBo.setGoodsId(goodsVo.getGoodsId());
|
|
|
+ userExamGoodsSupplementAddBo.setUserExamGoodsId(userExamGoodsVo.getUserExamGoodsId());
|
|
|
+ userExamGoodsSupplementAddBo.setExamNumber(goodsVo.getStudyCount());
|
|
|
+ userExamGoodsSupplementAddBo.setStatus(1);
|
|
|
+ userExamGoodsSupplementService.insertByAddBo(userExamGoodsSupplementAddBo);
|
|
|
+ UserExamGoods userExamGoods = new UserExamGoods();
|
|
|
+ userExamGoods.setUserExamGoodsId(userExamGoodsVo.getUserExamGoodsId());
|
|
|
+ userExamGoods.setExamNumber(userExamGoodsVo.getExamNumber()+goodsVo.getStudyCount());
|
|
|
+ userExamGoodsService.updateById(userExamGoods);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|