fix 合并

zhongzheng-api/src/main/java/com/zhongzheng/controller/base/ProfileTpController.java

@@ -76,10 +76,10 @@ public class ProfileTpController extends BaseController {
         String key = "PROFILE_"+loginUser.getUser().getUserId();
         Long value = redisCache.getCacheObject(key);
         if(value!=null){
-            return toAjax(1);
+            return toAjax(0);
         }
         if(iUserProfileService.insertByAddBo(bo)){
-            redisCache.setCacheObject(key,1L,10, TimeUnit.SECONDS);//10秒
+            redisCache.setCacheObject(key,1L,5, TimeUnit.SECONDS);//10秒
             return toAjax(1);
         }
         return toAjax(0);

zhongzheng-api/src/main/java/com/zhongzheng/controller/base/UserProfileStampController.java

@@ -57,10 +57,10 @@ public class UserProfileStampController extends BaseController {
         String key = "PRSTAMP_"+loginUser.getUser().getUserId();
         Long value = redisCache.getCacheObject(key);
         if(value!=null){
-            return toAjax(1);
+            return toAjax(0);
         }
         if(iUserProfileService.insertByAddBo(bo)){
-            redisCache.setCacheObject(key,1L,10, TimeUnit.SECONDS);//10秒
+            redisCache.setCacheObject(key,1L,5, TimeUnit.SECONDS);//10秒
             return toAjax(1);
         }
         return toAjax(0);

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -366,6 +366,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             goodsUserVo.setOfficialLearningUrl(classGradeVo.getOfficialLearningUrl());
             goodsUserVo.setOfficialStatus(classGradeVo.getOfficialStatus());
             goodsUserVo.setLearnStatus(classGradeVo.getLearnStatus());
+            goodsUserVo.setPeriodPlush(classGradeVo.getPeriodPlush());
             Long secLong = 0L;
             Long studyLong = 0L;
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserVo.java

@@ -350,5 +350,8 @@ public class GoodsUserVo {
 	@Excel(name = "官方信息推送接口")
 	@ApiModelProperty("官方信息推送接口")
 	private Long interfacePushId;
-
+	/** 是否学时推送 0未推送 1推送 */
+	@Excel(name = "是否学时推送 0未推送 1推送")
+	@ApiModelProperty("是否学时推送 0未推送 1推送")
+	private Integer periodPlush;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeVo.java

@@ -158,5 +158,9 @@ public class ClassGradeVo {
 	@Excel(name = "官方学习账号推送状态 0否 1是")
 	@ApiModelProperty("官方学习账号推送状态 0否 1是")
 	private Integer learnStatus;
+	/** 是否学时推送 0未推送 1推送 */
+	@Excel(name = "是否学时推送 0未推送 1推送")
+	@ApiModelProperty("是否学时推送 0未推送 1推送")
+	private Integer periodPlush;
 
 }

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/course/CourseMapper.xml

@@ -216,6 +216,7 @@
         <result property="officialLearningUrl" column="official_learning_url"/>
         <result property="learnStatus" column="learn_status"/>
         <result property="officialStatus" column="official_status"/>
+        <result property="periodPlush" column="period_plush"/>
     </resultMap>
 
 
@@ -575,7 +576,8 @@
             cg.interface_account_id,
             cg.official_learning_url,
             cg.interface_push_id,
-            cgu.official_status
+            cgu.official_status,
+            cgu.period_plush
         FROM
             class_grade_user cgu
                 LEFT JOIN class_grade cg on cgu.grade_id = cg.grade_id

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>