From 549865ade6921571df1138a21445e24f5189d50d Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 25 Oct 2022 11:05:33 +0800 Subject: [PATCH] //plan --- .../com/iformall/service/impl/TtCouponGoodsServiceImpl.java | 3 ++- .../java/com/iformall/service/impl/WxMerchantServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java index 51f0b71b8..642648d43 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -615,6 +615,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { if(record.getTakeRate() > rateMax){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"分佣率超过最大值("+rateMax+")"); } + Long spu_id = Long.parseLong(ttCouponChannelPoi.getSpuId()); TtWebService ttWebService = ttMerchantPoiService.getTtWebService(record); Long returnPlanId = null; PoiOrientedPlan poiPlan = new PoiOrientedPlan(); @@ -630,7 +631,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { } List productList = new ArrayList<>(); PoiOrientedPlan.ProductRate product = new PoiOrientedPlan.ProductRate(); - product.setProductId(record.getCouponId()); + product.setProductId(spu_id); product.setCommissionRate(record.getTakeRate()); productList.add(product); poiPlan.setProductList(productList); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index ef1b4a67b..07d0f9d18 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -998,7 +998,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public boolean hasMerchant(WxMerchant wxMerchant) { -// wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); + wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); return wxMerchantMapper.hasMerchant(wxMerchant) > 0 ? true : false; }