Merge branch '小助手门店操作退款-oms-基于pre分支' into qa

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

@@ -3747,9 +3747,9 @@ public class OrderServiceImpl implements Orderservice {
             request.setStoreId(orderBean.getShopId());
             request.setOrderId(orderBean.getOid());
             request.setReason(orderRefundVo.getReason());
-            request.setOperateType(cn.freemud.management.enums.OperateType.ORDER_RETRY_AGREE_REFUND.getOpType());
+            request.setOperateType(cn.freemud.management.enums.OperateType.ORDER_DEVELOPER_AGREE_REFUND.getOpType());
             request.setOperator(orderRefundVo.getOperator());
-            BaseResponse baseResponse = orderManagerAdapter.orderRetryAgreeRefund(request);
+            BaseResponse baseResponse = orderManagerAdapter.developRefund(request);
             return baseResponse;
         }
         return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单未支付！");

order-management/src/main/java/cn/freemud/management/controller/OrderManagerController.java

@@ -68,8 +68,6 @@ public class OrderManagerController {
                 return orderManagerAdapter.orderCreateDelivery(request);
             case ORDER_CANCEL_DELIVERY:
                 return orderManagerAdapter.orderCancelDelivery(request);
-            case ORDER_RETRY_AGREE_REFUND:
-                return orderManagerAdapter.orderRetryAgreeRefund(request);
             default:
                 return ResponseUtil.error(ResponseResult.ORDER_OPERATE_TYPE_NOT_VALIDATE);
         }

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

@@ -15,9 +15,10 @@ public enum OperateType {
     ORDER_CREATE_DELIVERY("orderCreateDelivery","创建配送"),
     ORDER_CANCEL_DELIVERY("orderCancelDelivery","取消配送"),
     /**
-     * 售后单重试退款操作
+     * 该操作无校验, 直接退款, 如果使用 请联系SE 进行报备,
+     * 该类型不给外部人员使用, 不对外部暴露接口
      */
-    ORDER_RETRY_AGREE_REFUND("orderRetryAgreeRefund","重试售后单退款"),;
+    ORDER_DEVELOPER_AGREE_REFUND("orderDeveloperAgreeRefund","重试售后单退款"),;
 
     /**
      * 操作类型

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

@@ -373,7 +373,7 @@ public class OrderManagerAdapter {
      * 使用该方法 请先进行报备, 因为不暴露给外部使用, 不属于业务代码
      * @see OrderManagerAdapter#orderAgreeRefund(cn.freemud.management.entities.dto.request.order.OrderManagerRequest)
      */
-    public BaseResponse orderRetryAgreeRefund(OrderManagerRequest request) {
+    public BaseResponse developRefund(OrderManagerRequest request) {
         //查询订单
         OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
         if (null == orderBean) {