From 8e14f431973977e0a8772a91d7df0f77481868ca Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 20 Aug 2018 13:51:02 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF][=E4=BF=AE=E6=94=B9]:=E6=A0=87?= =?UTF-8?q?=E6=B3=A8B=E7=AB=AF=E6=8E=A5=E5=8F=A3=E8=A7=A3=E9=87=8A,?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E5=9C=A8swagger-ui=E4=B8=AD=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxBLogController.java | 2 + .../simple/controller/WxCouponController.java | 2 + .../controller/WxCouponOrderController.java | 14 +++---- .../WxDateAmountRecordController.java | 2 +- .../controller/WxMerchantBUserController.java | 2 + .../WxMerchantTradeDailyController.java | 39 +++++++++++++++++++ .../WxMsgValidationcodeController.java | 2 + .../simple/controller/WxOrderController.java | 2 + .../controller/WxRefundOrderController.java | 2 + 9 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java b/mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java index f438992e0..0a7a298cd 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java @@ -1,5 +1,6 @@ package com.simple.controller; +import io.swagger.annotations.Api; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; @@ -17,6 +18,7 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxBLog") +@Api(description="B端埋点相关接口") public class WxBLogController extends BaseController { @Autowired diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java index 670e08e9c..49b321b7d 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java @@ -3,6 +3,7 @@ package com.simple.controller; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.service.WxCouponService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.apache.log4j.Logger; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/coupon") +@Api(description="券类相关接口") public class WxCouponController extends BaseController { private Logger logger = Logger.getLogger(WxCouponController.class); diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java index 99aad9b70..e50ee8bc3 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -21,7 +21,7 @@ import java.util.Map; @RestController @RequestMapping("/api/couponOrder") -@Api(description = "核销和用户卡券查询接口") + public class WxCouponOrderController extends BaseController { private Logger logger = Logger.getLogger(WxCouponOrderController.class); @@ -35,7 +35,7 @@ public class WxCouponOrderController extends BaseController { String couponOrderIdStr = paramMap.get("couponOrderId"); if (StringUtils.isBlank(couponOrderIdStr)) { logger.error("couponOrderId不能为空: " + paramMap.toString()); - return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "couponOrderId不能为空"); + return new ResultData(ErrorCode.PARAMETER_NOT_NULL); } Long couponOrderId = 0L; try { @@ -43,7 +43,7 @@ public class WxCouponOrderController extends BaseController { } catch (NumberFormatException e) { couponOrderId = 0L; logger.error("couponOrderId参数不正确: " + paramMap.toString()); - return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "couponOrderId参数不正确"); + return new ResultData(ErrorCode.PARAMETER_NOT_NULL); } try { ResultData rd = wxCouponOrderService.verify(couponOrderId, getUser().getId()); @@ -64,14 +64,14 @@ public class WxCouponOrderController extends BaseController { String couponOrderIdStr = paramMap.get("couponOrderId"); if (StringUtils.isBlank(couponOrderIdStr)) { logger.error("couponOrderId不能为空: " + paramMap.toString()); - return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "couponOrderId不能为空"); + return new ResultData(ErrorCode.PARAMETER_NOT_NULL); } Long couponOrderId = 0L; try { couponOrderId = Long.valueOf(couponOrderIdStr); } catch (NumberFormatException e) { logger.error("couponOrderId参数不正确: " + paramMap.toString()); - return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "couponOrderId参数不正确"); + return new ResultData(ErrorCode.PARAMETER_NOT_NULL); } try { ResultData rd = wxCouponOrderService.refund(couponOrderId, getUser().getId()); @@ -110,7 +110,7 @@ public class WxCouponOrderController extends BaseController { String couponOrderIdStr = paramMap.get("couponOrderId"); if (StringUtils.isBlank(couponOrderIdStr)) { logger.error("couponOrderId不能为空: " + paramMap.toString()); - return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "couponOrderId不能为空"); + return new ResultData(ErrorCode.PARAMETER_NOT_NULL); } Long couponOrderId = 0L; try { @@ -118,7 +118,7 @@ public class WxCouponOrderController extends BaseController { } catch (NumberFormatException e) { couponOrderId = 0L; logger.error("couponOrderId参数不正确: " + paramMap.toString()); - return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "couponOrderId参数不正确"); + return new ResultData(ErrorCode.PARAMETER_NOT_NULL); } return new ResultData(Result.SUCCESS, "查询成功", wxCouponOrderService.getById(couponOrderId)); } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java index 5fa00b2eb..f54259d8e 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java @@ -25,7 +25,7 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("/api/wxDateAmountRecord") -@Api(description="首页查询交易金额记录和核销记录接口") +@Api(description="首页交易记录相关接口") public class WxDateAmountRecordController extends BaseController { @Autowired diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java index 3f51bb1df..9ef8b3eb2 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java @@ -9,6 +9,7 @@ import com.simple.domain.po.WxMerchant; import com.simple.service.WxMallService; import com.simple.service.WxMerchantService; import com.simple.utils.IPUtil; +import io.swagger.annotations.Api; import me.chanjar.weixin.common.error.WxErrorException; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; @@ -34,6 +35,7 @@ import java.util.HashMap; import java.util.Map; @RestController +@Api(description="B端用户相关接口") @RequestMapping("/api/user") public class WxMerchantBUserController extends BaseController { diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java new file mode 100644 index 000000000..73d367ab0 --- /dev/null +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java @@ -0,0 +1,39 @@ +package com.simple.controller; + +import io.swagger.annotations.Api; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMerchantTradeDaily; +import com.simple.service.WxMerchantTradeDailyService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("/api/wxMerchantTradeDaily") +@Api(description = "解单相关接口") +public class WxMerchantTradeDailyController extends BaseController +{ + @Autowired + private WxMerchantTradeDailyService wxMerchantTradeDailyService; + + private Logger logger = Logger.getLogger(WxMerchantTradeDailyController.class); + + + @ApiOperation("上报每日解单") + @GetMapping("/reportDailyVolume") + @ApiImplicitParam(name="volume",value="总金额(分)",dataType="Integer", paramType = "query",required=true) + public ResultData saveDailyTradingVolume(Integer volume) { + return wxMerchantTradeDailyService.saveDailyTradingVolume(getUser().getId(),volume); + } + + + +} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java index 616494538..4fde2135e 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java @@ -3,6 +3,7 @@ package com.simple.controller; import com.simple.common.ResultData; import com.simple.domain.po.WxMsgValidationcode; import com.simple.service.WxMsgValidationcodeService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import org.apache.log4j.Logger; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("wxMsgValidationcode") +@Api(description="短信验证相关接口") public class WxMsgValidationcodeController extends BaseController { private Logger logger = Logger.getLogger(WxMsgValidationcodeController.class); diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java index 18c59d800..07a850780 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java @@ -4,6 +4,7 @@ import com.simple.common.ErrorCode; import com.simple.domain.po.WxMerchantBUser; import com.simple.domain.vo.OrderVo; import com.simple.enums.EnumOrderStatus; +import io.swagger.annotations.Api; import io.swagger.models.auth.In; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; @@ -25,6 +26,7 @@ import java.util.Map; @RestController @RequestMapping("/order") +@Api(description="订单相关接口") public class WxOrderController extends BaseController { private Logger logger = Logger.getLogger(WxOrderController.class); diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java index 054dd7615..fb2e329c5 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java @@ -10,6 +10,7 @@ import com.simple.domain.po.WxRefundOrder; import com.simple.enums.EnumPayWay; import com.simple.exception.MallinkException; import com.simple.service.WxRefundOrderService; +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("/api/refund") +@Api(description="退款相关接口") public class WxRefundOrderController extends BaseController { private Logger logger = Logger.getLogger(WxRefundOrderController.class);