fix 订单复购

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderGoodsController.java

@@ -76,6 +76,16 @@ public class OrderGoodsController extends BaseController {
         return AjaxResult.success(iOrderGoodsService.selectDetail(bo));
     }
 
+    /**
+     * 获取订单商品详细信息
+     */
+    @ApiOperation("获取订单商品重复购买详细信息")
+    @PreAuthorize("@ss.hasPermi('system:goods:query')")
+    @GetMapping("/rebuyInfo")
+    public AjaxResult<OrderGoodsVo> rebuyInfo(OrderGoodsQueryBo bo) {
+        return AjaxResult.success(iOrderGoodsService.selectDetail(bo));
+    }
+
     /**
      * 新增订单商品
      */
@@ -98,6 +108,8 @@ public class OrderGoodsController extends BaseController {
         return toAjax(iOrderGoodsService.updateByEditBo(bo) ? 1 : 0);
     }
 
+
+
     /**
      * 删除订单商品
      */

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsQueryBo.java

@@ -45,6 +45,9 @@ public class OrderGoodsQueryBo extends BaseEntity {
 	@ApiModelProperty("商品id")
 	private Long goodsId;
 	/** 商品id */
+	@ApiModelProperty("订单商品id")
+	private Long orderGoodsId;
+	/** 商品id */
 	@ApiModelProperty("订单商品id数组")
 	private List<Long> orderGoodsIds;
 	/** 商品采集数据 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderGoodsMapper.java

@@ -28,4 +28,5 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     Long getBuyGoodsReadyPay(OrderGoodsQueryBo bo);
 
     List<OrderGoodsVo> sendGoods();
+    OrderGoodsVo rebuyInfo(OrderGoodsQueryBo bo);
 }

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

@@ -32,6 +32,8 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
 	 * 查询列表
 	 */
 	List<OrderGoodsVo> queryList(OrderGoodsQueryBo bo);
+	OrderGoodsVo rebuyInfo(OrderGoodsQueryBo bo);
+
 
 	/**
 	 * 根据新增业务对象插入订单商品

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

@@ -96,6 +96,11 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public OrderGoodsVo rebuyInfo(OrderGoodsQueryBo bo) {
+        return this.baseMapper.rebuyInfo(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

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

@@ -489,7 +489,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         payStatusList.add(2);
         payStatusList.add(3);
         orderGoodsQueryBo.setPayStatusList(payStatusList);
-        List<OrderGoodsVo> list1 = iOrderGoodsService.queryList(orderGoodsQueryBo);
+        List<OrderGoodsVo> list1 = iOrderGoodsService.selectList(orderGoodsQueryBo);
         if(list1!=null&&list1.size()>0){
             return true;
         }

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

@@ -128,4 +128,6 @@ public class OrderGoodsVo {
 	@Excel(name = "0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
 	@ApiModelProperty("0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
 	private Integer rebuy;
+	@ApiModelProperty("班级名称")
+	private String gradeName;
 }

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

@@ -163,4 +163,8 @@ public class OrderListVo {
 
 	@ApiModelProperty("商品编号")
 	private String code;
+	/** 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级 */
+	@Excel(name = "0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
+	@ApiModelProperty("0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
+	private Integer rebuy;
 }

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

@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsType" column="goods_type"/>
         <result property="gradeId" column="grade_id"/>
         <result property="coverUrl" column="cover_url"/>
+        <result property="gradeName" column="class_name"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">
@@ -193,4 +194,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND o.order_status = 0
 
     </select>
+
+    <select id="rebuyInfo" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">
+        SELECT
+            og.order_sn,
+            g.goods_name,
+            cg.class_name
+        FROM
+            order_goods og
+                LEFT JOIN goods g ON og.goods_id = g.goods_id
+                LEFT JOIN class_grade cg ON og.grade_id = cg.grade_id
+        WHERE
+            og.order_goods_id = #{orderGoodsId}
+
+    </select>
 </mapper>

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

@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="year" column="year"/>
         <result property="coverUrl" column="cover_url"/>
         <result property="code" column="code"/>
+        <result property="rebuy" column="rebuy"/>
 
         <result property="educationName" column="education_name"/>
         <result property="projectName" column="project_name"/>
@@ -80,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             g.cover_url,
             g.code,
             og.goods_price,
+            og.rebuy,
             og.order_goods_id,
             og.goods_real_price,
             og.status as order_goods_status,