fix 隐藏

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

@@ -68,6 +68,8 @@ public class OrderGoodsQueryBo extends BaseEntity {
 	/** 退款状态 0无  1退款中 2已退款 3拒绝退款 */
 	@ApiModelProperty("退款状态 0无  1退款中 2已退款 3拒绝退款")
 	private Integer refundStatus;
+	@ApiModelProperty("退款状态 0无  1退款中 2已退款 3拒绝退款")
+	private List<Integer> refundStatusList;
 	/** 支付状态 1未收费 2部分收费 3完全收费 */
 	@ApiModelProperty("支付状态 1未收费 2部分收费 3完全收费")
 	private Integer payStatus;

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

@@ -282,7 +282,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
 
             if(!canRepeatBuy&&goods.getGoodsType()!=3&&goods.getGoodsType()!=4){
-                this.checkBuyGoods(g.getGoodsId(),bo.getUserId());
+                this.checkBuyGoods(g.getGoodsId(),bo.getUserId(),goods.getGoodsType());
             }
 
         }
@@ -383,7 +383,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
 
             if(!canRepeatBuy&&goods.getGoodsType()!=3&&goods.getGoodsType()!=4){
-                this.checkBuyGoods(g.getGoodsId(),bo.getUserId());
+                this.checkBuyGoods(g.getGoodsId(),bo.getUserId(),goods.getGoodsType());
             }
             iShoppingCartService.deleteByGoodsId(g.getGoodsId(),bo.getUserId());
         }
@@ -514,6 +514,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         OrderGoodsQueryBo orderGoodsQueryBo = new OrderGoodsQueryBo();
         orderGoodsQueryBo.setUserId(userId);
         orderGoodsQueryBo.setGoodsId(goodsId);
+        List<Integer> refundStatusList = new ArrayList<>();
+        refundStatusList.add(0);
+        refundStatusList.add(1);
+        refundStatusList.add(3);
+        orderGoodsQueryBo.setRefundStatusList(refundStatusList);
         List<Integer> payStatusList = new ArrayList<>();
         payStatusList.add(2);
         payStatusList.add(3);
@@ -550,13 +555,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 
     //检查是否购买过商品
-    public boolean checkBuyGoods(Long goodsId,Long userId){
+    public boolean checkBuyGoods(Long goodsId,Long userId,Long goodsType){
         OrderGoodsQueryBo bo = new OrderGoodsQueryBo();
         bo.setUserId(userId);
         bo.setGoodsId(goodsId);
         Long num = iOrderGoodsService.getBuyGoodsHistory(bo);
         if(num.longValue()>0){
-            throw new CustomException("无法重复购买商品",511);
+            if(goodsType.equals(2)){
+                throw new CustomException("不可以重复购买题库商品",511);
+            }
+            throw new CustomException("不可以重复购买商品",511);
         }
         Long num1 = iOrderGoodsService.getBuyGoodsReadyPay(bo);
         if(num1.longValue()>0){

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

@@ -84,7 +84,12 @@ 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="refundStatusList != null and refundStatusList.size()!=0 ">
+                AND og.refund_status in
+                <foreach collection="refundStatusList" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="goodsId != null and goodsId != ''">
                 AND og.goods_id = #{goodsId}
             </if>