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 d92b44efb..1435fd4fc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -10,6 +10,7 @@ import com.iformall.domain.po.*; 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.exception.MallinkException; import com.iformall.service.WxCardInfoService; import com.iformall.service.WxCardSpendService; @@ -105,6 +106,9 @@ public class WxCardPayController extends BaseController { wxCardSpendVo.setPayStatusS(tmpList); } } + List sources = new ArrayList(); + sources.add(EnumMerchantSubsidySource.CARD.getCode()); + wxCardSpendVo.setSources(sources); 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 c687c4c64..d1b9c5530 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java @@ -1,6 +1,9 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; + +import java.util.List; + import com.iformall.domain.po.WxCardSpend; import lombok.Data; import lombok.EqualsAndHashCode; @@ -35,5 +38,8 @@ public class WxCardSpendVo extends WxCardSpend { @Excel(name = "手机", width = 20, orderNum = "2") @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") private String ouPhone; + + @io.swagger.annotations.ApiModelProperty(value="账单来源查询条件",name="ouPhone") + private List sources; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 4ed02a722..776679cfb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -277,8 +277,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } catch (Exception ex) { logger.error("记录到结算表失败"); } -// } - } + } +// } // 成长值 try { diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 77f29538f..0fb3148fa 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -316,6 +316,8 @@ + + @@ -323,7 +325,7 @@ cs.`card_remain_amount`,cs.`card_before_amount`,cs.`card_remain_real_amount`,cs.`card_before_real_amount`, cs.`create_date`,cs.`update_date`, cs.`pay_status`, m.`name`, c.`title`, - ms.`subsidy`,ms.`real_subsidy`,ms.`status`, + ms.`subsidy`,ms.`real_subsidy`,ms.`status` ou.`nick_name` as onick_name, ou.`phone` as ou_phone @@ -383,6 +385,14 @@ and ms.`status` = #{status} + + + and ms.source in + + #{sourceItem} + + + and ou.`phone` = #{ouPhone}