无单收银支持列表查询

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -25,12 +25,10 @@ import com.freemud.application.sdk.api.util.DateUtil;
 import com.freemud.sdk.api.assortment.order.constant.CommonConstant;
 import com.freemud.sdk.api.assortment.order.domain.OrderStatesVO;
 import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
-import com.freemud.sdk.api.assortment.order.entities.OrderEditInfo;
 import com.freemud.sdk.api.assortment.order.enums.*;
 import com.freemud.sdk.api.assortment.order.request.order.OrderDownloadRequest;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
-//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 import com.freemud.sdk.api.assortment.order.util.AssortOrderLogUtil;
 import com.freemud.sdk.api.assortment.order.util.ClassUtils;
 import com.freemud.sdk.api.assortment.order.util.WeightUtils;
@@ -48,6 +46,8 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
+
 @Component
 public class OrderSdkAdapter {
 
@@ -657,18 +657,21 @@ public class OrderSdkAdapter {
             if ("saas".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.SAAS.getIndex());
             }
-            if ("meals".equals(queryOrdersRequest.getSource()[i])) {
+            else if ("meals".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.WAI_MEAL.getIndex());
             }
-            if ("saasmall".equals(queryOrdersRequest.getSource()[i])) {
+            else if ("saasmall".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.SAASMALL.getIndex());
             }
-            if ("app".equals(queryOrdersRequest.getSource()[i])) {
+            else if ("app".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.APP.getIndex());
             }
-            if ("beautiful".equals(queryOrdersRequest.getSource()[i])) {
+            else if ("beautiful".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.BEAUTIFUL.getIndex());
             }
+            else if ("cashier".equals(queryOrdersRequest.getSource()[i])) {
+                orderClients.add(OrderClientType.CASHIER.getIndex());
+            }
         }
         orderClients.add(OrderClientType.TIKTOKPAY.getIndex());
         orderClients.add(OrderClientType.ALIPAY.getIndex());

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

@@ -1035,6 +1035,8 @@ public class OrderAdapter {
             queryOrdersDto.setSource(new String[]{"app"});
         } else if (OrderChannelType.BEAUTIFUL.getCode().equals(channelType)) {
             queryOrdersDto.setSource(new String[]{"beautiful"});
+        } else if (OrderChannelType.CASHIER.getCode().equals(channelType)) {
+            queryOrdersDto.setSource(new String[]{"cashier"});
         } else {
             queryOrdersDto.setSource(new String[]{"saas"});
         }
@@ -4258,6 +4260,8 @@ public class OrderAdapter {
             //queryOrdersDto.setSource(new String[]{"app"});
         } else if (OrderChannelType.BEAUTIFUL.getCode().equals(channelType)) {// 美业新加
             orderClients.add(OrderClientType.BEAUTIFUL.getIndex());
+        } else if (OrderChannelType.CASHIER.getCode().equals(channelType)) {
+            orderClients.add(OrderClientType.CASHIER.getIndex());
         } else {
             orderClients.add(OrderClientType.SAAS.getIndex());
             //queryOrdersDto.setSource(new String[]{"saas"});

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

@@ -31,6 +31,11 @@ public enum OrderChannelType {
      */
     TIKTOK("dy", "抖音小程序"),
 
+    /**
+     * 收银单
+     */
+    CASHIER("cashier", "收银单"),
+
     POINTSMALL("pointsmall", "积分商城");
 
     private String code;

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

@@ -27,6 +27,7 @@ import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderChangeStateReq;
+import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest;
 import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
@@ -94,6 +95,14 @@ public class CashierOrderServiceImpl implements CashierOrderService {
         OrderBeanV1 orderBeanV1 = orderSdkAdapter.convent2NEWOrderInfo(response.getResult());
         createPrepayRequestDto.setProductOrderBean(orderBeanV1);
         createPrepayRequestDto.setFatherOrderBean(orderBeanV1);
+        OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto();
+        orderExtInfoDto.setOpenid(member.getOpenId());
+        orderExtInfoDto.setAppid(member.getWxAppId());
+        orderExtInfoDto.setSessionId(member.getSessionId());
+        orderExtInfoDto.setVersion(createOrderDto.getVersion());
+        orderExtInfoDto.setSessionKey(member.getSessionKey());
+        orderExtInfoDto.setFromAppId(member.getWxAppId());
+        createPrepayRequestDto.setOrderExtInfoDTO(orderExtInfoDto);
         return payService.createPrepayOrder(createPrepayRequestDto);
     }
 

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

@@ -3530,6 +3530,8 @@ public class OrderServiceImpl implements Orderservice {
             channelType = OrderChannelType.APP.getCode();
         } else if (OrderChannelType.BEAUTIFUL.getCode().equals(queryOrderVo.getChannelType())) {
             channelType = OrderChannelType.BEAUTIFUL.getCode();
+        } else if (OrderChannelType.CASHIER.getCode().equals(queryOrderVo.getChannelType())) {
+            channelType = OrderChannelType.CASHIER.getCode();
         }
         return channelType;
     }