fix 补考

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderBillSheetServiceImpl.java

@@ -215,7 +215,7 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
             iOrderService.updateById(order);
             goods.setUpdateTime(DateUtils.getNowTime());
             iOrderGoodsService.updateById(goods);
-            updateUserExamGoods(goods,order);
+            iWxPayService.updateUserExamGoods(goods,order);
         }
         iOrderBillGoodsService.saveBatch(coll);
         this.save(add);
@@ -224,73 +224,7 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
         result.put("sheetSn",sheet_no);
         return result;
     }
-    private void updateUserExamGoods(OrderGoods g,Order order) {
-        GoodsVo goodsVo = iGoodsService.queryById(g.getGoodsId());
-        //添加商品考试次数和补考次数
-        if (goodsVo.getGoodsType().equals(1)){
-            if (userExamGoodsService.queryExamGoods(goodsVo.getGoodsId(),order.getUserId()) < 1){
-                ExamNumber examNumber = userExamGoodsService.queryExam(goodsVo.getGoodsId());
-                if (examNumber != null) {
-                    UserExamGoods add = new UserExamGoods();
-                    add.setGoodsId(g.getGoodsId());
-                    add.setUserId(order.getUserId());
-                    add.setExamNumber(examNumber.getExamNumber());
-                    add.setDoNumber(examNumber.getDoNumber());
-                    add.setCreateTime(DateUtils.getNowTime());
-                    add.setUpdateTime(DateUtils.getNowTime());
-                    add.setOrderGoodsId(g.getOrderGoodsId());
-                    userExamGoodsService.save(add);
-                    UserExamGoodsSupplementAddBo userExamGoodsSupplementAddBo = new UserExamGoodsSupplementAddBo();
-                    userExamGoodsSupplementAddBo.setGoodsId(goodsVo.getGoodsId());
-                    userExamGoodsSupplementAddBo.setUserExamGoodsId(add.getUserExamGoodsId());
-                    userExamGoodsSupplementAddBo.setExamNumber(examNumber.getExamNumber());
-                    userExamGoodsSupplementAddBo.setDoNumber(examNumber.getDoNumber());
-                    userExamGoodsSupplementAddBo.setStatus(3);
-                    userExamGoodsSupplementService.insertByAddBo(userExamGoodsSupplementAddBo);
-                }
-            }
-        }
-        //增加前培次数
-        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);
-            }
-        }
-    }
+  
 
     /**
      * 修改订单商品支付状态为完全支付

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -282,7 +282,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
         this.save(add);
         Map<String, Object> result = new HashMap<>();
-        result.put("oderId",add.getOrderId());
+        result.put("orderId",add.getOrderId());
         result.put("orderSn",out_trade_no);
         return result;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/IWxPayService.java

@@ -1,6 +1,8 @@
 package com.zhongzheng.modules.wx.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.order.domain.Order;
+import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.polyv.bo.PolyvVideoAddBo;
 import com.zhongzheng.modules.polyv.bo.PolyvVideoEditBo;
 import com.zhongzheng.modules.polyv.bo.PolyvVideoQueryBo;
@@ -33,6 +35,8 @@ public interface IWxPayService {
 
 	boolean joinLockGrade(String orderSn,Long goodsId,Long orderGoodsId);
 
+	void updateUserExamGoods(OrderGoods g, Order order);
+
 	Map<String, String> refund(String out_refund_no,String transaction_id,  BigDecimal refund_fee, BigDecimal total_fee);
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -345,7 +345,8 @@ public class WxPayServiceImpl  implements IWxPayService {
         return true;
     }
 
-    private void updateUserExamGoods(OrderGoods g,Order order) {
+    @Override
+    public void updateUserExamGoods(OrderGoods g,Order order) {
         GoodsVo goodsVo = iGoodsService.queryById(g.getGoodsId());
         //添加商品考试次数和补考次数
         if (goodsVo.getGoodsType().equals(1L)){

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -155,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userId != null and userId !=''">
             and u.user_id = #{userId}
         </if>
+        ORDER BY u.create_time desc
     </select>