|
|
@@ -190,15 +190,15 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
if (cmt == null || cmt != 2) {
|
|
|
builder.field(RenewalView::getCmt, 2).op(Operator.NotEqual);
|
|
|
}
|
|
|
- //Long yhsId = yhShopFrontService.getYhsIdByCustomId(customId);
|
|
|
+// Long yhsId = yhShopFrontService.getYhsIdByCustomId(customId);
|
|
|
DateTime now = DateTime.now();
|
|
|
if (StrUtil.isNotBlank(account)) {
|
|
|
builder.field(RenewalView::getAccount, account).op(Operator.Contain);
|
|
|
}
|
|
|
String conditionSql = String.format("(gr.expiry_time is null or gr.expiry_time > '%s'", now);
|
|
|
//镜像车票 过期7天后清除
|
|
|
- //ast!=1时,镜像店铺过期过期车票
|
|
|
- if (cmt == null || cmt != 2) {
|
|
|
+ //个人店铺和AI店铺 暂不支持过期续费
|
|
|
+ if (cmt == null && StrUtil.isEmpty(customId)) {
|
|
|
conditionSql += String.format(" or (sku.is_mirror and gr.expiry_time > '%s')", DateUtil.offsetDay(now, -7));
|
|
|
}
|
|
|
conditionSql += ")";
|