Merge branch 'feature/box/三方券订单退款退券' into qa

order-management/src/main/java/cn/freemud/management/enums/ResponseResult.java

@@ -175,6 +175,7 @@ public enum ResponseResult {
     ORDER_DELIVERY_EDIT_FAILED("45090", "修改配送状态失败"),
     PARTNER_CAN_NOT_CANCEL_ORDER("45091","订单已部分退款，不能取消"),
     DONE_FAIL_ONE_MINUTE("45092", "平台规定，接单一分钟后才能出餐"),
+    REFUND_THIRD_COUPON_TIME_LIMIT("45093", "核销时间超过可冲正期限，撤销核销失败"),
 
     /**
      * 支付

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -229,7 +229,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
             try {
                 thirdCouponOrderHandle.thirdCouponRefund(request.getPartnerId(), request.getOrderId(), request.getOperator());
             } catch (Exception e) {
-                return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR.getCode(), e.getMessage());
+                return ResponseUtil.error(ResponseResult.REFUND_THIRD_COUPON_TIME_LIMIT.getCode(), e.getMessage());
             }
         }
 
@@ -273,7 +273,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
             try {
                 thirdCouponOrderHandle.thirdCouponRefund(request.getPartnerId(), request.getOrderId(), request.getOperator());
             } catch (Exception e) {
-                return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR.getCode(), e.getMessage());
+                return ResponseUtil.error(ResponseResult.REFUND_THIRD_COUPON_TIME_LIMIT.getCode(), e.getMessage());
             }
         }
 
@@ -476,7 +476,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
             try {
                 thirdCouponOrderHandle.thirdCouponRefund(request.getPartnerId(), request.getOrderId(), request.getOperator());
             } catch (Exception e) {
-                return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR.getCode(), e.getMessage());
+                return ResponseUtil.error(ResponseResult.REFUND_THIRD_COUPON_TIME_LIMIT.getCode(), e.getMessage());
             }
         }
         //调用cancel接口，商家退款