fix

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

@@ -18,7 +18,10 @@ import com.zhongzheng.modules.order.service.IOrderPayService;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderHandleGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderHandleVo;
+import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
 import com.zhongzheng.modules.user.service.IUserService;
+import com.zhongzheng.modules.user.service.IUserStudyRecordService;
+import com.zhongzheng.modules.user.vo.SubjectStudyRecordVo;
 import com.zhongzheng.modules.user.vo.UserVo;
 import com.zhongzheng.modules.wx.service.IWxPayService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +58,9 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
     @Autowired
     private IOrderPayService iOrderPayService;
 
+    @Autowired
+    private IUserStudyRecordService iUserStudyRecordService;
+
     @Override
     public OrderHandleVo queryById(Long id){
         OrderHandle db = this.baseMapper.selectById(id);
@@ -89,7 +95,28 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
 
     @Override
     public List<OrderHandleGoodsVo> selectOrderGoodsList(OrderHandleQueryBo bo) {
-        return this.baseMapper.selectOrderGoodsList(bo);
+        List<OrderHandleGoodsVo> list = this.baseMapper.selectOrderGoodsList(bo);
+        for(OrderHandleGoodsVo vo : list){
+            Long secLong = 0L;
+            Long studyLong = 0L;
+
+            if(vo.getPayStatus()>1){
+                SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
+                subjectStudyRecordQueryBo.setGoodsId(vo.getGoodsId());
+                subjectStudyRecordQueryBo.setUserId(vo.getUserId());
+                subjectStudyRecordQueryBo.setGradeId(vo.getGradeId());
+                subjectStudyRecordQueryBo.setOrderGoodsId(vo.getOrderGoodsId());
+                List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
+                for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
+                    secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
+                    studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
+
+                }
+                vo.setSecAllNum(secLong);
+                vo.setStuAllNum(studyLong);
+            }
+        }
+        return list;
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderHandleGoodsVo.java

@@ -71,4 +71,13 @@ public class OrderHandleGoodsVo {
 	@ApiModelProperty("已做试卷")
 	private Long recordNum;
 
+	private Long orderGoodsId;
+
+	private Long goodsId;
+
+	private Long userId;
+
+	private Long gradeId;
+	private Integer payStatus;
+
 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderHandleMapper.xml

@@ -70,7 +70,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             g.goods_name,
             g.`year`,
             (SELECT GROUP_CONCAT(subject_name) from course_subject where FIND_IN_SET(id,g.subject_ids)) subject_names,
-            og.goods_real_price
+            og.goods_real_price,
+            og.order_goods_id,
+            o.user_id,
+            og.grade_id,
+            og.goods_id,
+            og.pay_status
         FROM
             `order` o
                 LEFT JOIN order_goods og ON o.order_sn = og.order_sn