Merge branch 'feature/20230327_订单宝上同意退款记录操作渠道_wuping' of…

Merge branch 'feature/20230327_订单宝上同意退款记录操作渠道_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa

order-management/src/main/java/cn/freemud/management/adapter/BaseQueryOrderRequestAdapter.java

@@ -22,7 +22,6 @@ public class BaseQueryOrderRequestAdapter {
         orderRequest.setShopId(orderBean.getShopId());
         orderRequest.setHasSelfDelivery(true);
         orderRequest.setPartnerId(orderBean.getCompanyId());
-//        orderRequest.setOrderType(getNewOrderTypeEnum(orderBean.getType(), orderBean.getGmtExpect()));
         orderRequest.setOrderType(OrderType.getOrderType(orderBean.getNewOrderType()));
         if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) {
             orderRequest.setExpectTime(cn.freemud.base.util.DateUtil.convert2String(new Date(orderBean.getGmtExpect()), cn.freemud.base.util.DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
@@ -40,9 +39,8 @@ public class BaseQueryOrderRequestAdapter {
             orderRequest.setDispatchType(otherParamDTO.getDispatchType());
             orderRequest.setDispatchTimeout(otherParamDTO.getDispatchTimeout());
         }
-        orderRequest.setAcceptMode(request.getAcceptMode());
         //订单宝自动接单提醒需求，传标识到基础服务识别
-        if (request.getAcceptMode() == null && Objects.equals(6,request.getOperationClient())) {
+        if (Objects.equals(4,request.getOperationClient())) {
             orderRequest.setAcceptMode(1);
         }
         return orderRequest;

order-management/src/main/java/cn/freemud/management/entities/dto/request/order/OrderManagerRequest.java

@@ -80,17 +80,12 @@ public class OrderManagerRequest {
     private Integer timeout;
 
     /**
-     * 售后渠道 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一
+     * 售后渠道 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一 9:订单宝
      */
-    private Integer operationClient = 0;
+    private Integer operationClient;
 
     /**
      * 品牌审核售后单　不传默认无需品牌审核
      */
     private Boolean brandVerifyAfterSales = false;
-
-    /**
-     * 1是服务端自动接单
-     */
-    private Integer acceptMode;
 }

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

@@ -174,6 +174,8 @@ public enum ResponseResult {
     PARTNER_ORDER_CANCEL_ERROR("45089", "取消订单失败"),
     ORDER_DELIVERY_EDIT_FAILED("45090", "修改配送状态失败"),
 
+    PARTNER_CAN_NOT_CANCEL_ORDER("45091","订单已部分退款，不能取消"),
+
     /**
      * 支付
      */

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

@@ -254,6 +254,10 @@ public class OrderManagerAdapter {
         if (null == orderBean) {
             return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
         }
+        BaseResponse verifyResponse = orderVerifyHandle.cancelOrder(orderBean);
+        if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
+            return handleResponse(request, orderBean, verifyResponse);
+        }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderCancel(request, orderBean);
         return handleResponse(request, orderBean, orderManagerResponse);
     }

order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java

@@ -328,15 +328,21 @@ public class OrderVerifyHandle {
         if (!canAgreeRefundStatus.contains(orderBean.getAfterSalesOrderResp().getAfterSalesStatus())) {
             return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY);
         }
-        if("pos".equals(request.getOperator())){
+        //兜底方案，后续都传了可删除代码
+        if (request.getOperationClient() == null) {
+            if ("pos".equals(request.getOperator())) {
                 request.setOperationClient(1);
-        }else if("小助手".equals(request.getOperator())){
+            } else if ("小助手".equals(request.getOperator())) {
                 request.setOperationClient(2);
-        }else if("开发平台".equals(request.getOperator())){
+            } else if ("开发平台".equals(request.getOperator())) {
                 request.setOperationClient(3);
-        }else if("自动任务".equals(request.getOperator())){
+            } else if ("自动任务".equals(request.getOperator())) {
                 request.setOperationClient(4);
+            }else {
+                request.setOperationClient(0);
             }
+        }
+
         //门店发起退款，需要品牌审核，则小助手不能发同意退款
         if(Objects.equals(AfterSalesType.STORE_CANCEL.getIndex(),orderBean.getAfterSalesOrderResp().getAfterSalesType())){
             //售后渠道 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一
@@ -657,4 +663,20 @@ public class OrderVerifyHandle {
         return ResponseUtil.success();
     }
 
+
+    /**
+     * 取消订单前校验是否部分退
+     */
+    public BaseResponse cancelOrder(OrderBeanV1 orderBean){
+        //已取消的订单不能操作
+        if (ObjectUtils.equals(OrderStatusV1.CANCEL.getV2Code(), orderBean.getStatusV2())) {
+            return ResponseUtil.error(ResponseResult.ORDER_HAS_CANCELED);
+        }
+        //判断订单是否有申请退款且为部分退款
+        if (orderBean.getAfterSalesOrderResp() != null && orderBean.getAfterSalesOrderResp().getIsPartRefund()) {
+            return ResponseUtil.error(ResponseResult.PARTNER_CAN_NOT_CANCEL_ORDER);
+        }
+        return ResponseUtil.success();
+    }
+
 }
\ No newline at end of file

order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java

@@ -107,7 +107,6 @@ public class SaasOrderHandle {
         }
         OrderBaseResp response = orderSdkService.acceptOrder(requestDto, LogThreadLocal.getTrackingNo());
         BaseOrderResponse confirmOrderResponse = orderSdkAdapter.convent2BaseOrderResponse(response);
-//        BaseOrderResponse confirmOrderResponse = orderCenterSdkService.orderConfirmTake(orderConfirmRequest);
         //处理1秒重复接单问题 订单服务接单返回20067重复操作，20018状态机不支持认为接单成功
         if ("20067".equals(confirmOrderResponse.getErrcode().toString()) || "20018".equals(confirmOrderResponse.getErrcode().toString()) || "50002".equals(confirmOrderResponse.getErrcode().toString())) {
             return ResponseUtil.success(confirmOrderResponse.getErrcode());

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/POSOrderOperationBaseReq.java

@@ -40,7 +40,7 @@ public class POSOrderOperationBaseReq {
     private Integer dispatchTimeout;
 
     /**
-     * 1是服务端自动接单
+     * 1是服务端自动接单 接单时传，其他不传
      */
     private Integer acceptMode;
 }