From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WXShopOrderService.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 3dabe15..8430dc5 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
@@ -1,15 +1,12 @@
package com.matrix.system.shopXcx.api.service;
-import com.matrix.core.pojo.AjaxResult;
import com.matrix.component.wechat.externalInterface.protocol.paramProtocol.BrandWCPayRequestData;
-import com.matrix.system.shopXcx.bean.ShopOrder;
-import com.matrix.system.shopXcx.dto.DiscountExplain;
-import com.matrix.system.shopXcx.api.pojo.AddShopOrderPOJO;
+import com.matrix.core.pojo.AjaxResult;
import com.matrix.system.shopXcx.api.pojo.OrderInfoQueryPOJO;
-import com.matrix.system.shopXcx.api.vo.ShopCartVo;
+import com.matrix.system.shopXcx.api.pojo.ShopOrderDto;
+import com.matrix.system.shopXcx.bean.ShopOrder;
import java.math.BigDecimal;
-import java.util.List;
/**
* @author jyy
@@ -22,11 +19,11 @@
/**
* 创建订单
- * @param addShopOrderPOJO
+ * @param shopOrderDto
* @return
* @throws Exception
*/
- AjaxResult createShopOrder(AddShopOrderPOJO addShopOrderPOJO) throws Exception;
+ ShopOrder createShopOrder(ShopOrderDto shopOrderDto) throws Exception;
/**
* 订单结算
@@ -93,5 +90,5 @@
*/
AjaxResult updateStockAndVolumeById(Integer orderId);
- DiscountExplain buildDiscountExplain(List<ShopCartVo> cartList, Integer id, Long companyId);
+ AjaxResult buildDiscountExplain(ShopOrderDto shopOrderDto);
}
--
Gitblit v1.9.1