|
@@ -6,6 +6,7 @@ import com.mybatisflex.core.paginate.Page;
|
|
|
import com.mybatisflex.core.query.QueryColumn;
|
|
|
import com.mybatisflex.core.query.QueryMethods;
|
|
|
import com.mybatisflex.core.query.QueryWrapper;
|
|
|
+import com.mybatisflex.core.util.CollectionUtil;
|
|
|
import com.mybatisflex.core.util.StringUtil;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import pay.platform.api.system.model.query.PayOrderQuery;
|
|
@@ -40,7 +41,12 @@ public class PayOrderServiceImpl extends BaseService<PayOrderMapper, PayOrder> i
|
|
|
.and(PayOrderTableDef.PAY_ORDER.PLATFORM_ORDER_NO.like(query.getPlatformOrderNo(), StringUtil.isNotBlank(query.getPlatformOrderNo())))
|
|
|
.and(PayOrderTableDef.PAY_ORDER.MERCHANT_ID.like(query.getMerchantId(), query.getMerchantId() != null)
|
|
|
.and(PayOrderTableDef.PAY_ORDER.AGENT_ID.like(query.getAgentId(), query.getAgentId() != null)
|
|
|
+
|
|
|
.and(PayOrderTableDef.PAY_ORDER.STATUS.eq(query.getStatus(), query.getStatus() != null)))).orderBy(PayOrderTableDef.PAY_ORDER.CREATE_TIME.desc());
|
|
|
+ if (CollectionUtil.isNotEmpty(query.getTimes())) {
|
|
|
+ queryWrapper.and(PayOrderTableDef.PAY_ORDER.CREATE_TIME.ge(query.getTimes().get(0) + " 00:00:00", CollectionUtil.isNotEmpty(query.getTimes())))
|
|
|
+ .and(PayOrderTableDef.PAY_ORDER.CREATE_TIME.le(query.getTimes().get(1) + " 23:59:59", CollectionUtil.isNotEmpty(query.getTimes())));
|
|
|
+ }
|
|
|
Page<PayOrder> page = mapper.paginate(new Page<>(query.getCurrent(), query.getSize()), queryWrapper);
|
|
|
List<PayOrderVO> vos = BeanUtil.copyToList(page.getRecords(), PayOrderVO.class);
|
|
|
return new BasePage<>(page.getPageNumber(), page.getPageSize(), page.getTotalRow(), vos);
|