diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 1e12aa436..c3eff8bf9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -250,12 +250,23 @@ public class WxCouponController extends BaseController { return result; } + @TenantIgnore + @ApiOperation("根据id查询接口") + @GetMapping("/findDraftCoupon") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "券投放-查询") + public ResultData findDraftCoupon(@RequestParam Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponController::findDraftCoupon"); + TenantEntity tenantEntity = getTenantInfo(); + return new ResultData(wxCouponService.getDraftCoupon(id,tenantEntity.getTenantId(),tenantEntity)); + } + @TenantIgnore @ApiOperation("根据id更新接口") - @PostMapping("updateOnlie") + @PostMapping("updateByOnlie") @SystemControllerLog(description = "券投放-更新") - public ResultData updateOnlie(@RequestBody WxCoupon wxCoupon) { - logger.debug("[" + getIpAddr() + "] WxCouponController::update"); + public ResultData updateByOnlie(@RequestBody WxCoupon wxCoupon) { + logger.debug("[" + getIpAddr() + "] WxCouponController::updateByOnlie"); if (wxCoupon.getId() == null) { return new ResultData(ResultData.ERROR, "缺少id"); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 23c0d19e1..816fbaa05 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -129,4 +129,6 @@ public interface WxCouponMapper extends CommonMapper { WxCoupon selectDraftCoupon(@Param("couponId")Long id,@Param("tenantId")String tenantId); WxCoupon selectOnlineCoupon(@Param("id")Long id, @Param("tenantId")String tenantId); + + Long selectDraftId(@Param("couponId")Long id,@Param("tenantId")String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 29c254f86..4c780f1b2 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; @@ -314,4 +315,6 @@ public interface WxCouponService { void handleDraftCoupon(WxCoupon wxCoupon); + WxCouponCVo getDraftCoupon(Long couponId, String tenantId, TenantEntity mallTenantEntity); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 772939c16..7db0fe75f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -2208,5 +2208,15 @@ public class WxCouponServiceImpl implements WxCouponService { } + @Override + public WxCouponCVo getDraftCoupon(Long couponId, String tenantId, TenantEntity mallTenantEntity) { + Long id = wxCouponMapper.selectDraftId(couponId,tenantId); + if(id != null){ + return getVoById(id,tenantId,mallTenantEntity); + }else{ + return getVoById(couponId,tenantId,mallTenantEntity); + } + } + } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 0ee7913cc..cf8c72338 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -1614,4 +1614,11 @@ where id = #{id} and tenant_id = #{tenantId} + + +