From 5ab741f3d425758400f40cc206fe837b1c05b8b9 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Thu, 2 Mar 2023 14:46:04 +0800 Subject: [PATCH] fix card --- .../main/java/com/iformall/domain/po/WxCardSpend.java | 3 ++- .../iformall/service/impl/WxCardSpendServiceImpl.java | 11 +++++++++++ .../src/main/resources/mapper/WxCardSpendMapper.xml | 7 ++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java index 80cce7287..90c58bc95 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java @@ -29,7 +29,8 @@ public class WxCardSpend extends TenantEntity { private List ownerIdList; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; - + @TableField(exist = false) + private List merchantIdList; @Excel(name = "订单号", width = 20, orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="订单账号",name="orderId") private Long orderId; 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 eaf5d54e1..b2c6e60b6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -601,6 +601,17 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { record.setOwnerIdList(uids); } } + if (StringUtils.isNotBlank(record.getMerchantName())){ + WxMerchant merchantQ = new WxMerchant(); + merchantQ.updateTenantInfo(record); + merchantQ.setName(record.getMerchantName()); + List merchantIds = wxMerchantMapper.findIdList(merchantQ); + if (null == merchantIds || merchantIds.size() <=0 ){ + record.setId(-999L); + }else { + record.setMerchantIdList(merchantIds); + } + } } @Override diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 783831a93..7d82c24db 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -97,7 +97,12 @@ and `create_date` <= #{enddate} - + + and `merchant_id` in + + #{midItem} + + and `pay_status` in