zoujiajian il y a 1 an
Parent
commit
78883cd206

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/views/UserBenefitsFrontView.java

@@ -72,7 +72,7 @@ public class UserBenefitsFrontView {
 	/**
 	 * 续费减免配置
 	 */
-	@DbField("ub.renew_config")
+	@DbIgnore
 	private List<UserBenefits.RenewConfig> renewConfigList;
 
 	/**

+ 1 - 1
netflix-dao/src/main/resources/mapper/UserBenefitsOrderRecordMapper.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.cyksj.mapper.UserBenefitsOrderRecordMapper">
 
     <select id="selectUseComboRecordByUid" resultType="java.lang.Integer">
-        select count(1) from (select order_id from user_benefits_use_record where goods_id = #{goodsId}
+        select count(1) from (select order_id from user_benefits_order_record where goods_id = #{goodsId}
         <if test="skuId != null">
             and sku_id = #{skuId}
         </if>

+ 12 - 3
netflix-web/src/main/java/com/cyksj/web/controller/user/UserBenefitsFrontController.java

@@ -24,6 +24,7 @@ import com.cyksj.service.user.UserBindRelationService;
 import com.cyksj.web.util.StpUserUtil;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.param.Operator;
+import com.ejlchina.searcher.util.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -97,14 +98,22 @@ public class UserBenefitsFrontController {
 	@GetMapping("/get")
 	public Result<List<UserBenefitsFrontView>> getUserBenefits(UserBenefits.Type type) {
 		long userId = StpUserUtil.getLoginIdAsLong();
-		Object o = redisService.get(RedisService.key.USER_BENEFITS_KEY.getName());
+		String key = RedisService.key.USER_BENEFITS_KEY.getName();
+		if (type != null) {
+			key += ":type:" + type.name();
+		}
+		Object o = redisService.get(key);
 		List<UserBenefitsFrontView> userBenefitsFrontViews;
 		if (o == null) {
-			userBenefitsFrontViews = beanSearcher.searchAll(UserBenefitsFrontView.class, MapUtils.builder().build());
+			MapBuilder builder = MapUtils.builder();
+			if (type != null) {
+				builder.field(UserBenefitsFrontView::getType, type.name());
+			}
+			userBenefitsFrontViews = beanSearcher.searchAll(UserBenefitsFrontView.class, builder.build());
 			if (CollUtil.isEmpty(userBenefitsFrontViews)) {
 				return GatewayResponse.SUCCESS.newBuilder().toResult();
 			}
-			redisService.setNx(RedisService.key.USER_BENEFITS_KEY.getName(), userBenefitsFrontViews, RedisService.key.USER_BENEFITS_KEY.getTimeout());
+			redisService.setNx(key, userBenefitsFrontViews, RedisService.key.USER_BENEFITS_KEY.getTimeout());
 		} else {
 			userBenefitsFrontViews = (List<UserBenefitsFrontView>) o;
 		}