支付金额小于0判断

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1922,6 +1922,7 @@ public class OrderAdapter {
                 }
             }
         }
+        if (! OrderClientType.SAASMALL.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())) {
             if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
                 orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
                 orderViewStatusDto.setOrderStatusDesc("已退款");
@@ -1978,6 +1979,7 @@ public class OrderAdapter {
                     }
                 }
             }
+        }
         return orderViewStatusDto;
     }
 

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

@@ -1032,9 +1032,9 @@ public class MallOrderServiceImpl implements MallOrderService {
             request.setOrderState(NewOrderStatus.COMPLETE.getIndex());
             request.setOperator(baseQueryOrderRequest.getOperator());
             request.setRemark("已完成");
-            com.freemud.application.sdk.api.ordercenter.response.BaseResponse orderCenterResponse = orderSdkService.updateOrderState(request, baseQueryOrderRequest.getTrackingNo());
-            result.setCode(orderCenterResponse.getCode());
-            result.setMessage(orderCenterResponse.getMessage());
+            orderSdkService.updateOrderState(request, baseQueryOrderRequest.getTrackingNo());
+            orderSdkService.completeBookingTask(request, baseQueryOrderRequest.getTrackingNo());
+            return ResponseUtil.success();
         }catch (Exception e){
             result.setCode(ResponseResult.ORDER_RECEIVE_ERR.getCode());
             result.setMessage(ResponseResult.ORDER_RECEIVE_ERR.getMessage());

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java

@@ -249,5 +249,9 @@ public class InterfaceAddressConstant {
      * 查询当前门店24小时内的订单
      */
     public static final String QUERY_LINEUP_ORDER = "order/v2/queryLineUpOrder";
+    /**
+     * 手动完成进行中的流程
+     */
+    public static final String COMPLETE_BOOKING_TASK = "/task/v2/completeBookingTask";
 
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -962,4 +962,14 @@ public class OrderSdkService {
         return responseHandle(responseDTO);
     }
 
+    /**
+     * 手动完成进行中的流程
+     */
+    public BaseResponse completeBookingTask(OrderChangeStateReq request, String trackingNo) {
+        OrderBaseResp responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, InterfaceAddressConstant.COMPLETE_BOOKING_TASK,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp>() {
+                });
+        return responseHandle(responseDTO);
+    }
+
 }