diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 2cb8312a0..193c85f17 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -57,7 +57,8 @@ public class WxMerchantController extends BaseController { @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) @SystemControllerLog(description = "商户-列表") public ResultData list(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java index 62e4fc38e..a36bf3942 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -62,12 +62,12 @@ public class WxCouponSendController extends BaseController { } @ApiOperation("商户注券") - @GetMapping("/handsel") + @GetMapping("/handSel") @ApiImplicitParams({ @ApiImplicitParam(name = "wxCouponSendId", value = "wxCouponSendId", dataType = "long", paramType = "query",required = true), @ApiImplicitParam(name = "cUserId", value = "用户ID", dataType = "long", paramType = "query",required = true), }) - public ResultData handsel(Long[] wxCouponSendIds,Long cUserId) { + public ResultData handSel(Long[] wxCouponSendIds,Long cUserId) { if(ArrayUtils.isEmpty(wxCouponSendIds)||Objects.isNull(cUserId)) { throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 867517dca..98674c0e9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -4,6 +4,8 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import com.iformall.domain.vo.WxShopVo; import com.iformall.enums.EnumBusiness; import com.iformall.enums.EnumSubBusiness; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -25,7 +27,8 @@ import java.util.stream.Collectors; public class WxMerchant extends BaseEntity { @Id protected Long id; - + + @ApiModelProperty(name = "ids", value = "商户ID数组") @Transient protected List ids;