|
|
|
@@ -257,6 +257,46 @@ public class WxOrderController extends BaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation(value = "获取未支付订单", notes = "{\"couponId\":\"string\"}") |
|
|
|
@GetMapping("/getUnPaidOrder") |
|
|
|
public ResultData getUnPaidOrder(@RequestBody Map<String, String> paramMap) { |
|
|
|
String couponIdStr = paramMap.get("couponId"); |
|
|
|
if (StringUtils.isBlank(couponIdStr)) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId不能为空"); |
|
|
|
} |
|
|
|
Long couponId = 0L; |
|
|
|
try { |
|
|
|
couponId = Long.valueOf(couponIdStr); |
|
|
|
} 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); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("券ID获取券信息失败, couponId: " + couponIdStr); |
|
|
|
return new ResultData(ErrorCode.COUPON_IS_EMPTY); |
|
|
|
} |
|
|
|
if(wxCoupon == null) { |
|
|
|
logger.error("券ID获取券信息失败, couponId: " + couponIdStr); |
|
|
|
return new ResultData(ErrorCode.COUPON_IS_EMPTY); |
|
|
|
} |
|
|
|
|
|
|
|
WxOrder order = null; |
|
|
|
try { |
|
|
|
order = wxOrderService.getUnPaidOrder(getUser(), wxCoupon); |
|
|
|
if (order != null) { |
|
|
|
return new ResultData(Result.SUCCESS, "查询成功", order); |
|
|
|
} else { |
|
|
|
return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); |
|
|
|
} |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("parse orderId failed"); |
|
|
|
return new ResultData(ErrorCode.DB_FAIL.getCode(), "订单查询未成功,e:" + e.getMessage()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("我的砍价-分页列表接口") |
|
|
|
@GetMapping("pressOrderList") |
|
|
|
@ApiImplicitParams({ |
|
|
|
|