Explorar el Código

fix 小店分类

zoujiajian hace 9 meses
padre
commit
97b68d5f26

+ 6 - 1
netflix-service/src/main/java/com/cyksj/service/mange/vip/impl/CmsVipOrderServiceImpl.java

@@ -284,7 +284,12 @@ public class CmsVipOrderServiceImpl implements CmsVipOrderService {
 			throw BusinessRuntimeException.getInstance("订单状态异常");
 		}
 		Long userId = orderDon.getUserId();
-		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		List<Long> userIdList = null;
+		try {
+			userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		} catch (Exception e) {
+			userIdList = List.of(userId);
+		}
 		//会员是否已过期
 		VipUser vipUser = vipUserMapper.selectOne(Wrappers.lambdaQuery(VipUser.class)
 				.in(VipUser::getUserId, userIdList)

+ 1 - 1
netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -115,7 +115,7 @@ public class GoodsDonController {
 	    Object o = redisService.get(key);
 	    List<GoodsDonCategoryFrontView> list;
 	    MapBuilder mapBuilder = MapUtils.flatBuilder(request.getParameterMap());
-	    String condition = " and (select count(*) from goods_don_category_relate gcr inner join goods_don g on g.id = gcr.goods_id %s where gcr.category = gc.id) > 0";
+	    String condition = " and (select count(*) from goods_don_category_relate gcr inner join goods_don g on g.id = gcr.goods_id %s where gcr.category = gc.id and g.deleted and g.status) > 0";
 	    if (yhsId != null) {
 		    condition = String.format(condition, String.format(" and (select count(*) from yh_shop_goods_sku ys where ys.goods_id = g.id and ys.status is true and ys.deleted is true and g.is_distribute is true and ys.yhs_id = %s) > 0", yhsId));
 	    } else {