| @@ -10,6 +10,7 @@ import com.iformall.domain.po.*; | |||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.domain.vo.WxCardSpendVo; | import com.iformall.domain.vo.WxCardSpendVo; | ||||
| import com.iformall.domain.vo.WxCardVo; | import com.iformall.domain.vo.WxCardVo; | ||||
| import com.iformall.enums.EnumMerchantSubsidySource; | |||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.service.WxCardInfoService; | import com.iformall.service.WxCardInfoService; | ||||
| import com.iformall.service.WxCardSpendService; | import com.iformall.service.WxCardSpendService; | ||||
| @@ -105,6 +106,9 @@ public class WxCardPayController extends BaseController { | |||||
| wxCardSpendVo.setPayStatusS(tmpList); | wxCardSpendVo.setPayStatusS(tmpList); | ||||
| } | } | ||||
| } | } | ||||
| List<Integer> sources = new ArrayList<Integer>(); | |||||
| sources.add(EnumMerchantSubsidySource.CARD.getCode()); | |||||
| wxCardSpendVo.setSources(sources); | |||||
| final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); | final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -1,6 +1,9 @@ | |||||
| package com.iformall.domain.vo; | package com.iformall.domain.vo; | ||||
| import cn.afterturn.easypoi.excel.annotation.Excel; | import cn.afterturn.easypoi.excel.annotation.Excel; | ||||
| import java.util.List; | |||||
| import com.iformall.domain.po.WxCardSpend; | import com.iformall.domain.po.WxCardSpend; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -35,5 +38,8 @@ public class WxCardSpendVo extends WxCardSpend { | |||||
| @Excel(name = "手机", width = 20, orderNum = "2") | @Excel(name = "手机", width = 20, orderNum = "2") | ||||
| @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") | @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") | ||||
| private String ouPhone; | private String ouPhone; | ||||
| @io.swagger.annotations.ApiModelProperty(value="账单来源查询条件",name="ouPhone") | |||||
| private List<Integer> sources; | |||||
| } | } | ||||
| @@ -277,8 +277,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| } catch (Exception ex) { | } catch (Exception ex) { | ||||
| logger.error("记录到结算表失败"); | logger.error("记录到结算表失败"); | ||||
| } | } | ||||
| // } | |||||
| } | |||||
| } | |||||
| // } | |||||
| // 成长值 | // 成长值 | ||||
| try { | try { | ||||
| @@ -316,6 +316,8 @@ | |||||
| <result column="onick_name" jdbcType="VARCHAR" property="onickName"/> | <result column="onick_name" jdbcType="VARCHAR" property="onickName"/> | ||||
| <result column="ou_phone" jdbcType="VARCHAR" property="ouPhone"/> | <result column="ou_phone" jdbcType="VARCHAR" property="ouPhone"/> | ||||
| <result column="source" jdbcType="INTEGER" property="source"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allVoColumns"> | <sql id="allVoColumns"> | ||||
| @@ -323,7 +325,7 @@ | |||||
| cs.`card_remain_amount`,cs.`card_before_amount`,cs.`card_remain_real_amount`,cs.`card_before_real_amount`, | 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`, | cs.`create_date`,cs.`update_date`, cs.`pay_status`, | ||||
| m.`name`, c.`title`, | 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 | ou.`nick_name` as onick_name, ou.`phone` as ou_phone | ||||
| </sql> | </sql> | ||||
| @@ -383,6 +385,14 @@ | |||||
| <if test=" null != status "> | <if test=" null != status "> | ||||
| and ms.`status` = #{status} | and ms.`status` = #{status} | ||||
| </if> | </if> | ||||
| <if test=" null != sources "> | |||||
| and ms.source in | |||||
| <foreach collection="sources" index="index" item="sourceItem" open="(" separator="," close=")"> | |||||
| #{sourceItem} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != ouPhone and '' != ouPhone "> | <if test=" null != ouPhone and '' != ouPhone "> | ||||
| and ou.`phone` = #{ouPhone} | and ou.`phone` = #{ouPhone} | ||||
| </if> | </if> | ||||