|
@@ -1136,7 +1136,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
.field("condition", String.format("(gr.expiry_time is null or gr.expiry_time > '%s')", DateTime.now()))
|
|
.field("condition", String.format("(gr.expiry_time is null or gr.expiry_time > '%s')", DateTime.now()))
|
|
|
.field(RenewalView::getStatus, List.of("validity", "outside")).op(Operator.InList)
|
|
.field(RenewalView::getStatus, List.of("validity", "outside")).op(Operator.InList)
|
|
|
.orderBy(RenewalView::getExpiryTime).asc()
|
|
.orderBy(RenewalView::getExpiryTime).asc()
|
|
|
- .onlySelect(RenewalView::getRelationId, RenewalView::getExpiryTime, RenewalView::getTitle, RenewalView::getSpecVal, RenewalView::getGoodsId, RenewalView::getSkuId, RenewalView::getSkuNum, RenewalView::getSkuStatus, RenewalView::getGoodsStatus)
|
|
|
|
|
|
|
+ .onlySelect(RenewalView::getRelationId, RenewalView::getExpiryTime, RenewalView::getTitle, RenewalView::getSpecVal, RenewalView::getThirdExchangeUrl, RenewalView::getGoodsId, RenewalView::getSkuId, RenewalView::getSkuNum, RenewalView::getSkuStatus, RenewalView::getGoodsStatus)
|
|
|
.build());
|
|
.build());
|
|
|
if (renewalView != null) {
|
|
if (renewalView != null) {
|
|
|
renewalView.setExpiryTimeStr(DateUtil.format(renewalView.getExpiryTime(), "yyyy-MM-dd"));
|
|
renewalView.setExpiryTimeStr(DateUtil.format(renewalView.getExpiryTime(), "yyyy-MM-dd"));
|