From d703464612f470d0893ace3b7e2875278de509dd Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 28 Jun 2022 18:24:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?//tt=20=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/TtPoiPlanController.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java index 4a08f2184..586e2883e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java @@ -16,6 +16,7 @@ import com.iformall.service.TtGoodsCategoryService; import com.iformall.service.TtMerchantPoiService; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -73,12 +74,17 @@ public class TtPoiPlanController extends BaseController { if(contentType.intValue() < 1 || contentType.intValue() > 3){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"带货场景不合法"); } - Long planId = (Long) param.get("planId"); + String planIdStr = (String) param.get("planId"); + Long planId = null; + if(StringUtils.isNotBlank(planIdStr)){ + planId = Long.parseLong(planIdStr); + } - Long couponId = (Long) param.get("couponId"); - if(couponId == null){ + String couponIdStr = (String) param.get("couponId"); + if(StringUtils.isBlank(couponIdStr)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"商品Id为空"); } + Long couponId = Long.parseLong(couponIdStr); return ttCouponGoodsService.poiPlanSave(getTenantInfo(),couponId,planId,contentType,commissionRate); } @@ -88,10 +94,11 @@ public class TtPoiPlanController extends BaseController { @SystemControllerLog(description = "更新") public ResultData updateStatus(@RequestBody Map param) { logger.debug("[" + getIpAddr() + "] TtMerchantPoiController::updateStatus"); - Long planId = (Long) param.get("planId"); - if(planId == null){ + String planIdStr = (String) param.get("planId"); + if(StringUtils.isBlank(planIdStr)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"计划ID为空"); } + Long planId = Long.parseLong(planIdStr); Integer status = (Integer) param.get("status"); if(status == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"状态值为空"); From 1cb4e31268adb509a6d43da1fc7c6baab083ccbc Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 28 Jun 2022 18:32:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?//tt=20=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/douyin/web/api/TtWebPoiPlanService.java | 2 +- .../iformall/douyin/web/api/impl/TtWebPoiPlanServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/TtWebPoiPlanService.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/TtWebPoiPlanService.java index 205735f3d..88ddfdd1e 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/web/api/TtWebPoiPlanService.java +++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/TtWebPoiPlanService.java @@ -56,7 +56,7 @@ public interface TtWebPoiPlanService { /** * 发布/修改通用佣金计划 */ - Integer poiPlanSave(PoiPlan poiPlan) throws WxErrorException ; + Long poiPlanSave(PoiPlan poiPlan) throws WxErrorException ; /** * 修改通用佣金计划状态 diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebPoiPlanServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebPoiPlanServiceImpl.java index afb48e43f..c8ee458a5 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebPoiPlanServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebPoiPlanServiceImpl.java @@ -36,11 +36,11 @@ public class TtWebPoiPlanServiceImpl implements TtWebPoiPlanService { } @Override - public Integer poiPlanSave(PoiPlan poiPlan) throws WxErrorException { + public Long poiPlanSave(PoiPlan poiPlan) throws WxErrorException { final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); String result = this.service.execute(executor, this.POI_COMMON_PLAN_SAVE, GSON.toJson(poiPlan)); JSONObject jsonObject = JSONObject.parseObject(result); - return jsonObject.getInteger("plan_id"); + return jsonObject.getLong("plan_id"); } @Override From 0a8248b0cfac22c8efc2ab71b8c43d0b39c8f552 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 28 Jun 2022 18:35:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?//tt=20=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/TtCouponGoodsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 546ce29f7..54c8fa48e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -491,7 +491,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { poiPlan.setContentType(contentType); poiPlan.setCommissionRate(commissionRate); - Integer returnPlanId = ttMerchantPoiService.getTtWebService(tenantInfo).getPoiPlanService().poiPlanSave(poiPlan); + Long returnPlanId = ttMerchantPoiService.getTtWebService(tenantInfo).getPoiPlanService().poiPlanSave(poiPlan); if(returnPlanId != null){ return new ResultData(returnPlanId); }else{