zoujiajian 1 年之前
父節點
當前提交
e5eb653cbd

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/entity/UserActivity.java

@@ -71,7 +71,7 @@ public class UserActivity extends BaseEntity {
 	/**
 	 * 0.大学生认证
 	 * 1.个人分销排行
-	 * 2.商品活动
+	 * 3.平台发券
 	 */
 	private Integer type;
 

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

@@ -40,6 +40,7 @@ public class UserActivityDistributeDetailView {
 	/**
 	 * 0.大学生认证
 	 * 1.个人分销排行
+	 * 3.平台发券
 	 */
 	@DbField("ua.type")
 	private Integer type;

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

@@ -39,6 +39,7 @@ public class UserActivityView {
 	/**
 	 * 0.大学生认证
 	 * 1.个人分销排行
+	 * 3.平台发券
 	 */
 	@DbField("ua.type")
 	private Integer type;

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/coupon/impl/CouponFontServiceImpl.java

@@ -445,7 +445,7 @@ public class CouponFontServiceImpl implements CouponFontService {
 		String dateStr = DateTime.now().toString();
 		String time = String.format(" and (ua.start_time is null or (ua.start_time < '%s' and ua.end_time > '%s'))", dateStr, dateStr);
 		UserActivityDistributeDetailView goodsActivity = beanSearcher.searchFirst(UserActivityDistributeDetailView.class, MapUtils.builder()
-				.field(UserActivityDistributeDetailView::getType, 2)
+				.field(UserActivityDistributeDetailView::getType, 3)
 				.put("time", time)
 				.build());
 		return goodsActivity;

+ 1 - 1
netflix-web/src/main/java/com/cyksj/web/controller/coupon/CouponFrontController.java

@@ -537,7 +537,7 @@ public class CouponFrontController {
 		String dateStr = DateTime.now().toString();
 		String time = String.format(" and (ua.start_time is null or (ua.start_time < '%s' and ua.end_time > '%s'))", dateStr, dateStr);
 		UserActivityView userActivityView = beanSearcher.searchFirst(UserActivityView.class, MapUtils.flatBuilder(request.getParameterMap())
-				.field(UserActivityView::getType, 2)
+				.field(UserActivityView::getType, 3)
 				.put("time", time)
 				.build());
 		if (StrUtil.isNotBlank(userActivityView.getCouponIds())) {