From f64b4d05b396ca0ba6fe7c0ed782c3d201e6f7b8 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 16 Mar 2023 17:14:25 +0800 Subject: [PATCH] //card --- .../controller/market/WxCardPayController.java | 1 + .../domain/vo/WxCardSpendMerchantVo.java | 8 +++++--- .../helper/WxCUserTagsServiceHelper.java | 3 +++ .../service/impl/WxCardSpendServiceImpl.java | 15 ++++++++++++++- .../resources/mapper/WxCardSpendMapper.xml | 18 ++++++++++++++---- 5 files changed, 37 insertions(+), 8 deletions(-) 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 6589bc3a2..81a9b9094 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -14,6 +14,7 @@ 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.enums.EnumPayType; import com.iformall.exception.MallinkException; import com.iformall.service.WxCardInfoService; import com.iformall.service.WxCardSpendService; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendMerchantVo.java index 6de03e079..e440a19cc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendMerchantVo.java @@ -13,14 +13,16 @@ public class WxCardSpendMerchantVo { private Long merchantId; @Excel(name = "商户名称", width = 20, orderNum = "2") private String merchantName; + @Excel(name = "类型", width = 20, orderNum = "3", replace = {"付款_0", "退款_1"}) + private Integer payType; private BigDecimal total; - @Excel(name = "交易总金额(元)", width = 20, orderNum = "3") + @Excel(name = "交易总金额(元)", width = 20, orderNum = "4") private String totalStr; private BigDecimal fee; - @Excel(name = "总手续费(元)", width = 20, orderNum = "4") + @Excel(name = "总手续费(元)", width = 20, orderNum = "5") private String feeStr; private BigDecimal subsidy; - @Excel(name = "总补贴(元)", width = 20, orderNum = "5") + @Excel(name = "总补贴(元)", width = 20, orderNum = "6") private String subsidyStr; public String getTotalStr() { diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java index 1db7155ca..80340aeaf 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java @@ -357,6 +357,7 @@ public class WxCUserTagsServiceHelper{ wxCouponOrder.updateTenantInfo(tenantEntity); WxCardSpend wxCardSpend = new WxCardSpend(); + wxCardSpend.setPayType(EnumPayType.PAY_PAYMENT.getCode()); wxCardSpend.setOwnerId(user.getId()); wxCardSpend.setStartdate(startC.getTime()); wxCardSpend.setEnddate(endC.getTime()); @@ -466,6 +467,7 @@ public class WxCUserTagsServiceHelper{ wxCouponOrder.updateTenantInfo(tenantEntity); WxCardSpend wxCardSpend = new WxCardSpend(); + wxCardSpend.setPayType(EnumPayType.PAY_PAYMENT.getCode()); wxCardSpend.setOwnerId(user.getId()); wxCardSpend.setStartdate(startC.getTime()); wxCardSpend.setEnddate(endC.getTime()); @@ -585,6 +587,7 @@ public class WxCUserTagsServiceHelper{ WxCardSpend wxCardSpend = new WxCardSpend(); wxCardSpend.updateTenantInfo(tenantEntity); + wxCardSpend.setPayType(EnumPayType.PAY_PAYMENT.getCode()); wxCardSpend.setOwnerId(user.getId()); wxCardSpend.setStartdate(startC.getTime()); wxCardSpend.setEnddate(endC.getTime()); 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 80e178733..3ce80fca1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -723,6 +723,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { for (int i = 0 ; i < list.size(); i++ ) { Map m = list.get(i); WxCardSpendMerchantVo vo = new WxCardSpendMerchantVo(); + Integer payType = (Integer)m.get("pay_type"); + vo.setPayType(payType); Long merchantId = (Long)m.get("merchant_id"); vo.setMerchantId(merchantId); if (null != merchantId && (!merchantIdList.contains(merchantId))) { @@ -759,9 +761,17 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } return null; } - + + /** + * 默认查询付款记录 + * @param record + * @return + */ @Override public Map sumCardSpend(WxCardSpendVo record) { + if(record.getPayType() == null){ + record.setPayType(EnumPayType.PAY_PAYMENT.getCode()); + } handleQueryParam(record); return wxCardSpendMapper.sumCardSpend(record); } @@ -1333,6 +1343,9 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { @Override public Integer sumRealPayment(WxCardSpendVo wxCardSpend) { + if(wxCardSpend.getPayType() == null){ + wxCardSpend.setPayType(EnumPayType.PAY_PAYMENT.getCode()); + } return wxCardSpendMapper.sumRealPayment(wxCardSpend); } diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 010c94357..17e78578e 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -158,7 +158,7 @@ select cs.merchant_id as merchantId, count(1) as count from wx_card_spend cs - where cs.`owner_id` = #{ownerId} and cs.`tenant_id` = #{tenantId} + where cs.`owner_id` = #{ownerId} + and cs.`tenant_id` = #{tenantId} + + and cs.`pay_type` = #{payType} + and cs.`parent_tenant_id` = #{parentTenantId} @@ -277,14 +284,14 @@