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 8c52f985c..baf6337fc 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 merchantIdList = new ArrayList(); +// List merchantIdList = new ArrayList(); List couponIdList = new ArrayList(); for (int i = 0 ; i < list.size() ; i ++ ) { WxCouponOrder bo = list.get(i); @@ -851,10 +851,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { if (null != cusrid && (!cUserIdList.contains(cusrid))) { cUserIdList.add(cusrid); } - Long bmerchantId = bo.getBMerchantId(); - if (null != bmerchantId && (!merchantIdList.contains(bmerchantId))) { - merchantIdList.add(bmerchantId); - } +// 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); @@ -862,7 +862,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } 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); @@ -873,7 +873,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { merchantNameMap.put(m.getId(), m.getName()); } } - } +// } Map couponMap = new HashMap(); Map merchantProductIdMap = new HashMap(); @@ -962,7 +962,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { co.setSubsidyNum(co.getSubsidy()); - if(co.getMerchantId() == null){ + if(co.getBMerchantId() == null){ Long merchanId = merchantProductIdMap.get(co.getCouponId()); if (null != merchanId) { if (merchanId == -999L) { @@ -975,6 +975,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } }else{ co.setMerchantName(merchantNameMap.get(co.getMerchantId())); + co.setMerchantId(co.getBMerchantId()); }