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 5e9ce9574..6a9c3b319 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -107,10 +107,10 @@ public class WxCardPayController extends BaseController { wxCardSpendVo.setPayStatusS(tmpList); } } -// List sources = new ArrayList(); -// sources.add(EnumMerchantSubsidySource.CARD.getCode()); -// wxCardSpendVo.setSources(sources); -// wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); + List sources = new ArrayList(); + sources.add(EnumMerchantSubsidySource.CARD.getCode()); + wxCardSpendVo.setSources(sources); + wxCardSpendVo.setCardSpendListShow(1); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); } @@ -231,7 +231,7 @@ public class WxCardPayController extends BaseController { List sources = new ArrayList(); sources.add(EnumMerchantSubsidySource.CARD.getCode()); wxCardSpendVo.setSources(sources); - wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); + wxCardSpendVo.setCardSpendListShow(1); wxCardSpendService.exportData(wxCardSpendVo, request, response); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index 7a888af6f..d189637ff 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -98,6 +98,9 @@ public class WxMerchantSubsidy extends TenantEntity { @Excel(name = "冻结状态", width = 20, orderNum = "8", replace = {"冻结中_1", "正常_0", " _-1"}) @io.swagger.annotations.ApiModelProperty(value = "是否冻结", name = "freeze") private Integer freeze; + + @io.swagger.annotations.ApiModelProperty(value="是否展示在卡消费列表 1-展示 0-不展示",name="cardSpendListShow") + private Integer cardSpendListShow; public String getOrderPaymentStr() { 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 aedbad4c2..1d10033ac 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java @@ -44,8 +44,8 @@ public class WxCardSpendVo extends WxCardSpend { @TableField(exist = false) private List sources; - @io.swagger.annotations.ApiModelProperty(value="账单类型",name="subsidyType") + @io.swagger.annotations.ApiModelProperty(value="是否显示在卡消费订单",name="cardSpendListShow") @TableField(exist = false) - private Integer subsidyType; + private Integer cardSpendListShow; } 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 b1f2b1673..ead81c994 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -231,10 +231,13 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 未补贴 merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); } - + merchantSubsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); merchantSubsidy.setSource(EnumMerchantSubsidySource.CARD.getCode()); + //如果是有价卡,并且有补贴,则该记录不能显示在卡消费列表里面 + merchantSubsidy.setCardSpendListShow(0); + merchantSubsidy.setCreateDate(curDate); merchantSubsidy.setUpdateDate(curDate); try { diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index dd6bb4b9a..c89f2e890 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -392,8 +392,8 @@ - - and ms.type = #{subsidyType} + + and ( ms.card_spend_list_show is null or ms.card_spend_list_show = #{cardSpendListShow} ) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml index b4766be06..aa8f96abf 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml @@ -21,11 +21,12 @@ + - `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