|
|
|
@@ -727,8 +727,11 @@ public class WxCouponServiceImpl implements WxCouponService { |
|
|
|
throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND.getCode(),"所属商户为空"); |
|
|
|
} |
|
|
|
Map<TenantEntity,String> retMap = new HashMap<TenantEntity,String>(); |
|
|
|
String[] mallTenantIds = new String[tenantMerchantParamList.size()]; |
|
|
|
int i = 0; |
|
|
|
for (JSONObject o:tenantMerchantParamList) { |
|
|
|
String mallTenantId = o.getString("tenantId"); |
|
|
|
mallTenantIds[i] = mallTenantId; |
|
|
|
String mallParentTenantId = record.getTenantId(); |
|
|
|
String mallMerchantParams = o.getString("mallMerchantParams"); |
|
|
|
TenantEntity mallTenantEntity = new TenantEntity(); |
|
|
|
@@ -739,7 +742,9 @@ public class WxCouponServiceImpl implements WxCouponService { |
|
|
|
record.setBusiness(EnumBusiness.BUSINESS_ID6.getCode()); |
|
|
|
} |
|
|
|
retMap.put(mallTenantEntity, mallMerchantParams); |
|
|
|
i++; |
|
|
|
} |
|
|
|
record.setMallTenantIds(mallTenantIds); |
|
|
|
return retMap; |
|
|
|
}else { |
|
|
|
if (check) { |
|
|
|
@@ -755,6 +760,7 @@ public class WxCouponServiceImpl implements WxCouponService { |
|
|
|
TenantEntity tenantEntity = new TenantEntity(); |
|
|
|
tenantEntity.updateTenantInfo(record); |
|
|
|
retMap.put(tenantEntity, record.getMerchantParams()); |
|
|
|
record.setMallTenantIds(new String[]{tenantEntity.getTenantId()}); |
|
|
|
return retMap; |
|
|
|
} |
|
|
|
} |
|
|
|
|