瀏覽代碼

Merge branch 'release_toaliyun_real_push_order' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_push_order

release_toaliyun_real
lin 3 年之前
父節點
當前提交
1400d92ebc
共有 4 個文件被更改,包括 16 次插入9 次删除
  1. +12
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/douyin/web/api/TtWebPoiPlanService.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebPoiPlanServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java

+ 12
- 5
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<String, Object> 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(),"状态值为空");


+ 1
- 1
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 ;

/**
* 修改通用佣金计划状态


+ 2
- 2
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


+ 1
- 1
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{


Loading…
取消
儲存