ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit d827e4029b035dd9d667be00d683285ca71304ee 2 parents 0454ab9a dbce6709

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

# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/seller/ImportPublishExcutor.java
Inline Side-by-side
Showing 1 changed file with 5 additions and 1 deletions
@@ -37,6 +37,7 @@ public class ImportPublishExcutor implements PublishExcutor<BatchImportPrdReq, S @@ -37,6 +37,7 @@ public class ImportPublishExcutor implements PublishExcutor<BatchImportPrdReq, S
37 Integer storageId; 37 Integer storageId;
38 BigDecimal salePrice; 38 BigDecimal salePrice;
39 int storageNum; 39 int storageNum;
  40 + BigDecimal goodsPaymentRate;
40 AddressInfo hiddenBackAddress; 41 AddressInfo hiddenBackAddress;
41 AddressInfo noHiddenBackAddress; 42 AddressInfo noHiddenBackAddress;
42 } 43 }
@@ -72,6 +73,7 @@ public class ImportPublishExcutor implements PublishExcutor<BatchImportPrdReq, S @@ -72,6 +73,7 @@ public class ImportPublishExcutor implements PublishExcutor<BatchImportPrdReq, S
72 int storageNum = importPrd.getNum(); 73 int storageNum = importPrd.getNum();
73 ImPrdNode node = ImPrdNode.builder().uid(uid) 74 ImPrdNode node = ImPrdNode.builder().uid(uid)
74 .isSuper(isSuper) 75 .isSuper(isSuper)
  76 + .goodsPaymentRate(importPrd.getGoodsPaymentRate())
75 .storageId(storageId).salePrice(salePrice).storageNum(storageNum) 77 .storageId(storageId).salePrice(salePrice).storageNum(storageNum)
76 .noHiddenBackAddress(req.getNoHiddenBackAddress()) 78 .noHiddenBackAddress(req.getNoHiddenBackAddress())
77 .hiddenBackAddress(req.getHiddenBackAddress()).build(); 79 .hiddenBackAddress(req.getHiddenBackAddress()).build();
@@ -104,7 +106,9 @@ public class ImportPublishExcutor implements PublishExcutor<BatchImportPrdReq, S @@ -104,7 +106,9 @@ public class ImportPublishExcutor implements PublishExcutor<BatchImportPrdReq, S
104 int storageNum = node.storageNum; 106 int storageNum = node.storageNum;
105 AddressInfo hiddenBackAddress = node.hiddenBackAddress; 107 AddressInfo hiddenBackAddress = node.hiddenBackAddress;
106 AddressInfo noHiddenBackAddress = node.noHiddenBackAddress; 108 AddressInfo noHiddenBackAddress = node.noHiddenBackAddress;
107 - SellerOrderContext ctx = sellerOrderPrepareProcessor.buildImportPrdCxt(uid, storageId, salePrice, storageNum); 109 + //add GoodsPaymentRate
  110 + SellerOrderContext ctx = sellerOrderPrepareProcessor.buildImportPrdCxt(uid, storageId, salePrice, storageNum,
  111 + node.getGoodsPaymentRate());
108 ctx.setBackAddress(noHiddenBackAddress); 112 ctx.setBackAddress(noHiddenBackAddress);
109 ctx.setBackHiddenAddress(hiddenBackAddress); 113 ctx.setBackHiddenAddress(hiddenBackAddress);
110 long batchNo = skupBatchService.generateBatchNo(uid, storageNum); 114 long batchNo = skupBatchService.generateBatchNo(uid, storageNum);