Merge remote-tracking branch 'origin/develop' into develop

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

@@ -3436,6 +3436,7 @@ public class OrderAdapter {
                 , createOrderOperateDto.getFatherOrderBean().getOid()
                 , null
                 , createOrderVo.getUnionPayCard()
+                , createOrderVo.getShopId()
                 , createOrderVo.getOrderPayItemCreateReqList()
                 , createOrderVo.getCashAmount()
                 , createOrderVo.getSvcAmount());
@@ -3453,6 +3454,7 @@ public class OrderAdapter {
             ,String transId
             , OrderClientType orderClient
             , CreateOrderVo.UnionPayCard unionPayCard
+            , String storeId
             , List<OrderPayItemCreateReq> payItem
             , BigDecimal cashAmount
             , BigDecimal svcAmount){
@@ -3471,6 +3473,7 @@ public class OrderAdapter {
         requestDto.setTransId(transId);
         requestDto.setOrderClient(orderClient);
         requestDto.setUnionPayCard(unionPayCard);
+        requestDto.setStoreId(storeId);
         requestDto.setOrderPayItemCreateReqList(payItem);
         requestDto.setCashAmount(cashAmount);
         requestDto.setSvcAmount(svcAmount);