Browse Source

fix 成交价格

he2802 3 years ago
parent
commit
7fdbb7b7bc

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderGoodsService.java

@@ -80,9 +80,13 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
 
     List<OrderGoodsVo> listLiveGoodsList(GoodsQueryBo bo);
 
+    void listGoodsStudyList(OrderGoodsQueryBo bo);
+
     List<OrderGoodsVo> listGoodsUserLive(Long userId);
 
     List<OrderUserGoodsVo> listUserSubjectGoods(OrderSubjectUserBuyBo bo);
 
     List<OrderGoodsVo> selectBuyUserList(Long mockMajorSubjectId);
+
+
 }

+ 26 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -366,6 +366,32 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         return list;
     }
 
+    /**
+     * 获取用户订单所有商品的所有学习情况
+     * @param bo
+     */
+    @Override
+    public void listGoodsStudyList(OrderGoodsQueryBo bo) {
+        OrderGoodsQueryBo orderGoodsQueryBo = new OrderGoodsQueryBo();
+        orderGoodsQueryBo.setGoodsId(1L);
+        List<OrderGoodsVo> orderGoodsVos = baseMapper.selectOrderGoods(orderGoodsQueryBo);
+        for(OrderGoodsVo goodsVo : orderGoodsVos){
+            if(goodsVo.getGoodsType()==1){
+                List<CourseVo> courseVoList = iGoodsCourseService.selectList(goodsVo.getGoodsId());
+                for(CourseVo courseVo : courseVoList){
+                    UserStudyRecordQueryBo queryBo = new UserStudyRecordQueryBo();
+                    queryBo.setCourseId(courseVo.getCourseId());
+                    List<ClassPeriodVo> sectionList = iUserStudyRecordService.menuAllList(queryBo); //课程所有节列表
+                    for(ClassPeriodVo periodVo : sectionList){
+                        if(periodVo.getSectionType()==2||periodVo.getSectionType()==3){
+
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public List<OrderGoodsVo> listGoodsUserLive(Long userId) {
         List<OrderGoodsVo> list = this.baseMapper.listGoodsUserLive(userId);

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderInputVo.java

@@ -103,4 +103,6 @@ public class OrderInputVo {
 
 	@ApiModelProperty("商品类型 1视频2题库 3补考 4前培 5虚拟赠送题库 6直播")
 	private Integer goodsType;
+	@ApiModelProperty("商品成交价格")
+	private BigDecimal goodsRealPrice;
 }

+ 2 - 0
zhongzheng-system/src/main/resources/mapper/modules/order/OrderInputMapper.xml

@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderGoodsId" column="order_goods_id"/>
         <result property="goodsRefund" column="goods_refund"/>
         <result property="goodsType" column="goods_type"/>
+        <result property="goodsRealPrice" column="goods_real_price"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderInputQueryBo" resultMap="OrderInputVoResult">
@@ -112,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             any_value ( cb.business_name ) business_name,
             (select IFNULL(sum(og.goods_received),0) from order_goods og LEFT JOIN `order` o on o.order_sn = og.order_sn  where o.input_order_sn = oi.input_order_sn and og.refund_status = 2) goods_refund,
             IFNULL(sum( og.goods_received ),0) goods_received,
+            IFNULL(sum( og.goods_real_price ),0) goods_real_price,
             IFNULL(sum( o.order_price ),0) order_price,
             IFNULL(sum( o.pay_price ),0) pay_price,
             any_value ( oi.create_username ) create_username,