|
@@ -123,6 +123,9 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
|
|
|
if (dto.getRegPayIntervalTimeMax() != null) {
|
|
|
cri.where().andLTE("TIMESTAMPDIFF(MINUTE, reg_time, pay_time)", dto.getRegPayIntervalTimeMax());
|
|
|
}
|
|
|
+ if (StringUtils.isNotBlank(dto.getRoleName())) {
|
|
|
+ cri.where().andLike("role_name", dto.getRoleName());
|
|
|
+ }
|
|
|
|
|
|
//pager
|
|
|
Pager pager = dto.toPage();
|
|
@@ -236,6 +239,10 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
|
|
|
if (dto.getRegPayIntervalTimeMax() != null) {
|
|
|
cri.where().andLTE("TIMESTAMPDIFF(MINUTE, reg_time, pay_time)", dto.getRegPayIntervalTimeMax());
|
|
|
}
|
|
|
+ if (StringUtils.isNotBlank(dto.getRoleName())) {
|
|
|
+ cri.where().andLike("role_name", dto.getRoleName());
|
|
|
+ }
|
|
|
+
|
|
|
Sql sql = Sqls.create(getOrderDetailTotalSql() + cri);
|
|
|
sql.setCallback(Sqls.callback.entity());
|
|
|
sql.setEntity(dao.getEntity(AdsOrderDetailTotalVO.class));
|