zoujiajian 2 lat temu
rodzic
commit
0c21db4ff3

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/distribute/impl/DistributeServiceImpl.java

@@ -346,7 +346,7 @@ public class DistributeServiceImpl implements DistributeService {
 			throw BusinessRuntimeException.getInstance("该专属推广优惠码已被设置");
 		} else {
 			Coupon existsCoupon = couponMapper.selectOne(Wrappers.lambdaQuery(Coupon.class)
-					.eq(Coupon::getExCode, couponDistributePopularize.getExCode())
+					.eq(Coupon::getExCode, code)
 					.eq(Coupon::getDeleted, true)
 					.select(Coupon::getId)
 					.last("limit 1"));

+ 3 - 3
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -656,7 +656,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				.field("condition", String.format("(gr.expiry_time is null or gr.expiry_time > '%s')", now))
 				.field(RenewalView::getStatus, List.of("validity", "overdue", "outside")).op(Operator.InList)
 				.orderBy(RenewalView::getExpiryTime).asc()
-				.onlySelect(RenewalView::getSkuNum, RenewalView::getExpiryTime, RenewalView::getRelationId, RenewalView::getAccount, RenewalView::getGoodsId, RenewalView::getTitle, RenewalView::getLogo, RenewalView::getImg, RenewalView::getGroupId, RenewalView::getSkuId, RenewalView::getSpecVal, RenewalView::getGoodsStatus, RenewalView::getSkuStatus)
+				.onlySelect(RenewalView::getMonths, RenewalView::getExpiryTime, RenewalView::getRelationId, RenewalView::getAccount, RenewalView::getGoodsId, RenewalView::getTitle, RenewalView::getLogo, RenewalView::getImg, RenewalView::getGroupId, RenewalView::getSkuId, RenewalView::getSpecVal, RenewalView::getGoodsStatus, RenewalView::getSkuStatus)
 				.build());
 		if (list.size() > 5) {
 			redisService.setNx(RedisService.key.TICKET_EXPIRY_NOTIFY_DAY.getNameFormat(thisDate, userId), userId, RedisService.key.TICKET_EXPIRY_NOTIFY_DAY.getTimeout());
@@ -669,10 +669,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 			if (ticket.getGoodsStatus() == null || ticket.getSkuStatus() == null || !ticket.getGoodsStatus() || !ticket.getSkuStatus()) {
 				return false;
 			}
-			Long skuNum = ticket.getSkuNum();
+			Integer skuMonths = ticket.getMonths();
 			Date expiryTime = ticket.getExpiryTime();
 			//年付 提前一个月
-			if (skuNum >= 12) {
+			if (skuMonths >= 12) {
 				day.set(30);
 			} else {
 				day.set(7);