From d4d842a8985a378aee3f9de5509fb955705e9542 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 17 Apr 2022 18:47:49 +0800 Subject: [PATCH] //update test --- .../main/java/com/iformall/domain/po/TtMerchantPoi.java | 4 ++-- .../iformall/service/impl/TtMerchantPoiServiceImpl.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java b/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java index 610e6f829..c30c9431e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java @@ -115,8 +115,8 @@ public class TtMerchantPoi extends TenantEntity { public String getTtPath(){ JsonObject object = new JsonObject(); - // if(!merchantPoi.getTenantId().equals(id.toString())){ - if(id != null && id != 1038){ + if(id != null && !id.toString().equals(getTenantId())){ +// if(id != null && id != 1038){ object.addProperty("type","md"); object.addProperty("id",id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java index 862d08c35..676c7bcfe 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java @@ -249,8 +249,8 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService { String introduction = ""; Integer businessId = EnumBusiness.BUSINESS_ID1.getCode(); -// if(merchantPoi.getTenantId().equals(id.toString())){ - if(merchantPoi.getId() == 1038){ + if(merchantPoi.getTenantId().equals(id.toString())){ +// if(merchantPoi.getId() == 1038){ WxMall mall = wxMallMapper.getByTenantId(merchantPoi.getTenantId()); contactTel = mall.getServicePhone(); images.add(mall.getImg()); @@ -493,8 +493,8 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"卷类型不支持同步poi"); } List list = new ArrayList<>(); -// TtMerchantPoi merchantPoi = ttMerchantPoiMapper.selectById(Long.parseLong(tenantInfo.getTenantId())); - TtMerchantPoi merchantPoi = ttMerchantPoiMapper.selectById(Long.parseLong("1038")); + TtMerchantPoi merchantPoi = ttMerchantPoiMapper.selectById(Long.parseLong(tenantInfo.getTenantId())); +// TtMerchantPoi merchantPoi = ttMerchantPoiMapper.selectById(Long.parseLong("1038")); list.add(merchantPoi); List merchantIds = wxCouponMerchantMapper.findMerchantIdListByProduct(coupon.getId(), tenantInfo.getTenantId());