Browse Source

fix 前培退款

he2802 3 năm trước cách đây
mục cha
commit
597d2abfc0

+ 11 - 0
zhongzheng-api/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -146,4 +146,15 @@ public class OrderController extends BaseController {
         List<CourseEducationTypeVo> list = iCourseEducationTypeService.selectUserEduList(loginUser.getUser().getUserId(),bo.getGoodsType());
         return getDataTable(list);
     }
+
+    /**
+     * 获取订单商品详细信息
+     */
+    @ApiOperation("获取订单商品详细信息")
+    @PreAuthorize("@ss.hasPermi('system:goods:query')")
+    @GetMapping("/info")
+    public AjaxResult<OrderGoodsVo> getInfo(OrderGoodsQueryBo bo) {
+        return AjaxResult.success(iOrderGoodsService.selectDetail(bo));
+    }
+
 }

+ 8 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -150,4 +150,12 @@ public class OrderGoodsVo {
 	private Integer orderGoodsStatus;
 	@ApiModelProperty("用户名称")
 	private String realname;
+	/** 班级有效期开始时间 */
+	@Excel(name = "班级有效期开始时间")
+	@ApiModelProperty("班级有效期开始时间")
+	private Long classStartTime;
+	/** 班级有效期结束时间 */
+	@Excel(name = "班级有效期结束时间")
+	@ApiModelProperty("班级有效期结束时间")
+	private Long classEndTime;
 }

+ 5 - 1
zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -69,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="serviceStartTime" column="service_start_time"/>
         <result property="serviceEndTime" column="service_end_time"/>
         <result property="orderStatus" column="order_status"/>
+        <result property="classStartTime" column="class_start_time"/>
+        <result property="classEndTime" column="class_end_time"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">
@@ -130,7 +132,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cpt.project_name,
         cb.business_name,
         cg.class_name,
-        o.create_username as create_by
+        o.create_username as create_by,
+        cg.class_start_time,
+        cg.class_end_time
         FROM
         order_goods og
         LEFT JOIN class_grade cg on og.grade_id = cg.grade_id