处理筛选问题

This commit is contained in:
TinyAnts 2023-04-03 14:43:46 +08:00
parent 31f6d5293b
commit f353f78a04
3 changed files with 9 additions and 4 deletions

3
server/.gitignore vendored
View File

@ -32,4 +32,5 @@ rebel-remote.xml
rebel.xml
### customize ###
/likeadmin-java.iml
/likeadmin-java.iml
/logs

View File

@ -7,12 +7,10 @@ import com.github.yulichang.query.MPJQueryWrapper;
import com.mdd.admin.service.IFinanceRefundService;
import com.mdd.admin.validate.commons.PageValidate;
import com.mdd.admin.validate.finance.FinanceRefundSearchValidate;
import com.mdd.admin.vo.finance.FinanceRechargeListVo;
import com.mdd.admin.vo.finance.FinanceRefundListVo;
import com.mdd.admin.vo.finance.FinanceRefundLogVo;
import com.mdd.common.config.GlobalConfig;
import com.mdd.common.core.PageResult;
import com.mdd.common.entity.RechargeOrder;
import com.mdd.common.entity.RefundLog;
import com.mdd.common.entity.RefundRecord;
import com.mdd.common.enums.RefundEnum;
@ -20,7 +18,6 @@ import com.mdd.common.mapper.RefundLogMapper;
import com.mdd.common.mapper.RefundRecordMapper;
import com.mdd.common.util.StringUtils;
import com.mdd.common.util.TimeUtils;
import io.swagger.models.auth.In;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -67,6 +64,10 @@ public class FinanceRefundServiceImpl implements IFinanceRefundService {
"datetime:startTime-endTime@create_time:long",
});
if (StringUtils.isNotNull(searchValidate.getType()) && searchValidate.getType() != -1) {
mpjQueryWrapper.eq("refund_status", searchValidate.getType());
}
if (StringUtils.isNotEmpty(searchValidate.getKeyword())) {
String keyword = searchValidate.getKeyword();
mpjQueryWrapper.nested(wq->wq

View File

@ -12,6 +12,9 @@ public class FinanceRefundSearchValidate implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("筛选类型: -1=全部, 0=退款中, 1=退款成功, 2=退款失败")
private Integer type;
@ApiModelProperty("用户信息")
private String keyword;