Merge branch 'feature/zxh/创建订单传递storeUnifyId参数（门店ID）-20230612' into qa

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

@@ -227,6 +227,7 @@ public class OrderSdkAdapter {
         com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest request = new com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest();
         request.setPartnerId(requestVO.getCompanyId());
         request.setStoreId(requestVO.getShopId());
+        request.setStoreUnifyId(requestVO.getStoreUnifyId());
         //1:线上支付 2:线下支付
         request.setPayType(1);
         request.setUserId(requestVO.getUserId());

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

@@ -27,6 +27,10 @@ public class BaseCreateOrderRequest extends BaseConfig {
      * 门店ID
      */
     private String shopId;
+
+
+    //门店全局唯一编号 等同 门店的 storeId 不是storeCode
+    private String storeUnifyId;
     /**
      * 第三方门店
      */

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

@@ -146,6 +146,7 @@ public class OrderAdapter {
     public BaseCreateOrderRequest convent2CreateOrderDto(CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto,
                                                          StoreResponseDto storeResponseDto) {
         BaseCreateOrderRequest createOrderDto = getCreateOrderDto(createOrderVo);
+        createOrderDto.setStoreUnifyId(storeResponseDto != null ? storeResponseDto.getStoreId() : "0");
         ArrayList<CreateOrderAccountRequest> orderAccountDtos = new ArrayList<>();
         long deliveryAmount = 0;
         long discountDeliveryAmount = 0;

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

@@ -896,6 +896,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         //2:虚拟商品订单
         request.setPhysicalGoodsFlag(OrderPhysicalGoodsFlagEnum.PHYSICALGOODSFLAG_TWO);
         request.setUserSourceType(OrderUserSourceTypeEnum.USERSOURCETYPE_ONE);
+        request.setStoreUnifyId(storeInfo.getStoreId());
         return request;
 
     }