| @@ -107,10 +107,10 @@ 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); | |||||
| // wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); | |||||
| List<Integer> sources = new ArrayList<Integer>(); | |||||
| sources.add(EnumMerchantSubsidySource.CARD.getCode()); | |||||
| wxCardSpendVo.setSources(sources); | |||||
| wxCardSpendVo.setCardSpendListShow(1); | |||||
| 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); | ||||
| } | } | ||||
| @@ -231,7 +231,7 @@ public class WxCardPayController extends BaseController { | |||||
| List<Integer> sources = new ArrayList<Integer>(); | List<Integer> sources = new ArrayList<Integer>(); | ||||
| sources.add(EnumMerchantSubsidySource.CARD.getCode()); | sources.add(EnumMerchantSubsidySource.CARD.getCode()); | ||||
| wxCardSpendVo.setSources(sources); | wxCardSpendVo.setSources(sources); | ||||
| wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); | |||||
| wxCardSpendVo.setCardSpendListShow(1); | |||||
| wxCardSpendService.exportData(wxCardSpendVo, request, response); | wxCardSpendService.exportData(wxCardSpendVo, request, response); | ||||
| } | } | ||||
| @@ -98,6 +98,9 @@ public class WxMerchantSubsidy extends TenantEntity { | |||||
| @Excel(name = "冻结状态", width = 20, orderNum = "8", replace = {"冻结中_1", "正常_0", " _-1"}) | @Excel(name = "冻结状态", width = 20, orderNum = "8", replace = {"冻结中_1", "正常_0", " _-1"}) | ||||
| @io.swagger.annotations.ApiModelProperty(value = "是否冻结", name = "freeze") | @io.swagger.annotations.ApiModelProperty(value = "是否冻结", name = "freeze") | ||||
| private Integer freeze; | private Integer freeze; | ||||
| @io.swagger.annotations.ApiModelProperty(value="是否展示在卡消费列表 1-展示 0-不展示",name="cardSpendListShow") | |||||
| private Integer cardSpendListShow; | |||||
| public String getOrderPaymentStr() { | public String getOrderPaymentStr() { | ||||
| @@ -44,8 +44,8 @@ public class WxCardSpendVo extends WxCardSpend { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<Integer> sources; | private List<Integer> sources; | ||||
| @io.swagger.annotations.ApiModelProperty(value="账单类型",name="subsidyType") | |||||
| @io.swagger.annotations.ApiModelProperty(value="是否显示在卡消费订单",name="cardSpendListShow") | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer subsidyType; | |||||
| private Integer cardSpendListShow; | |||||
| } | } | ||||
| @@ -231,10 +231,13 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| // 未补贴 | // 未补贴 | ||||
| merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); | merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); | ||||
| } | } | ||||
| merchantSubsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); | merchantSubsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); | ||||
| merchantSubsidy.setSource(EnumMerchantSubsidySource.CARD.getCode()); | merchantSubsidy.setSource(EnumMerchantSubsidySource.CARD.getCode()); | ||||
| //如果是有价卡,并且有补贴,则该记录不能显示在卡消费列表里面 | |||||
| merchantSubsidy.setCardSpendListShow(0); | |||||
| merchantSubsidy.setCreateDate(curDate); | merchantSubsidy.setCreateDate(curDate); | ||||
| merchantSubsidy.setUpdateDate(curDate); | merchantSubsidy.setUpdateDate(curDate); | ||||
| try { | try { | ||||
| @@ -392,8 +392,8 @@ | |||||
| </foreach> | </foreach> | ||||
| </if> | </if> | ||||
| <if test=" null != subsidyType "> | |||||
| and ms.type = #{subsidyType} | |||||
| <if test=" null != cardSpendListShow "> | |||||
| and ( ms.card_spend_list_show is null or ms.card_spend_list_show = #{cardSpendListShow} ) | |||||
| </if> | </if> | ||||
| <if test=" null != ouPhone and '' != ouPhone "> | <if test=" null != ouPhone and '' != ouPhone "> | ||||
| @@ -21,11 +21,12 @@ | |||||
| <result column="freeze" property="freeze" /> | <result column="freeze" property="freeze" /> | ||||
| <result column="type" property="type"/> | <result column="type" property="type"/> | ||||
| <result column="source" property="source"/> | <result column="source" property="source"/> | ||||
| <result column="card_spend_list_show" jdbcType="INTEGER" property="cardSpendListShow" /> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`parent_tenant_id`,`order_id`,`order_type`,`merchant_id`,`coupon_order_id`,`coupon_type`,`order_payment`,`receiver_payment`,`real_payment`,`subsidy`,`real_subsidy`,`status`,`create_date`,`update_date`,freeze,type,source | |||||
| `id`,`tenant_id`,`parent_tenant_id`,`order_id`,`order_type`,`merchant_id`,`coupon_order_id`,`coupon_type`,`order_payment`,`receiver_payment`,`real_payment`,`subsidy`,`real_subsidy`,`status`,`create_date`,`update_date`,freeze,type,source,card_spend_list_show | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||