From 2fbce1d0ed6f85152d42f6f0b5c3428f611b347c Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 12 May 2024 11:07:51 +0800 Subject: [PATCH] fix --- .../domain/po/WxRaffleActivityRecord.java | 3 ++ .../com/iformall/service/WxShopService.java | 3 ++ .../impl/WxRaffleActivityServiceImpl.java | 15 +++++++++ .../service/impl/WxShopServiceImpl.java | 31 +++++++++++++++++++ 4 files changed, 52 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java index f99a4a6f4..263fdc52f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java @@ -38,6 +38,9 @@ public class WxRaffleActivityRecord extends TenantEntity { @Excel(name="商户名称",width = 20,orderNum = "2") @TableField(exist = false) private String merchantName; + @Excel(name="商铺号",width = 20,orderNum = "3") + @TableField(exist = false) + private String shopNumber; @Excel(name="订单号",width = 20,orderNum = "4") @io.swagger.annotations.ApiModelProperty(value = "订单号", name = "orderNo") private String orderNo; diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java index 8c04445b8..87b90108a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxShop; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxShopVo; @@ -109,5 +110,7 @@ public interface WxShopService { List getShopIds(WxShop wxShop); Map findShopMap(WxShop wxShop); + + Map getMerchantShopNumberMap(TenantEntity tenantEntity,List merchantIds); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java index cc6986b9e..0d8367d84 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java @@ -26,6 +26,7 @@ import com.iformall.mapper.WxRaffleActivityRecordMapper; import com.iformall.service.ExcelService; import com.iformall.service.MallUserInfoService; import com.iformall.service.WxRaffleActivityService; +import com.iformall.service.WxShopService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,6 +59,10 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { @Autowired MallUserInfoService mallUserInfoService; + @Lazy + @Autowired + WxShopService wxShopService; + @Autowired ExcelService excelService; @@ -177,6 +182,11 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { Map userMap = getMallUserInfoMap(tenantEntity); + Map merchantShopNumberMap = null; + if (null != midList && midList.size() > 0 ) { + merchantShopNumberMap = wxShopService.getMerchantShopNumberMap(tenantEntity, midList); + } + for (WxRaffleActivityRecord _r : recordList) { if (null != _r.getActivityId()) { WxRaffleActivity _a = activityMap.get(_r.getActivityId()); @@ -190,7 +200,12 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { if (null != _m) { _r.setMerchantName(_m.getName()); } + + if (null != merchantShopNumberMap && merchantShopNumberMap.containsKey(_r.getMerchantId())) { + _r.setShopNumber(merchantShopNumberMap.get(_r.getMerchantId())); + } } + _r.setRecordItemList(getActivityRecordItemListByRecordId(aidList,_r.getId(),_r)); _r.setItemDetail(_r.generateItemDetaiJson(userMap)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 374868b19..4686a4a76 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -725,4 +725,35 @@ public class WxShopServiceImpl implements WxShopService { } return shopMap; } + + @Override + public Map getMerchantShopNumberMap(TenantEntity tenantEntity,List merchantIds) { + WxMerchantShop merchantShopQ = new WxMerchantShop(); + merchantShopQ.updateTenantInfo(tenantEntity); + merchantShopQ.setMerchantIds(merchantIds); + merchantShopQ.setIsDel(0); + List merchantShopList = wxMerchantShopMapper.findList(merchantShopQ); + + WxShop sq = new WxShop(); + sq.updateTenantInfo(tenantEntity); + Map shopMap = this.findShopMap(sq); + if (null != merchantShopList && merchantShopList.size() > 0) { + Map retMap = new HashMap(); + for (int i = 0 ;i < merchantShopList.size() ; i ++) { + WxMerchantShop ms = merchantShopList.get(i); + if (null != ms ) { + WxShop shop = shopMap.get(ms.getShopId()); + if (null != shop) { + if (!retMap.containsKey(ms.getMerchantId())) { + retMap.put(ms.getMerchantId(),shop.getShopNumber()); + }else { + retMap.put(ms.getMerchantId(),retMap.get(ms.getMerchantId())+","+shop.getShopNumber()); + } + } + } + } + return retMap; + } + return null; + } }