Merge branch 'dev_6.8.7_order_出售权限' into test6.8.8

# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/seller/ImportPublishExcutor.java

@@ -37,6 +37,7 @@ public class ImportPublishExcutor implements PublishExcutor<BatchImportPrdReq, S
         Integer storageId;
         BigDecimal salePrice;
         int storageNum;
+        BigDecimal goodsPaymentRate;
         AddressInfo hiddenBackAddress;
         AddressInfo noHiddenBackAddress;
     }
@@ -72,6 +73,7 @@ public class ImportPublishExcutor implements PublishExcutor<BatchImportPrdReq, S
                 int storageNum = importPrd.getNum();
                 ImPrdNode node = ImPrdNode.builder().uid(uid)
                         .isSuper(isSuper)
+                        .goodsPaymentRate(importPrd.getGoodsPaymentRate())
                         .storageId(storageId).salePrice(salePrice).storageNum(storageNum)
                         .noHiddenBackAddress(req.getNoHiddenBackAddress())
                         .hiddenBackAddress(req.getHiddenBackAddress()).build();
@@ -104,7 +106,9 @@ public class ImportPublishExcutor implements PublishExcutor<BatchImportPrdReq, S
         int storageNum = node.storageNum;
         AddressInfo hiddenBackAddress = node.hiddenBackAddress;
         AddressInfo noHiddenBackAddress = node.noHiddenBackAddress;
-        SellerOrderContext ctx = sellerOrderPrepareProcessor.buildImportPrdCxt(uid, storageId, salePrice, storageNum);
+        //add GoodsPaymentRate
+        SellerOrderContext ctx = sellerOrderPrepareProcessor.buildImportPrdCxt(uid, storageId, salePrice, storageNum,
+                node.getGoodsPaymentRate());
         ctx.setBackAddress(noHiddenBackAddress);
         ctx.setBackHiddenAddress(hiddenBackAddress);
         long batchNo = skupBatchService.generateBatchNo(uid, storageNum);