fix: 优化部分优惠券初始化及搜索条件
This commit is contained in:
parent
f9b3001eb3
commit
8b61d40ff8
@ -64,6 +64,9 @@ public class CouponBuyerController {
|
|||||||
@GetMapping("/activity")
|
@GetMapping("/activity")
|
||||||
@ApiOperation(value = "自动领取优惠券")
|
@ApiOperation(value = "自动领取优惠券")
|
||||||
public ResultMessage<List<MemberCoupon>> activity() {
|
public ResultMessage<List<MemberCoupon>> activity() {
|
||||||
|
if (UserContext.getCurrentUser() == null) {
|
||||||
|
return ResultUtil.success();
|
||||||
|
}
|
||||||
return ResultUtil.data(couponActivityService.trigger(
|
return ResultUtil.data(couponActivityService.trigger(
|
||||||
CouponActivityTrigger.builder()
|
CouponActivityTrigger.builder()
|
||||||
.couponActivityTypeEnum(CouponActivityTypeEnum.AUTO_COUPON)
|
.couponActivityTypeEnum(CouponActivityTypeEnum.AUTO_COUPON)
|
||||||
|
@ -71,7 +71,11 @@ public class BasePromotionsSearchParams {
|
|||||||
queryWrapper.eq("scope_type", scopeType);
|
queryWrapper.eq("scope_type", scopeType);
|
||||||
}
|
}
|
||||||
if (CharSequenceUtil.isNotEmpty(storeId)) {
|
if (CharSequenceUtil.isNotEmpty(storeId)) {
|
||||||
queryWrapper.in("store_id", Arrays.asList(storeId.split(",")));
|
if ("store".equals(storeId)) {
|
||||||
|
queryWrapper.ne("store_id", PromotionTools.PLATFORM_ID);
|
||||||
|
} else {
|
||||||
|
queryWrapper.in("store_id", Arrays.asList(storeId.split(",")));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
queryWrapper.eq("delete_flag", false);
|
queryWrapper.eq("delete_flag", false);
|
||||||
return queryWrapper;
|
return queryWrapper;
|
||||||
|
@ -245,6 +245,9 @@ public class SeckillServiceImpl extends AbstractPromotionsServiceImpl<SeckillMap
|
|||||||
if (promotions.getStartTime() != null && promotions.getEndTime() == null) {
|
if (promotions.getStartTime() != null && promotions.getEndTime() == null) {
|
||||||
promotions.setEndTime(DateUtil.endOfDay(promotions.getStartTime()));
|
promotions.setEndTime(DateUtil.endOfDay(promotions.getStartTime()));
|
||||||
}
|
}
|
||||||
|
if (promotions.getApplyEndTime() == null && promotions.getStartTime() != null) {
|
||||||
|
promotions.setApplyEndTime(promotions.getStartTime());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user