From 29f1c8268e32aee9fb06a3de000e0d39694eb2f1 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 17 Jan 2022 17:54:47 +0800 Subject: [PATCH] =?UTF-8?q?fix=20a=E7=AB=AF=E5=88=B8=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/vo/WxCouponOrderBVo.java | 4 +-- .../impl/WxCouponOrderServiceImpl.java | 28 ++++++++++++------- .../service/park/impl/etcp/EtcpHelper.java | 4 +-- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index 6cd24b570..c0a73e3a1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -162,8 +162,8 @@ public class WxCouponOrderBVo extends WxCouponOrder { private String shopNumber; /**发券商户信息*/ -// @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") -// private List merchantVoList; + @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") + private List merchantVoList; /**发券渠道信息*/ @io.swagger.annotations.ApiModelProperty(value="商户列表",name="channelType") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 207d5a3b9..246a42c03 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -335,7 +335,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { PageInfo couponOrderPage = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() ->wxCouponOrderMapper.findListOfVerifiedByDateForBUser(dateMap)); PageInfo pageInfo = new PageInfo(); - pageInfo.setList(handleToCouponOrderBVoList(tenantEntity,couponOrderPage.getList())); + pageInfo.setList(handleToCouponOrderBVoList(tenantEntity,couponOrderPage.getList(),false,false)); pageInfo.setPageNum(couponOrderPage.getPageNum()); pageInfo.setPageSize(couponOrderPage.getPageSize()); pageInfo.setPages(couponOrderPage.getPages()); @@ -368,7 +368,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { PageInfo couponOrderPage = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() ->wxCouponOrderMapper.findListOfOrderedByDateForBUser(dateMap)); PageInfo pageInfo = new PageInfo(); - pageInfo.setList(handleToCouponOrderBVoList(tenantEntity,couponOrderPage.getList())); + pageInfo.setList(handleToCouponOrderBVoList(tenantEntity,couponOrderPage.getList(),false,false)); pageInfo.setPageNum(couponOrderPage.getPageNum()); pageInfo.setPageSize(couponOrderPage.getPageSize()); pageInfo.setPages(couponOrderPage.getPages()); @@ -376,7 +376,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return pageInfo; } - private List handleToCouponOrderBVoList(TenantEntity tenantEntity,List couponOrderList) { + private List handleToCouponOrderBVoList(TenantEntity tenantEntity,List couponOrderList,boolean hasMerchant,boolean hasShop) { List retList = null; if (null != couponOrderList && couponOrderList.size() > 0 ) { retList = new ArrayList(); @@ -466,10 +466,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } } } + Map> couponMerchantVoMap = null; + if (hasMerchant) { + couponMerchantVoMap = wxMerchantService.findCouponMerchantVoList(couponIdList, tenantEntity,hasShop); + } for (int i = 0 ; i < couponOrderList.size() ; i ++) { WxCouponOrder couponOrder = couponOrderList.get(i); - WxCouponOrderBVo bvo = couponOrdertoBVo(couponOrder,bUserMap,merchantSimpleMap,cUserSimpleMap,couponMap); + WxCouponOrderBVo bvo = couponOrdertoBVo(couponOrder,bUserMap,merchantSimpleMap,cUserSimpleMap,couponMap,hasMerchant,couponMerchantVoMap); if (null != bvo ) { retList.add(bvo); } @@ -478,7 +482,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return retList; } - private WxCouponOrderBVo couponOrdertoBVo(WxCouponOrder couponOrder,Map bUserMap,Map merchantSimpleMap,Map cUserSimpleMap,Map couponMap) { + private WxCouponOrderBVo couponOrdertoBVo(WxCouponOrder couponOrder,Map bUserMap,Map merchantSimpleMap,Map cUserSimpleMap, + Map couponMap,boolean hasMerchant,Map> couponMerchantVoMap) { WxCouponOrderBVo bvo = new WxCouponOrderBVo(); try { BeanUtils.copyProperties(bvo, couponOrder); @@ -511,11 +516,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { bvo.setAutoRefund(coupon.getAutoRefund()); bvo.setBusiness(coupon.getBusiness()); bvo.setSubsidyType(coupon.getSubsidyType()); - - //c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,, + } + if (hasMerchant) { + bvo.setMerchantVoList(couponMerchantVoMap.get(bvo.getCouponId())); } } - bvo.setSubsidyNum(bvo.getSubsidy()); return bvo; } catch (IllegalAccessException e) { @@ -761,7 +766,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } } - Map> couponMerchantVoMap = wxMerchantService.findCouponMerchantVoList(couponIds, tenantEntity,false); + Map> couponMerchantVoMap = null; + if (getMerchant) { + couponMerchantVoMap = wxMerchantService.findCouponMerchantVoList(couponIds, tenantEntity,false); + } List volist = new ArrayList(); for (int i = 0 ; i < couponOrderList.size(); i++){ @@ -1152,7 +1160,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } List couponOrderList = new ArrayList(); couponOrderList.add(couponOrder); - List wxCouponOrderBVoList = handleToCouponOrderBVoList(tenantinfo,couponOrderList); + List wxCouponOrderBVoList = handleToCouponOrderBVoList(tenantinfo,couponOrderList,true,true); if (wxCouponOrderBVoList == null || wxCouponOrderBVoList.size() <= 0 ) return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); return new ResultData(wxCouponOrderBVoList.get(0)); diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java index 43538bd84..c326a17aa 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java @@ -363,9 +363,7 @@ public class EtcpHelper { } // 优先从从商户表里取 - if (null != merchantVo) { - businessId = getETCPBusinessID(merchantVo.getId()); - } + businessId = getETCPBusinessID(merchantVo.getId()); if (StringUtils.isBlank(businessId)) { // 1期只有一个虚拟商户,可以写在商场配置里 businessId = objParams.getString("businessId");