抖音卖券订单,直接完成

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -7,6 +7,7 @@ import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
 import cn.freemud.management.enums.*;
+import cn.freemud.management.enums.OperateType;
 import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.service.OrderBaseService;
 import cn.freemud.management.service.OrderManagerService;
@@ -20,12 +21,9 @@ import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.config.OrderCenterProperties;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo;
-import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
-import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
-import com.freemud.application.sdk.api.ordercenter.enums.PayType;
+import com.freemud.application.sdk.api.ordercenter.enums.*;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderSourceV1;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
-import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExpressReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
@@ -35,6 +33,7 @@ import com.freemud.application.sdk.api.service.EmailAlertService;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.io.ByteOrderMark;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -271,6 +270,10 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
      */
     @Override
     public BaseResponse<OrderManagerResponse> orderCancel(OrderManagerRequest request, OrderBeanV1 orderBean){
+        if (BizTypeEnum.ORDINARY.getBizType().compareTo(orderBean.getBizType()) == 0
+                &&  MarketTypeEnum.TIKTOK_MARKET_ORDER.getIndex().compareTo(Byte.toUnsignedInt(orderBean.getMarketingType())) == 0) {
+            return ResponseUtil.success();
+        }
         List<Integer> newOrderStatusList = Arrays.asList(OrderStatusV1.RECEIPT.getV2Code(),OrderStatusV1.COMPLETE.getV2Code(),OrderStatusV1.COMPLETE_MAKE.getV2Code());
         List<String> sourceList = Arrays.asList(OrderSourceV1.SAAS.getCode(),OrderSourceV1.ALIPAY.getCode(),OrderSourceV1.APP.getCode());
         if (sourceList.contains(orderBean.getSource()) && newOrderStatusList.contains(orderBean.getStatusV2())) {

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/MarketTypeEnum.java

@@ -13,6 +13,7 @@ public enum MarketTypeEnum {
     MEMBER_CARD(7, "付费会员卡开卡"),
     SVC(8, "储值卡充值"),
     WE_CHAT_LIVE_SELL(9, "微信视频号卖券"),
+    TIKTOK_MARKET_ORDER(11, "抖音卖券换购营销"),
     ;
 
     private Integer index;