From b66e5a6fb63e693607743b5a420284cab86f52bd Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 14 May 2019 10:21:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[code=E6=95=B4=E7=90=86][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E6=B3=A8=E9=87=8A=E6=B7=BB=E5=8A=A0=EF=BC=8Ccode=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/WxAppinfoController.java | 47 ------------ .../controller/market/UeditorController.java | 2 + .../market/WxCardPayController.java | 2 +- .../market/WxChannelController.java | 2 + .../market/WxCouponActionLogController.java | 2 + .../market/WxCouponCarController.java | 2 + .../market/WxCouponInjectController.java | 2 +- .../market/WxCouponSendConfigController.java | 2 +- .../market/WxCouponSendController.java | 2 + .../market/WxCouponTypeController.java | 75 ------------------- .../controller/market/WxGameController.java | 2 + .../market/WxGameTemplateController.java | 2 + .../market/WxMerchantMicroPayController.java | 2 + .../market/WxMerchantSubsidyController.java | 2 +- .../controller/market/WxOrderController.java | 2 + .../market/WxOrderGroupController.java | 2 +- .../market/WxPayOrderController.java | 2 + .../WxProfitSharingOrderController.java | 2 + .../market/WxRefundOrderController.java | 2 + .../market/WxSubsidyController.java | 2 +- .../market/WxUserCouponController.java | 2 + .../basic}/WxPayAccountController.java | 4 +- 22 files changed, 35 insertions(+), 129 deletions(-) delete mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponTypeController.java rename {mallinkAdmin/src/main/java/com/iformall/controller/market => mallinkSysAdmin/src/main/java/com/iformall/controller/basic}/WxPayAccountController.java (96%) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index 133f7ea0e..25a4b48ed 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -46,53 +46,6 @@ public class WxAppinfoController extends BaseController { @Autowired private FmOpenService openService; - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData list(@ModelAttribute WxAppinfo wxAppinfo, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxAppinfoController::list"); - if (null == wxAppinfo) wxAppinfo = new WxAppinfo(); - final PageInfo page = wxAppinfoService.listAsPage(wxAppinfo, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxAppinfo wxAppinfo) { - logger.debug("[" + getIpAddr() + "] WxAppinfoController::add"); - //Assert.notNull(wxAppinfo.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxAppinfoService.saveOrUpdate(wxAppinfo); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxAppinfo wxAppinfo) { - logger.debug("[" + getIpAddr() + "] WxAppinfoController::update"); - wxAppinfoService.saveOrUpdate(wxAppinfo); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData delete(Long id) { - logger.debug("[" + getIpAddr() + "] WxAppinfoController::delete"); - wxAppinfoService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData findById(Long id) { - logger.debug("[" + getIpAddr() + "] WxAppinfoController::findById"); - return new ResultData(Result.SUCCESS, "查询成功", wxAppinfoService.getById(id)); - } - @ApiOperation(value = "下载二维码", produces="application/json;charset=UTF-8", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}") @PostMapping("/downQrCode") public void downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map params) throws MallinkException { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/UeditorController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/UeditorController.java index 17d8e7da6..ddda9aa8c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/UeditorController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/UeditorController.java @@ -1,6 +1,7 @@ package com.iformall.controller.market; import com.iformall.ueditor.ActionEnter; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletRequest; @RestController @RequestMapping("/ue") +@Api(description = "网页bannner图接口") public class UeditorController { @Autowired diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index c0b94897d..33039e32b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -34,8 +34,8 @@ import java.util.Map; * @author Stormeye Wu wuguoqiang@iformall.com */ @RestController -@Api(description = "C端扫B端商户码储值卡支付") @RequestMapping("cardPay") +@Api(description = "储值卡支付-C端扫B端商户码") public class WxCardPayController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxChannelController.java index 8450263c3..c2b97e875 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxChannelController.java @@ -7,6 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxChannel; import com.iformall.service.WxChannelService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxChannel") +@Api(description = "渠道") public class WxChannelController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java index 9241022b2..d91331bf0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java @@ -7,6 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCouponActionLog; import com.iformall.service.WxCouponActionLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxCouponActionLog") +@Api(description = "发券行为记录接口") public class WxCouponActionLogController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponCarController.java index 6509170e2..126136908 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponCarController.java @@ -7,6 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCouponCar; import com.iformall.service.WxCouponCarService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxCouponCar") +@Api(description = "停车券接口") public class WxCouponCarController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java index 37b0fb521..b01369437 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java @@ -20,9 +20,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -@Api(description = "精准投放接口") @RestController @RequestMapping("couponInject") +@Api(description = "精准投放接口") public class WxCouponInjectController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java index b617146d2..b3b4558a8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java @@ -18,7 +18,7 @@ import java.util.Date; @RestController @RequestMapping("wxCouponSendConfig") -@Api(description = "停车发券和核销发劵接口") +@Api(description = "注劵配置接口") public class WxCouponSendConfigController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java index 6a9903c7c..9dea041d1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java @@ -15,6 +15,7 @@ import com.iformall.enums.EnumCouponStatus; import com.iformall.service.WxCouponActionLogService; import com.iformall.service.WxCouponSendService; import com.iformall.service.WxCouponService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -27,6 +28,7 @@ import java.util.Date; @RestController @RequestMapping("wxCouponSend") +@Api(description = "注劵接口") public class WxCouponSendController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponTypeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponTypeController.java deleted file mode 100644 index 26115285d..000000000 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponTypeController.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.iformall.controller.market; - -import com.github.pagehelper.PageInfo; -import com.iformall.common.Result; -import com.iformall.common.ResultData; -import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.WxCouponType; -import com.iformall.service.WxCouponTypeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("wxCouponType") -@Api(description = "优惠券类型相关接口") -public class WxCouponTypeController extends BaseController { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private WxCouponTypeService wxCouponTypeService; - - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData list(@ModelAttribute WxCouponType wxCouponType, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxCouponTypeController::list"); - if (null == wxCouponType) wxCouponType = new WxCouponType(); - final PageInfo page = wxCouponTypeService.listAsPage(wxCouponType, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCouponType wxCouponType) { - logger.debug("[" + getIpAddr() + "] WxCouponTypeController::add"); - //Assert.notNull(wxCouponType.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCouponTypeService.saveOrUpdate(wxCouponType); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCouponType wxCouponType) { - logger.debug("[" + getIpAddr() + "] WxCouponTypeController::update"); - wxCouponTypeService.saveOrUpdate(wxCouponType); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData delete(Long id) { - logger.debug("[" + getIpAddr() + "] WxCouponTypeController::delete"); - wxCouponTypeService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData findById(Long id) { - logger.debug("[" + getIpAddr() + "] WxCouponTypeController::findById"); - return new ResultData(Result.SUCCESS, "查询成功", wxCouponTypeService.getById(id)); - } - - -} diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java index 77211d328..691ee6608 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java @@ -9,6 +9,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxGame; import com.iformall.enums.EnumGameStatus; import com.iformall.service.WxGameService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxGame") +@Api(description = "游戏接口") public class WxGameController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameTemplateController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameTemplateController.java index ba9ce4156..8e6a74e8b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameTemplateController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameTemplateController.java @@ -7,6 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxGameTemplate; import com.iformall.service.WxGameTemplateService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -19,6 +20,7 @@ import java.util.List; @RestController @RequestMapping("wxGameTemplate") +@Api(description = "游戏模板接口") public class WxGameTemplateController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java index 461ff567e..9d9e785b1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java @@ -9,6 +9,7 @@ import com.iformall.domain.vo.WxMerchantMicroPayVo; import com.iformall.enums.EnumOrderStatus; import com.iformall.enums.EnumOrderType; import com.iformall.service.MarkingDataReportService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxMerchantMicroPay") +@Api(description = "B端收银台相关接口") public class WxMerchantMicroPayController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java index e4d21065a..5fc1196b3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.Map; @RestController -@Api(description = "商户补贴接口") @RequestMapping("subsidy") +@Api(description = "商户补贴接口") public class WxMerchantSubsidyController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index ac85b8082..94f650aed 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -20,6 +20,7 @@ import com.iformall.service.WxCUserService; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; import com.iformall.service.WxOrderService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -34,6 +35,7 @@ import java.util.Map; @RestController @RequestMapping("wxOrder") +@Api(description = "订单相关接口") public class WxOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java index 4aa0e5199..2c17284f9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/orderGroup") -@Api(description = "拼团接口") +@Api(description = "拼团相关接口") public class WxOrderGroupController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java index eb65c0820..1d4b3f80d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java @@ -12,6 +12,7 @@ import com.iformall.enums.EnumPayStatus; import com.iformall.exception.MallinkException; import com.iformall.service.WxOrderService; import com.iformall.service.WxPayOrderService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -25,6 +26,7 @@ import java.util.Map; @RestController @RequestMapping("wxPayOrder") +@Api(description = "支付订单接口") public class WxPayOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java index a75aaf418..4b3ac8cc4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java @@ -7,6 +7,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.vo.WxProfitSharingOrderQueryVo; import com.iformall.domain.vo.WxProfitSharingOrderVo; import com.iformall.service.WxProfitSharingOrderService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -22,6 +23,7 @@ import java.util.Map; */ @RestController @RequestMapping("wxProfitSharingOrder") +@Api(description = "微信分账订单接口") public class WxProfitSharingOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java index b0573d90d..64bd560e6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java @@ -2,6 +2,7 @@ package com.iformall.controller.market; import com.iformall.annotation.SystemControllerLog; import com.iformall.controller.base.BaseController; +import io.swagger.annotations.Api; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -19,6 +20,7 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("/refund") +@Api(description = "微信退款订单接口") public class WxRefundOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java index 757247697..f28cad4a4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java @@ -27,8 +27,8 @@ import java.awt.image.BufferedImage; import java.util.Map; @RestController -@Api(description = "商城补贴支付接口") @RequestMapping("wxSubsidy") +@Api(description = "商城补贴支付接口") public class WxSubsidyController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java index de35200dc..5da4f77b2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java @@ -6,6 +6,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxUserCouponDto; import com.iformall.service.WxUserCouponService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("wxUserCoupon") +@Api(description = "会员卡券查询接口") public class WxUserCouponController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayAccountController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxPayAccountController.java similarity index 96% rename from mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayAccountController.java rename to mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxPayAccountController.java index 7f5077541..6c0d084f6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayAccountController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxPayAccountController.java @@ -1,7 +1,8 @@ -package com.iformall.controller.market; +package com.iformall.controller.basic; import com.iformall.annotation.SystemControllerLog; import com.iformall.controller.base.BaseController; +import io.swagger.annotations.Api; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -19,6 +20,7 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxPayAccount") +@Api(description = "小程序支付商户号设置接口") public class WxPayAccountController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); From 66f7b01867891bead70976b9bb406fc28e50f3d8 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 14 May 2019 10:27:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E6=BA=90=E7=A0=81=E6=95=B4=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=94=AF=E4=BB=98=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/WxPayAccountBillController.java | 79 +++++++++++++++++++ .../basic/WxPayAccountController.java | 2 +- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxPayAccountBillController.java diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxPayAccountBillController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxPayAccountBillController.java new file mode 100644 index 000000000..44a230d47 --- /dev/null +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxPayAccountBillController.java @@ -0,0 +1,79 @@ +package com.iformall.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxPayAccountBill; +import com.iformall.service.WxPayAccountBillService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("wxPayAccountBill") +@Api(description = "B端小程序账单支付商户号设置接口") +public class WxPayAccountBillController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxPayAccountBillService wxPayAccountBillService; + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "支付账号-列表") + public ResultData list(@ModelAttribute WxPayAccountBill wxPayAccountBill, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxPayAccountBillController::list"); + if (null == wxPayAccountBill) wxPayAccountBill = new WxPayAccountBill(); + final PageInfo page = wxPayAccountBillService.listAsPage(wxPayAccountBill, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + @SystemControllerLog(description = "支付账号-新增") + public ResultData add(@RequestBody WxPayAccountBill wxPayAccountBill) { + logger.debug("[" + getIpAddr() + "] WxPayAccountBillController::add"); + wxPayAccountBillService.saveOrUpdate(wxPayAccountBill); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + @SystemControllerLog(description = "支付账号-更新") + public ResultData update(@RequestBody WxPayAccountBill wxPayAccountBill) { + logger.debug("[" + getIpAddr() + "] WxPayAccountBillController::update"); + wxPayAccountBillService.saveOrUpdate(wxPayAccountBill); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "支付账号-删除") + public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxPayAccountController::delete"); + wxPayAccountBillService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "支付账号-查询") + public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxPayAccountBillController::findById"); + return new ResultData(Result.SUCCESS, "查询成功", wxPayAccountBillService.getById(id)); + } + + +} diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxPayAccountController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxPayAccountController.java index 6c0d084f6..1e36440dd 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxPayAccountController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxPayAccountController.java @@ -20,7 +20,7 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxPayAccount") -@Api(description = "小程序支付商户号设置接口") +@Api(description = "C端小程序支付商户号设置接口") public class WxPayAccountController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass());