From 564a5d5dcc8e50fdac149f1b7549de248ec0dd74 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 16 May 2022 17:13:29 +0800 Subject: [PATCH] =?UTF-8?q?//=E5=85=88=E5=B1=8F=E8=94=BD=E5=88=B8=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=20B=E7=AB=AF=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/vo/WxCouponOrderBVo.java | 2 +- .../impl/WxCouponOrderServiceImpl.java | 40 +++++++++---------- 2 files changed, 21 insertions(+), 21 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 f10ef9e0b..9910962d6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -152,7 +152,7 @@ public class WxCouponOrderBVo extends WxCouponOrder { public void setbuserPhone(String bUserPhone) { this.bUserPhone = bUserPhone; } - @Excel(name = "商户操作人", width = 50, orderNum = "5") +// @Excel(name = "商户操作人", width = 50, orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") private String bUserPhone; @Excel(name = "所属商户", width = 50, orderNum = "3") 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 e8de5dc6c..e1bd7fdf0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -843,7 +843,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { //循环list,获取 cUserId List cUserIdList = new ArrayList(); - List bUserIdList = new ArrayList(); +// List bUserIdList = new ArrayList(); // List merchantIdList = new ArrayList(); List couponIdList = new ArrayList(); for (int i = 0 ; i < list.size() ; i ++ ) { @@ -852,10 +852,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { if (null != cusrid && (!cUserIdList.contains(cusrid))) { cUserIdList.add(cusrid); } - Long bUserId = bo.getBUserId(); - if(null != bUserId && (!bUserIdList.contains(bUserId))){ - bUserIdList.add(bUserId); - } +// Long bUserId = bo.getBUserId(); +// if(null != bUserId && (!bUserIdList.contains(bUserId))){ +// bUserIdList.add(bUserId); +// } // Long bmerchantId = bo.getBMerchantId(); // if (null != bmerchantId && (!merchantIdList.contains(bmerchantId))) { @@ -867,18 +867,18 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } } - Map buserPhoneMap = new HashMap(); - if(bUserIdList.size() > 0){ - WxMerchantBUser buserQ = new WxMerchantBUser(); - buserQ.updateTenantInfo(tenantEntity); - buserQ.setIds(bUserIdList); - List bUserList = wxMerchantBUserMapper.findSimpleList(buserQ); - if(null != bUserList && bUserList.size() > 0){ - for (WxMerchantBUser bUser: bUserList) { - buserPhoneMap.put(bUser.getId(),bUser.getPhone()); - } - } - } +// Map buserPhoneMap = new HashMap(); +// if(bUserIdList.size() > 0){ +// WxMerchantBUser buserQ = new WxMerchantBUser(); +// buserQ.updateTenantInfo(tenantEntity); +// buserQ.setIds(bUserIdList); +// List bUserList = wxMerchantBUserMapper.findSimpleList(buserQ); +// if(null != bUserList && bUserList.size() > 0){ +// for (WxMerchantBUser bUser: bUserList) { +// buserPhoneMap.put(bUser.getId(),bUser.getPhone()); +// } +// } +// } Map merchantNameMap = new HashMap(); // if (null != merchantIdList && merchantIdList.size() > 0 ) { @@ -1009,9 +1009,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { co.setVerifyMerchantName(merchantNameMap.get(bMechantId)); } //co.setChannelType();) - if(null != co.getBUserId()){ - co.setbUserPhone(buserPhoneMap.get(co.getBUserId())); - } +// if(null != co.getBUserId()){ +// co.setbUserPhone(buserPhoneMap.get(co.getBUserId())); +// } retList.add(co); } catch (IllegalAccessException e) {