抖音小程序查询卖券订单处理，美业代码去除

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

@@ -662,10 +662,13 @@ public class OrderAdapter {
             orderClients = Arrays.asList(OrderClientType.SAAS.getIndex(),OrderClientType.ALIPAY.getIndex());
             bizTypes.add(BizTypeEnum.ORDINARY.getBizType());
             queryOrdersDto.setMarketingType(MarketTypeEnum.CASHIER.getIndex());
+        } else if (OrderChannelType.TIKTOK.getCode().equals(channelType)) {//抖音目前只有卖券,点餐业务已废弃
+            orderClients = Arrays.asList(OrderClientType.TIKTOKPAY.getIndex());
+            bizTypes.add(BizTypeEnum.SALE_COUPON.getBizType());
         } else {
-            orderClients = Arrays.asList(OrderClientType.SAAS.getIndex(),OrderClientType.ALIPAY.getIndex(),OrderClientType.APP.getIndex());
+            orderClients = Arrays.asList(OrderClientType.SAAS.getIndex(), OrderClientType.ALIPAY.getIndex(), OrderClientType.APP.getIndex());
             bizTypes = Arrays.asList(BizTypeEnum.ORDINARY.getBizType(), BizTypeEnum.SALE_COUPON.getBizType(), BizTypeEnum.ADVANCE_ORDER.getBizType());
-            queryOrdersDto.setMarketingTypes(Arrays.asList(MarketTypeEnum.ORDER.getIndex(),MarketTypeEnum.COLLAGE.getIndex(),MarketTypeEnum.WE_CHAT_LIVE_SELL.getIndex()));
+            queryOrdersDto.setMarketingTypes(Arrays.asList(MarketTypeEnum.ORDER.getIndex(), MarketTypeEnum.COLLAGE.getIndex(), MarketTypeEnum.WE_CHAT_LIVE_SELL.getIndex()));
         }
         List<Integer> payStatus = Arrays.asList(PayStatus.HAVE_PAID.getCode(), PayStatus.HAVE_REFUND.getCode(), PayStatus.COMPLETE.getCode());
         queryOrdersDto.setPayStatus((Integer[]) payStatus.toArray());

order-application-service/src/main/java/cn/freemud/enums/OrderChannelType.java

@@ -22,7 +22,7 @@ public enum OrderChannelType {
 
     SAASMALL("saasmall", "微商城"),
 
-    BEAUTIFUL("beautiful", "美业"),
+//    BEAUTIFUL("beautiful", "美业"),
 
     APP("app", "APP"),
 

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

@@ -2514,9 +2514,10 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             channelType = OrderChannelType.SAASMALL.getCode();
         } else if (UserLoginChannelEnum.APP.getCode().equals(userLoginInfoDto.getChannel())) {
             channelType = OrderChannelType.APP.getCode();
-        } else if (OrderChannelType.BEAUTIFUL.getCode().equals(queryOrderVo.getChannelType())) {
-            channelType = OrderChannelType.BEAUTIFUL.getCode();
         }
+//        else if (OrderChannelType.BEAUTIFUL.getCode().equals(queryOrderVo.getChannelType())) {
+//            channelType = OrderChannelType.BEAUTIFUL.getCode();
+//        }
         return channelType;
     }
 

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

@@ -2768,8 +2768,10 @@ public class OrderServiceImpl implements Orderservice {
             channelType = OrderChannelType.SAASMALL.getCode();
         } else if (UserLoginChannelEnum.APP.getCode().equals(userLoginInfoDto.getChannel())) {
             channelType = OrderChannelType.APP.getCode();
-        } else if (OrderChannelType.BEAUTIFUL.getCode().equals(queryOrderVo.getChannelType())) {
-            channelType = OrderChannelType.BEAUTIFUL.getCode();
+//        } else if (OrderChannelType.BEAUTIFUL.getCode().equals(queryOrderVo.getChannelType())) {
+//            channelType = OrderChannelType.BEAUTIFUL.getCode();
+        } else if (OrderChannelType.TIKTOK.getCode().equals(queryOrderVo.getChannelType())) {
+            channelType = OrderChannelType.TIKTOK.getCode();
         } else if (OrderChannelType.CASHIER.getCode().equals(queryOrderVo.getChannelType())) {
             channelType = OrderChannelType.CASHIER.getCode();
         }