fix 合并

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

@@ -71,9 +71,9 @@ public class OrderGoodsAddBo {
     /** 备注 */
     @ApiModelProperty("备注")
     private String remark;
-    /** 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级 */
-    @ApiModelProperty("0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
-    private Integer rebuy;
+    /** 复购老订单商品ID */
+    @ApiModelProperty("复购老订单商品ID")
+    private Long rebuyOrderGoodsId;
     /** 学习次数 */
     @ApiModelProperty("学习次数")
     private Long studyCount;

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

@@ -91,9 +91,9 @@ public class OrderGoodsEditBo {
     @ApiModelProperty("班级id")
     private Long gradeId;
 
-    /** 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级 */
-    @ApiModelProperty("0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
-    private Integer rebuy;
+    /** 复购老订单商品ID */
+    @ApiModelProperty("复购老订单商品ID")
+    private Long rebuyOrderGoodsId;
 
     /** 学习次数 */
     @ApiModelProperty("学习次数")

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

@@ -96,5 +96,8 @@ public class OrderGoodsQueryBo extends BaseEntity {
 	private Long userId;
 	@ApiModelProperty("班级ID")
 	private Long gradeId;
+	/** 复购老订单商品ID */
+	@ApiModelProperty("复购老订单商品ID")
+	private Integer rebuyOrderGoodsId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderGoods.java

@@ -73,8 +73,8 @@ private static final long serialVersionUID=1L;
     private String remark;
     /** 班级id */
     private Long gradeId;
-    /** 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级 */
-    private Integer rebuy;
+    /** 复购老订单商品ID */
+    private Long rebuyOrderGoodsId;
     /** 学习次数 */
     private Long studyCount;
 }

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

@@ -258,9 +258,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 canRepeatBuy =this.canBuyRepeatGoods(g.getGoodsId(),bo.getUserId());
                 if(g.getGoodsInputData()!=null){
                     gradeId = g.getGoodsInputData().getGradeId();
-                    if(getHaveBuyGoods(g.getGoodsId(),bo.getUserId())){
+                    //判断是否有购买过
+                    Long oldOrderGoodsId = getHaveBuyGoods(g.getGoodsId(),bo.getUserId());
+                    if(Validator.isNotEmpty(oldOrderGoodsId)){
                         //有指定选班模板且视频商品班级已过期,记录复购状态
-                        orderGoods.setRebuy(1);
+                        orderGoods.setRebuyOrderGoodsId(oldOrderGoodsId);
                     }
                 }
                 String requestId = IdUtil.simpleUUID();
@@ -357,9 +359,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 canRepeatBuy =this.canBuyRepeatGoods(g.getGoodsId(),bo.getUserId());
                 if(g.getGoodsInputData()!=null){
                     gradeId = g.getGoodsInputData().getGradeId();
-                    if(getHaveBuyGoods(g.getGoodsId(),bo.getUserId())){
+                    //判断是否有购买过
+                    Long oldOrderGoodsId = getHaveBuyGoods(g.getGoodsId(),bo.getUserId());
+                    if(Validator.isNotEmpty(oldOrderGoodsId)){
                         //有指定选班模板且视频商品班级已过期,记录复购状态
-                        orderGoods.setRebuy(1);
+                        orderGoods.setRebuyOrderGoodsId(oldOrderGoodsId);
                     }
                 }
                 String requestId = IdUtil.simpleUUID();
@@ -501,7 +505,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     //判断视频商品是否购买过
-    public boolean getHaveBuyGoods(Long goodsId,Long userId){
+    public Long getHaveBuyGoods(Long goodsId,Long userId){
         OrderGoodsQueryBo orderGoodsQueryBo = new OrderGoodsQueryBo();
         orderGoodsQueryBo.setUserId(userId);
         orderGoodsQueryBo.setGoodsId(goodsId);
@@ -511,9 +515,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         orderGoodsQueryBo.setPayStatusList(payStatusList);
         List<OrderGoodsVo> list1 = iOrderGoodsService.selectList(orderGoodsQueryBo);
         if(list1!=null&&list1.size()>0){
-            return true;
+            return list1.get(0).getOrderGoodsId();
         }
-        return false;
+        return null;
     }
 
     //检查是否允许重复购买商品

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

@@ -125,9 +125,9 @@ public class OrderGoodsVo {
 	@ApiModelProperty("封面地址")
 	private String coverUrl;
 	/** 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级 */
-	@Excel(name = "0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
-	@ApiModelProperty("0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
-	private Integer rebuy;
+	@Excel(name = "复购老订单商品ID")
+	@ApiModelProperty("复购老订单商品ID")
+	private Long rebuyOrderGoodsId;
 	@ApiModelProperty("班级名称")
 	private String gradeName;
 	/** 学习次数 */

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

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="company" column="company"/>
         <result property="remark" column="remark"/>
         <result property="gradeId" column="grade_id"/>
-        <result property="rebuy" column="rebuy"/>
+        <result property="rebuyOrderGoodsId" column="rebuy_order_goods_id"/>
         <result property="studyCount" column="study_count"/>
     </resultMap>
 
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="remark" column="remark"/>
         <result property="userId" column="user_id"/>
-        <result property="rebuy" column="rebuy"/>
+        <result property="rebuyOrderGoodsId" column="rebuy_order_goods_id"/>
 
         <result property="code" column="code"/>
         <result property="goodsName" column="goods_name"/>
@@ -84,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN `order` o ON o.order_sn = og.order_sn
         WHERE
             1 = 1
+            AND og.refund_status != 2
             <if test="goodsId != null and goodsId != ''">
                 AND og.goods_id = #{goodsId}
             </if>