|
|
|
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@RestController |
|
|
|
@RequestMapping("wxCouponOrder") |
|
|
|
@RequestMapping("/api/couponOrder") |
|
|
|
@Api(description="核销和用户卡券查询接口") |
|
|
|
public class WxCouponOrderController extends BaseController |
|
|
|
{ |
|
|
|
@@ -88,7 +88,16 @@ public class WxCouponOrderController extends BaseController |
|
|
|
logger.error("couponOrderId参数不正确: " + paramMap.toString()); |
|
|
|
return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "couponOrderId参数不正确"); |
|
|
|
} |
|
|
|
return wxCouponOrderService.verify(couponOrderId, getUser().getId()); |
|
|
|
try { |
|
|
|
ResultData rd = wxCouponOrderService.verify(couponOrderId, getUser().getId()); |
|
|
|
return rd; |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("核销异常: " + e.getMessage()); |
|
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("核销异常: " + e.getMessage()); |
|
|
|
return new ResultData(ErrorCode.VERIFY_ERROR, e.getMessage()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation(value = "退券接口", notes = "{\"couponOrderId\":\"string\"}") |
|
|
|
@@ -104,10 +113,18 @@ public class WxCouponOrderController extends BaseController |
|
|
|
try { |
|
|
|
couponOrderId = Long.valueOf(couponOrderIdStr); |
|
|
|
} catch (NumberFormatException e) { |
|
|
|
couponOrderId = 0L; |
|
|
|
logger.error("couponOrderId参数不正确: " + paramMap.toString()); |
|
|
|
return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "couponOrderId参数不正确"); |
|
|
|
} |
|
|
|
return wxCouponOrderService.refund(couponOrderId, getUser().getId()); |
|
|
|
try { |
|
|
|
ResultData rd = wxCouponOrderService.refund(couponOrderId, getUser().getId()); |
|
|
|
return rd; |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("退券异常: " + e.getMessage()); |
|
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("退券异常: " + e.getMessage()); |
|
|
|
return new ResultData(ErrorCode.REFUND_ORDER_ERROR, e.getMessage()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |