Просмотр исходного кода

[B端][修改]:标注B端接口解释,方便在swagger-ui中查询

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
8e14f43197
9 измененных файлов: 59 добавлений и 8 удалений
  1. +2
    -0
      mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java
  2. +2
    -0
      mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java
  3. +7
    -7
      mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java
  4. +1
    -1
      mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java
  5. +2
    -0
      mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java
  6. +39
    -0
      mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java
  7. +2
    -0
      mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java
  8. +2
    -0
      mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java
  9. +2
    -0
      mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java

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


+ 2
- 0
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);



+ 7
- 7
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));
}


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


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


+ 39
- 0
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);
}
}

+ 2
- 0
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);



+ 2
- 0
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);



+ 2
- 0
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);



Загрузка…
Отмена
Сохранить