|
|
|
@@ -843,8 +843,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
|
|
|
|
//循环list,获取 cUserId |
|
|
|
List<Long> cUserIdList = new ArrayList<Long>(); |
|
|
|
// List<Long> bUserIdList = new ArrayList<Long>(); |
|
|
|
// List<Long> merchantIdList = 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 ++ ) { |
|
|
|
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<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 ) { |
|
|
|
if (null != merchantIdList && merchantIdList.size() > 0 ) { |
|
|
|
WxMerchant merchantQ = new WxMerchant(); |
|
|
|
merchantQ.updateTenantInfo(tenantEntity); |
|
|
|
// merchantQ.setIds(merchantIdList); |
|
|
|
merchantQ.setIds(merchantIdList); |
|
|
|
List<WxMerchant> 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<Long,WxCoupon> couponMap = new HashMap<Long,WxCoupon>(); |
|
|
|
Map<Long,Long> merchantProductIdMap = new HashMap<Long,Long>(); |
|
|
|
@@ -921,22 +921,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// Map<Long,Long> merchantProductIdMap = new HashMap<Long,Long>(); |
|
|
|
// if (null != merchantIdList && merchantIdList.size() > 0 ) { |
|
|
|
// List<WxMerchantProductVo> 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<Long,WxCUserBasicInfo> cUserMap = new HashMap<Long,WxCUserBasicInfo>(); |
|
|
|
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) { |
|
|
|
|