fix

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -177,7 +177,7 @@ public class WxLoginService
         lqw.eq(User::getUserId, userId);
         User user = iUserService.getOne(lqw);
         String openId = user.getOpenId();
-        if(openId==null){
+        if(Validator.isEmpty(openId)){
             String param = String.format(wxAuthParam, appid, appsrcret, loginBody.getCode());
             String resultString  = HttpUtils.sendGet(wxAuthUrl,param);
             //解析json

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAttachedQueryBo.java

@@ -50,4 +50,6 @@ public class GoodsAttachedQueryBo extends BaseEntity {
 	private Integer type;
 	@ApiModelProperty("用户ID")
 	private Long userId;
+	@ApiModelProperty("过来做过的 1过滤 0不过滤")
+	private Integer isDo;
 }

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

@@ -243,19 +243,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 Long gradeId = null;
                 if(g.getGoodsInputData()!=null){
                     gradeId = g.getGoodsInputData().getGradeId();
-                    if(g.getGoodsInputData().getType()!=null&&g.getGoodsInputData().getType().equals("class")){
-                        //判断是否购买历史班级都过期
-                        canRepeatBuy =this.canBuyRepeatGoods(g.getGoodsId(),bo.getUserId());
-                        String requestId = IdUtil.simpleUUID();
-                        RedisLockEntity redisLockEntity = new RedisLockEntity();
-                        redisLockEntity.setLockKey(RedisLockEntity.KEY_LOCK_GRADE);
-                        redisLockEntity.setRequestId(requestId);
-                        if(redisCache.lock(redisLockEntity)){
-                            arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId(),out_trade_no);
-                            redisCache.unlockLua(redisLockEntity);
-                        }
-
-                    }
+                }
+                //判断是否购买历史班级都过期
+                canRepeatBuy =this.canBuyRepeatGoods(g.getGoodsId(),bo.getUserId());
+                String requestId = IdUtil.simpleUUID();
+                RedisLockEntity redisLockEntity = new RedisLockEntity();
+                redisLockEntity.setLockKey(RedisLockEntity.KEY_LOCK_GRADE);
+                redisLockEntity.setRequestId(requestId);
+                if(redisCache.lock(redisLockEntity)){
+                    arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId(),out_trade_no);
+                    redisCache.unlockLua(redisLockEntity);
                 }
 
             }
@@ -279,7 +276,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Map<String, String> placeSmallOrder(OrderAddBo bo) {
-
         List<OrderGoodsAddBo> goodsList = bo.getGoodsList();
         if(goodsList==null||goodsList.size()<1){
             throw new CustomException("商品列表为空");
@@ -335,21 +331,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 Long gradeId = null;
                 if(g.getGoodsInputData()!=null){
                     gradeId = g.getGoodsInputData().getGradeId();
-                    if(g.getGoodsInputData().getType()!=null&&g.getGoodsInputData().getType().equals("class")){
-                        //判断是否购买历史班级都过期
-                        canRepeatBuy =this.canBuyRepeatGoods(g.getGoodsId(),bo.getUserId());
-                        String requestId = IdUtil.simpleUUID();
-                        RedisLockEntity redisLockEntity = new RedisLockEntity();
-                        redisLockEntity.setLockKey(RedisLockEntity.KEY_LOCK_GRADE);
-                        redisLockEntity.setRequestId(requestId);
-                        if(redisCache.lock(redisLockEntity)){
-                            arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId(),out_trade_no);
-                            redisCache.unlockLua(redisLockEntity);
-                        }
-
-                    }
                 }
-
+                //判断是否购买历史班级都过期
+                canRepeatBuy =this.canBuyRepeatGoods(g.getGoodsId(),bo.getUserId());
+                String requestId = IdUtil.simpleUUID();
+                RedisLockEntity redisLockEntity = new RedisLockEntity();
+                redisLockEntity.setLockKey(RedisLockEntity.KEY_LOCK_GRADE);
+                redisLockEntity.setRequestId(requestId);
+                if(redisCache.lock(redisLockEntity)){
+                    arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId(),out_trade_no);
+                    redisCache.unlockLua(redisLockEntity);
+                }
             }
             if(!canRepeatBuy){
                 this.checkBuyGoods(g.getGoodsId(),bo.getUserId());

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -134,14 +134,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN order_input_template ot ON cb.template_status = ot.id
         <if test="goodsType ==1">
         LEFT JOIN (SELECT
-        g.goods_id,
-        COUNT( DISTINCT c.subject_id ) as subject_num
-        FROM
-        goods g
-        LEFT JOIN goods_course gc ON g.goods_id = gc.course_id
-        LEFT JOIN course c ON gc.course_id = c.course_id
-        GROUP BY
-        g.goods_id) gs  on g.goods_id = gs.goods_id
+            count( c.subject_id ) subject_num,
+            gc.goods_id
+            FROM
+            goods g
+            LEFT JOIN goods_course gc ON g.goods_id = gc.course_id
+            LEFT JOIN course c ON gc.course_id = c.course_id
+            GROUP BY
+            gc.goods_id) gs  on g.goods_id = gs.goods_id
         </if>
         <if test="goodsType ==1 and subjectId >0">
             LEFT JOIN goods_course gc ON gc.goods_id = g.goods_id