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 ab0343d1d..eb714c537 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -156,8 +156,27 @@ public class WxCouponOrderBVo extends WxCouponOrder { @Excel(name = "b端核销手机号", width = 50, orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="b端核销手机号",name="bUserPhone") private String bUserPhone; + + public String getbMerchantName() { + return bMerchantName; + } + + public void setbMerchantName(String bMerchantName) { + this.bMerchantName = bMerchantName; + } + + public String getbmerchantName() { + return bMerchantName; + } + + public void setbmerchantName(String bMerchantName) { + this.bMerchantName = bMerchantName; + } + + private String bMerchantName; + @Excel(name = "所属商户", width = 50, orderNum = "3") - @io.swagger.annotations.ApiModelProperty(value="使用券商户名",name="merchantName") + @io.swagger.annotations.ApiModelProperty(value="所属商户",name="merchantName") private String merchantName; @TableField(exist = false) private List bUserIdList; 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 5516e0d17..b65192d24 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -493,11 +493,18 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { if (null != b) { bvo.setbUserName(b.getName()); bvo.setbUserPhone(b.getPhone()); - WxMerchant merchant = merchantSimpleMap.get(b.getMerchantId()); - if (null != merchant) { - bvo.setMerchantName(merchant.getName()); - bvo.setMerchantId(merchant.getId()); - } +// WxMerchant merchant = merchantSimpleMap.get(b.getMerchantId()); +// if (null != merchant) { +// bvo.setMerchantName(merchant.getName()); +// bvo.setMerchantId(merchant.getId()); +// } + } + } + if (null != bvo.getBMerchantId()) { + WxMerchant merchant = merchantSimpleMap.get(bvo.getBMerchantId()); + if (null != merchant) { + bvo.setbMerchantName(merchant.getName()); +// bvo.setVerifyMerchantName(merchant.getName()); } } if (null != bvo.getCUserId()) { @@ -841,8 +848,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { private List handleQueryResult(boolean cUserEntry,List list,TenantEntity tenantEntity) { if (null != list && list.size() > 0) { - - + //循环list,获取 cUserId List cUserIdList = new ArrayList(); List bUserIdList = new ArrayList(); @@ -965,22 +971,22 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { co.setSourceType(coupon.getSourceType()); } - co.setSubsidyNum(co.getSubsidy()); - - if(co.getBMerchantId() == null){ - Long merchanId = merchantProductIdMap.get(co.getCouponId()); - if (null != merchanId) { - if (merchanId == -999L) { - co.setMerchantName("多商户通用"); - co.setMerchantId(0L); - }else { - co.setMerchantName(merchantNameMap.get(merchanId)); - co.setMerchantId(merchanId); - } + co.setSubsidyNum(co.getSubsidy()); + + Long merchanId = merchantProductIdMap.get(co.getCouponId()); + if (null != merchanId) { + if (merchanId == -999L) { + co.setMerchantName("多商户通用"); + co.setMerchantId(0L); + }else { + co.setMerchantName(merchantNameMap.get(merchanId)); + co.setMerchantId(merchanId); } - }else{ - co.setMerchantName(merchantNameMap.get(co.getBMerchantId())); - co.setMerchantId(co.getBMerchantId()); + } + + if(co.getBMerchantId() != null){ + co.setbMerchantName(merchantNameMap.get(co.getBMerchantId())); + co.setVerifyMerchantName(merchantNameMap.get(co.getBMerchantId())); } @@ -994,11 +1000,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { co.setUserNickName("保密"); } } - - Long bMechantId = co.getBMerchantId(); - if (null != bMechantId) { - co.setVerifyMerchantName(merchantNameMap.get(bMechantId)); - } + //co.setChannelType();) if(null != co.getBUserId()){ WxMerchantBUser buser = buserPhoneMap.get(co.getBUserId());