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

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

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

@@ -88,9 +88,4 @@ public class OrderManagerRequest {
      * 品牌审核售后单　不传默认无需品牌审核
      */
     private Boolean brandVerifyAfterSales = false;
-
-    /**
-     * 1是服务端自动接单
-     */
-    private Integer acceptMode;
 }

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

@@ -328,7 +328,7 @@ public class OrderVerifyHandle {
         if (!canAgreeRefundStatus.contains(orderBean.getAfterSalesOrderResp().getAfterSalesStatus())) {
             return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY);
         }
-        //兜底方案
+        //兜底方案，后续都传了可删除代码
         if (request.getOperationClient() == null) {
             if ("pos".equals(request.getOperator())) {
                 request.setOperationClient(1);

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;
 }