Compare commits
No commits in common. "3a799fd7c1c175d69a55d852fd6b42bf68b0876a" and "3cb35b9b78fcd472ec7f5f34c1df08f18d710411" have entirely different histories.
3a799fd7c1
...
3cb35b9b78
|
|
@ -1,7 +1,6 @@
|
||||||
package com.bonus.canteen.core.account.controller;
|
package com.bonus.canteen.core.account.controller;
|
||||||
|
|
||||||
import com.bonus.canteen.core.account.constants.AccTradeTypeEnum;
|
import com.bonus.canteen.core.account.constants.AccTradeTypeEnum;
|
||||||
import com.bonus.canteen.core.account.constants.AccWalletIdEnum;
|
|
||||||
import com.bonus.canteen.core.account.domain.param.*;
|
import com.bonus.canteen.core.account.domain.param.*;
|
||||||
import com.bonus.canteen.core.account.service.AccSubService;
|
import com.bonus.canteen.core.account.service.AccSubService;
|
||||||
import com.bonus.common.core.web.controller.BaseController;
|
import com.bonus.common.core.web.controller.BaseController;
|
||||||
|
|
@ -77,7 +76,6 @@ public class AccSubsidyController extends BaseController {
|
||||||
public TableDataInfo queryAccSubOperationClearList(@RequestBody AccWalletOperationQueryParam request) {
|
public TableDataInfo queryAccSubOperationClearList(@RequestBody AccWalletOperationQueryParam request) {
|
||||||
startPage();
|
startPage();
|
||||||
request.setTradeType(AccTradeTypeEnum.CLEAR.getKey());
|
request.setTradeType(AccTradeTypeEnum.CLEAR.getKey());
|
||||||
request.setWalletId(AccWalletIdEnum.SUBSIDY.getKey());
|
|
||||||
return getDataTable(accSubService.queryAccSubOperationList(request));
|
return getDataTable(accSubService.queryAccSubOperationList(request));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,6 @@ public class AccWalletOperationQueryParam extends BaseEntity {
|
||||||
private String searchValue;
|
private String searchValue;
|
||||||
private String createBy;
|
private String createBy;
|
||||||
private Long userId;
|
private Long userId;
|
||||||
private Integer walletId;
|
|
||||||
|
|
||||||
public AccWalletOperationQueryParam() {
|
public AccWalletOperationQueryParam() {
|
||||||
this.endDateTime = LocalDateTime.now().plusDays(7);
|
this.endDateTime = LocalDateTime.now().plusDays(7);
|
||||||
|
|
|
||||||
|
|
@ -248,9 +248,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="param.payState != null">
|
<if test="param.payState != null">
|
||||||
and ate.pay_state = #{param.payState}
|
and ate.pay_state = #{param.payState}
|
||||||
</if>
|
</if>
|
||||||
<if test="param.walletId != null">
|
|
||||||
and atwd.wallet_id = #{param.walletId}
|
|
||||||
</if>
|
|
||||||
<if test="param.startDateTime != null">
|
<if test="param.startDateTime != null">
|
||||||
and ate.trade_time <![CDATA[ >= ]]> #{param.startDateTime}
|
and ate.trade_time <![CDATA[ >= ]]> #{param.startDateTime}
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue