Browse Source

/。 卷订单商户

release_toaliyun_real
xhxu 4 years ago
parent
commit
e4e97278c6
1 changed files with 9 additions and 8 deletions
  1. +9
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 9
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -843,7 +843,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
//循环list,获取 cUserId //循环list,获取 cUserId
List<Long> cUserIdList = new ArrayList<Long>(); List<Long> cUserIdList = new ArrayList<Long>();
List<Long> merchantIdList = new ArrayList<Long>();
// List<Long> merchantIdList = new ArrayList<Long>();
List<Long> couponIdList = new ArrayList<Long>(); List<Long> couponIdList = new ArrayList<Long>();
for (int i = 0 ; i < list.size() ; i ++ ) { for (int i = 0 ; i < list.size() ; i ++ ) {
WxCouponOrder bo = list.get(i); WxCouponOrder bo = list.get(i);
@@ -851,10 +851,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
if (null != cusrid && (!cUserIdList.contains(cusrid))) { if (null != cusrid && (!cUserIdList.contains(cusrid))) {
cUserIdList.add(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(); Long couponId = bo.getCouponId();
if (null != couponId && (!couponIdList.contains(couponId))) { if (null != couponId && (!couponIdList.contains(couponId))) {
couponIdList.add(couponId); couponIdList.add(couponId);
@@ -862,7 +862,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
} }
Map<Long,String> merchantNameMap = new HashMap<Long,String>(); Map<Long,String> merchantNameMap = new HashMap<Long,String>();
if (null != merchantIdList && merchantIdList.size() > 0 ) {
// if (null != merchantIdList && merchantIdList.size() > 0 ) {
WxMerchant merchantQ = new WxMerchant(); WxMerchant merchantQ = new WxMerchant();
merchantQ.updateTenantInfo(tenantEntity); merchantQ.updateTenantInfo(tenantEntity);
// merchantQ.setIds(merchantIdList); // merchantQ.setIds(merchantIdList);
@@ -873,7 +873,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
merchantNameMap.put(m.getId(), m.getName()); merchantNameMap.put(m.getId(), m.getName());
} }
} }
}
// }
Map<Long,WxCoupon> couponMap = new HashMap<Long,WxCoupon>(); Map<Long,WxCoupon> couponMap = new HashMap<Long,WxCoupon>();
Map<Long,Long> merchantProductIdMap = new HashMap<Long,Long>(); Map<Long,Long> merchantProductIdMap = new HashMap<Long,Long>();
@@ -962,7 +962,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
co.setSubsidyNum(co.getSubsidy()); co.setSubsidyNum(co.getSubsidy());


if(co.getMerchantId() == null){
if(co.getBMerchantId() == null){
Long merchanId = merchantProductIdMap.get(co.getCouponId()); Long merchanId = merchantProductIdMap.get(co.getCouponId());
if (null != merchanId) { if (null != merchanId) {
if (merchanId == -999L) { if (merchanId == -999L) {
@@ -975,6 +975,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
} }
}else{ }else{
co.setMerchantName(merchantNameMap.get(co.getMerchantId())); co.setMerchantName(merchantNameMap.get(co.getMerchantId()));
co.setMerchantId(co.getBMerchantId());
} }




Loading…
Cancel
Save