麦咖啡同意退款

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

@@ -139,7 +139,7 @@ public class OrderManagerAdapter {
         //查询订单
         QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(request.getOrderId());
         //订单接单参数校验
-        BaseResponse verifyResponse = orderVerifyHandle.orderAgreeRefund(orderBean, request);
+        BaseResponse verifyResponse = orderVerifyHandle.orderAgreeRefundMCCafe(orderBean, request);
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
             return handleResponse(request,orderBean,verifyResponse);
         }

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

@@ -229,25 +229,41 @@ public class OrderVerifyHandle {
         if (orderBean.getHasRefund() == null
                 || !orderBean.getHasRefund()
                 || orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() != 1) {
-            CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
-            cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
-            cancelOrderRequest.setStoreId(orderBean.getShopId());
-            cancelOrderRequest.setOrderId(orderBean.getOid());
-            cancelOrderRequest.setOrderClient(orderSdkAdapter.getNewOrderClient(orderBean.getSource()));
-
-            //传入的售后单类型为：2：售中用户取消 8：售后申请
-            cancelOrderRequest.setAfterSalesType(AfterSalesType.USER_CANCEL);
-            cancelOrderRequest.setReason("餐道主动取消");
-            cancelOrderRequest.setReqRemark("餐道直接取消");
-            cancelOrderRequest.setOperator(orderBean.getUserName());
-            cancelOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
-            cancelOrderRequest.setRefundDeliveryAmount(true);
-            BaseOrderResponse baseResponseDto = orderCenterSdkService.orderCancel(cancelOrderRequest);
-
-            if (!ResponseCodeConstant.RESPONSE_SUCCESS.equals(baseResponseDto.getErrcode())) {
-                return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY);
+            return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY);
+        }
+        //订单是否支持退款
+        boolean isCanRefund = false;
+        //订单
+        boolean isRefundDeliveryFee=false;
+        //saas渠道订单，已完成的订单不能操作, 商户配置已完成订单可退款可退款
+        if (ObjectUtils.equals(orderBean.getSource(), OrderSource.SAAS.getSource())) {
+            isCanRefund = getRefundConfig(orderBean);
+            if (!isCanRefund) {
+                return ResponseUtil.error(ResponseResult.ORDER_HAD_AFFIRM_CAN_NOT_REFUND);
             }
         }
+        if (isCanRefund) {
+            orderBean.setAmount(getRefundAmount(orderBean,isRefundDeliveryFee).longValue());
+        }
+        return ResponseUtil.success();
+    }
+
+    /**
+     * 麦咖啡同意退款
+     *
+     * @param orderBean
+     * @param request
+     * @return
+     */
+    public BaseResponse orderAgreeRefundMCCafe(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderManagerRequest request) {
+        //已取消的订单不能操作
+        if (ObjectUtils.equals(OrderStatus.CANCEL.getCode(), orderBean.getStatus())) {
+            return ResponseUtil.error(ResponseResult.ORDER_HAS_CANCELED);
+        }
+        if(CollectionUtils.isNotEmpty(orderBean.getRefundList())
+                && orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() != 1) {
+            return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY);
+        }
         //订单是否支持退款
         boolean isCanRefund = false;
         //订单