From df6a117d2923400fef1ed14cd60d14f56f4a6eec Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 10 Mar 2021 15:37:54 +0800
Subject: [PATCH] Merge branch 'api' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WXShopOrderService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WXShopOrderService.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WXShopOrderService.java
index ac90aef..3dabe15 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WXShopOrderService.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WXShopOrderService.java
@@ -18,7 +18,7 @@
- BigDecimal calculationPostage(Integer addressId, BigDecimal payPrice);
+ BigDecimal calculationPostage(BigDecimal payPrice,Long companyId);
/**
* 创建订单
@@ -93,5 +93,5 @@
*/
AjaxResult updateStockAndVolumeById(Integer orderId);
- DiscountExplain buildDiscountExplain(List<ShopCartVo> cartList, Integer id, Integer addrId);
+ DiscountExplain buildDiscountExplain(List<ShopCartVo> cartList, Integer id, Long companyId);
}
--
Gitblit v1.9.1