From d7359e52ce79bdcf09eceb19b725ce37304468fe Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 27 May 2022 10:54:53 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=B8=E5=AF=BC=E5=87=BA=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/vo/WxCouponOrderBVo.java | 4 +- .../impl/WxCouponOrderServiceImpl.java | 74 ++++++++----------- 2 files changed, 31 insertions(+), 47 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 9910962d6..be8ab6571 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -152,8 +152,8 @@ public class WxCouponOrderBVo extends WxCouponOrder { public void setbuserPhone(String bUserPhone) { this.bUserPhone = bUserPhone; } -// @Excel(name = "商户操作人", width = 50, orderNum = "5") - @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") + @Excel(name = "b端核销手机号", width = 50, orderNum = "5") + @io.swagger.annotations.ApiModelProperty(value="b端核销手机号",name="bUserPhone") private String bUserPhone; @Excel(name = "所属商户", width = 50, orderNum = "3") @io.swagger.annotations.ApiModelProperty(value="使用券商户名",name="merchantName") 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 e1bd7fdf0..873d5a6e5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -843,8 +843,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { //循环list,获取 cUserId List cUserIdList = new ArrayList(); -// List bUserIdList = new ArrayList(); -// List merchantIdList = new ArrayList(); + List bUserIdList = new ArrayList(); + List merchantIdList = new ArrayList(); List couponIdList = new ArrayList(); for (int i = 0 ; i < list.size() ; i ++ ) { WxCouponOrder bo = list.get(i); @@ -852,39 +852,39 @@ 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 bmerchantId = bo.getBMerchantId(); -// if (null != bmerchantId && (!merchantIdList.contains(bmerchantId))) { -// merchantIdList.add(bmerchantId); -// } + Long bUserId = bo.getBUserId(); + if(null != bUserId && (!bUserIdList.contains(bUserId))){ + bUserIdList.add(bUserId); + } + + Long bmerchantId = bo.getBMerchantId(); + if (null != bmerchantId && (!merchantIdList.contains(bmerchantId))) { + merchantIdList.add(bmerchantId); + } Long couponId = bo.getCouponId(); if (null != couponId && (!couponIdList.contains(couponId))) { couponIdList.add(couponId); } } -// 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 ) { + if (null != merchantIdList && merchantIdList.size() > 0 ) { WxMerchant merchantQ = new WxMerchant(); merchantQ.updateTenantInfo(tenantEntity); -// merchantQ.setIds(merchantIdList); + merchantQ.setIds(merchantIdList); List merchantList = wxMerchantMapper.findIdNameList(merchantQ); if (null != merchantList) { for (int i = 0 ; i < merchantList.size() ; i ++) { @@ -892,7 +892,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { merchantNameMap.put(m.getId(), m.getName()); } } -// } + } Map couponMap = new HashMap(); Map merchantProductIdMap = new HashMap(); @@ -921,22 +921,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } } -// Map merchantProductIdMap = new HashMap(); -// if (null != merchantIdList && merchantIdList.size() > 0 ) { -// List merchantProductVos = wxCouponMerchantMapper.findMerchantProduct(tenantEntity.getTenantId(), couponIdList); -// if (null != merchantProductVos) { -// for (int i = 0 ; i < merchantProductVos.size(); i ++) { -// WxMerchantProductVo mp = merchantProductVos.get(i); -// if (mp.getMc() > 1) { -// merchantProductIdMap.put(mp.getProductId(), -999L); -// }else { -// merchantProductIdMap.put(mp.getProductId(), mp.getMerchantId()); -// } -// } -// } -// } - - Map cUserMap = new HashMap(); if (cUserIdList.size() > 0) { WxCUserBasicInfo cUserBasicInfoQ = new WxCUserBasicInfo(); @@ -1009,9 +993,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) {