diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index 1435fd4fc..dd0e73742 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.domain.vo.WxCardVo; import com.iformall.enums.EnumMerchantSubsidySource; +import com.iformall.enums.EnumMerchantSubsidyType; import com.iformall.exception.MallinkException; import com.iformall.service.WxCardInfoService; import com.iformall.service.WxCardSpendService; @@ -109,6 +110,7 @@ public class WxCardPayController extends BaseController { List sources = new ArrayList(); sources.add(EnumMerchantSubsidySource.CARD.getCode()); wxCardSpendVo.setSources(sources); + wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java index 95913fc44..aedbad4c2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java @@ -40,8 +40,12 @@ public class WxCardSpendVo extends WxCardSpend { @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") private String ouPhone; - @io.swagger.annotations.ApiModelProperty(value="账单来源查询条件",name="ouPhone") + @io.swagger.annotations.ApiModelProperty(value="账单来源查询条件",name="sources") @TableField(exist = false) private List sources; + + @io.swagger.annotations.ApiModelProperty(value="账单类型",name="subsidyType") + @TableField(exist = false) + private Integer subsidyType; } diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 2a2a79abe..e7a77e335 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -391,7 +391,11 @@ #{sourceItem} - + + + + and ms.type = #{subsidyType} + and ou.`phone` = #{ouPhone}