修改提示信息

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -194,6 +194,7 @@ public enum ResponseResult {
     ORDER_INVOICE_CONFIG_IS_NULL("45085", "发票配置信息为空，不可开票",""),
     ORDER_BIZ_TYPE_ERROR("45086", "订单业务类型异常",""),
     COUPON_ORDER_VERIFY_FAIL("45087","买券订单校验异常",""),
+    COUPON_ORDER_COMMON_VERIFY_FAIL("45088","卖券订单基础校验失败",""),
 
     /**
      * 售后单
@@ -227,7 +228,7 @@ public enum ResponseResult {
     PAY_ERROR("46016","支付类型错误",""),
     COUPON_DATETIME_INVAILD("46017", "优惠券在当前时间不可用",""),
     COUPON_ORDER_ORIGINAL_AMOUNT_NOT_ENOUGH("46018","优惠券不满足可用金额门槛",""),
-    COUPON_CANCEL_FAIL("46019","作废券失败",""),
+    COUPON_CANCEL_FAIL("46019","您购买的优惠券已锁定，请先进行解锁操作再退款",""),
 
     SHOPPING_CART_USER_HAVE_NO_COUPON("46019", "使用的商品券已失效,请重新下单",""),
     /**

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -3662,19 +3662,19 @@ public class OrderServiceImpl implements Orderservice {
     private BaseResponse couponOrderRefundCheck(AssortmentCustomerInfoVo userLoginInfoDto, OrderBeanV1 orderBean) {
         // 校验是否是用户订单
         if (!Objects.equals(userLoginInfoDto.getMemberId(), orderBean.getUserId())) {
-            return ResponseUtil.error(ResponseResult.COUPON_ORDER_VERIFY_FAIL.getCode(), "不能操作非本人的订单");
+            return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "不能操作非本人的订单");
         }
         // 是否是卖券订单
         if (orderBean.getBizType().compareTo(BizTypeEnum.SALE_COUPON.getBizType()) != 0) {
-            return ResponseUtil.error(ResponseResult.COUPON_ORDER_VERIFY_FAIL.getCode(), "只可操作卖券订单");
+            return ResponseUtil.error(ResponseResult.COUPON_ORDER_COMMON_VERIFY_FAIL);
         }
         // 校验订单状态 卖券订单只有在6已完成状态下 才能退款
         if (orderBean.getStatus().compareTo(OrderStatusV1.COMPLETE.getV1Code()) != 0) {
-            return ResponseUtil.error(ResponseResult.COUPON_ORDER_VERIFY_FAIL.getCode(), "只可操作完成的订单");
+            return ResponseUtil.error(ResponseResult.COUPON_ORDER_COMMON_VERIFY_FAIL.getCode(), "只可操作完成的订单");
         }
         // 校验一遍是否有售后单
         if (CollectionUtils.isNotEmpty(orderBean.getRefundList())) {
-            return ResponseUtil.error(ResponseResult.COUPON_ORDER_VERIFY_FAIL.getCode(), "已存在退款申请,请耐心等待处理");
+            return ResponseUtil.error(ResponseResult.COUPON_ORDER_COMMON_VERIFY_FAIL.getCode(), "已存在退款申请,请耐心等待处理");
         }
         // fisherman 需要核实一下 是否申请退款,订单主状态还不会变
 
@@ -3685,7 +3685,7 @@ public class OrderServiceImpl implements Orderservice {
         if (isTrue) {
             return ResponseUtil.success();
         }
-        return ResponseUtil.error(ResponseResult.COUPON_ORDER_VERIFY_FAIL.getCode(),"虚拟券退款配置未启用,请联系客服");
+        return ResponseUtil.error(ResponseResult.COUPON_ORDER_COMMON_VERIFY_FAIL.getCode(),"虚拟券退款配置未启用,请联系客服");
     }