|
|
|
@@ -46,9 +46,12 @@ public class WxOrderController extends BaseController { |
|
|
|
try { |
|
|
|
WxOrder order = wxOrderService.saveOrder(user, couponId); |
|
|
|
return new ResultData(order); |
|
|
|
}catch (MallinkException e) { |
|
|
|
} 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.ORDER_IS_FAIL, e.getMessage()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@@ -67,6 +70,7 @@ public class WxOrderController extends BaseController { |
|
|
|
orderId = Long.valueOf(orderIdStr); |
|
|
|
} catch (NumberFormatException e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
return new ResultData(ErrorCode.PARAMETER_NOT_NULL, "orderId: " + orderIdStr + ", e: " + e.getMessage()); |
|
|
|
} |
|
|
|
wxOrderService.updateOrderStatus(orderId, EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL); |
|
|
|
return new ResultData(); |
|
|
|
|