From 96a9890954dde7268cdc23d7d2f09caade44a72f Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 29 Jun 2019 15:34:48 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9C=AA=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95]?= =?UTF-8?q?[=E4=BF=AE=E6=94=B9]:=E8=BF=94=E5=9B=9Ec=E7=AB=AF=E6=9C=AA?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxOrderController.java | 36 +++++++++---------- .../service/impl/WxOrderServiceImpl.java | 2 +- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 1dcbf9518..123436a99 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -270,21 +270,20 @@ public class WxOrderController extends BaseController { @ApiOperation(value = "根据orderId查询接口", notes = "{\"orderId\":\"string\"}") @GetMapping("/findById") - public ResultData findById(@RequestBody Map paramMap) { - String orderIdStr = paramMap.get("orderId"); - if (StringUtils.isBlank(orderIdStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); - } - Long orderId = 0L; + @ApiImplicitParams({ + @ApiImplicitParam(name = "orderId", value = "订单id", dataType = "String", paramType = "query", required = true) + }) + public ResultData findById(String orderId) { + Long id = 0L; try { - orderId = Long.valueOf(orderIdStr); + id = Long.valueOf(orderId); } catch (NumberFormatException e) { logger.error("parse orderId failed"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常"); } WxOrder order = null; try { - order = wxOrderService.getById(orderId); + order = wxOrderService.getById(id); if (order != null) { return new ResultData(Result.SUCCESS, "查询成功", order); } else { @@ -297,28 +296,27 @@ public class WxOrderController extends BaseController { } @ApiOperation(value = "获取未支付订单", notes = "{\"couponId\":\"string\"}") - @GetMapping("/getUnPaidOrder") - public ResultData getUnPaidOrder(@RequestBody Map paramMap) { - String couponIdStr = paramMap.get("couponId"); - if (StringUtils.isBlank(couponIdStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId不能为空"); - } - Long couponId = 0L; + @GetMapping("getUnPaidOrder") + @ApiImplicitParams({ + @ApiImplicitParam(name = "couponId", value = "券id", dataType = "String", paramType = "query", required = true) + }) + public ResultData getUnPaidOrder(String couponId) { + Long id = 0L; try { - couponId = Long.valueOf(couponIdStr); + id = Long.valueOf(couponId); } catch (NumberFormatException e) { logger.error("parse couponId failed"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "券ID转换异常"); } WxCoupon wxCoupon = null; try { - wxCoupon = wxCouponService.getById(couponId); + wxCoupon = wxCouponService.getById(id); } catch (Exception e) { - logger.error("券ID获取券信息失败, couponId: " + couponIdStr); + logger.error("券ID获取券信息失败, couponId: " + couponId); return new ResultData(ErrorCode.COUPON_IS_EMPTY); } if(wxCoupon == null) { - logger.error("券ID获取券信息失败, couponId: " + couponIdStr); + logger.error("券ID获取券信息失败, couponId: " + couponId); return new ResultData(ErrorCode.COUPON_IS_EMPTY); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index f81d45b5d..b7a3028be 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -238,7 +238,7 @@ public class WxOrderServiceImpl implements WxOrderService { statusS.add(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); orderQ.setStatusS(statusS); List orders = wxOrderMapper.findList(orderQ); - if(orders.size() > 1) { + if(orders.size() >= 1) { return orders.get(0); } } catch (Exception e) {