|
|
|
@@ -843,7 +843,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
|
|
|
|
//循环list,获取 cUserId |
|
|
|
List<Long> cUserIdList = new ArrayList<Long>(); |
|
|
|
List<Long> bUserIdList = new ArrayList<Long>(); |
|
|
|
// List<Long> bUserIdList = new ArrayList<Long>(); |
|
|
|
// List<Long> merchantIdList = new ArrayList<Long>(); |
|
|
|
List<Long> couponIdList = new ArrayList<Long>(); |
|
|
|
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<Long,String> buserPhoneMap = new HashMap<Long,String>(); |
|
|
|
if(bUserIdList.size() > 0){ |
|
|
|
WxMerchantBUser buserQ = new WxMerchantBUser(); |
|
|
|
buserQ.updateTenantInfo(tenantEntity); |
|
|
|
buserQ.setIds(bUserIdList); |
|
|
|
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findSimpleList(buserQ); |
|
|
|
if(null != bUserList && bUserList.size() > 0){ |
|
|
|
for (WxMerchantBUser bUser: bUserList) { |
|
|
|
buserPhoneMap.put(bUser.getId(),bUser.getPhone()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
// Map<Long,String> buserPhoneMap = new HashMap<Long,String>(); |
|
|
|
// if(bUserIdList.size() > 0){ |
|
|
|
// WxMerchantBUser buserQ = new WxMerchantBUser(); |
|
|
|
// buserQ.updateTenantInfo(tenantEntity); |
|
|
|
// buserQ.setIds(bUserIdList); |
|
|
|
// List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findSimpleList(buserQ); |
|
|
|
// if(null != bUserList && bUserList.size() > 0){ |
|
|
|
// for (WxMerchantBUser bUser: bUserList) { |
|
|
|
// buserPhoneMap.put(bUser.getId(),bUser.getPhone()); |
|
|
|
// } |
|
|
|
// } |
|
|
|
// } |
|
|
|
|
|
|
|
Map<Long,String> merchantNameMap = new HashMap<Long,String>(); |
|
|
|
// 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) { |
|
|
|
|