From 560228ac3c15cccce0b2a5994d44e4e81b5b3b73 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 11:12:22 +0800
Subject: [PATCH] 合并服务单订单改造分支

---
 zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java |   34 ++++++++--------------------------
 1 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java
index 5f21562..91f18c7 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java
@@ -8,10 +8,9 @@
 import com.matrix.system.hive.bean.SysOrder;
 import com.matrix.system.hive.plugin.util.BaseServices;
 import com.matrix.system.hive.pojo.CzXkVo;
-import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
-import org.springframework.transaction.annotation.Transactional;
+import com.matrix.system.padApi.dto.PadOrderListDto;
+import com.matrix.system.padApi.vo.PadOrderDetailVo;
 
-import javax.servlet.http.HttpSession;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -83,19 +82,9 @@
 	* @date 2016年7月18日 上午11:14:07
 	* @throws
 	 */
-	public void updateReceiptMoney(SysOrder sysOrder) throws GlobleException;
+	public void payOrder(SysOrder sysOrder) throws GlobleException;
 
-	public void refundOrderMoney(SysOrder sysOrder);
-
-	/**
-	 * 创建订单
-	 * @param session
-	 * @param car
-	 * @return
-	 */
-	@Transactional(rollbackFor = Exception.class)
-	public int createOrder(HttpSession session, ShoppingCarItemsVo car);
-
+	public void orderTk(SysOrder sysOrder);
 
 	/**
 	 * 补交
@@ -113,17 +102,7 @@
 	* @date 2016年9月20日 下午12:07:21
 	* @throws
 	 */
-	public SysOrder updateAddCardMoney(CzXkVo czVo);
-
-
-	public void addMoneyCardUse(SysOrder sourceOrder);
-
-	public void addOutStore(SysOrder sourceOrder);
-
-	public void addTaocanProj(SysOrder sourceOrder);
-
-	public void setShopSelCount(SysOrder sourceOrder);
-
+	public SysOrder moneyCardCz(CzXkVo czVo);
 
 	/**
 	 * 校验订单是否满足结算条件
@@ -137,6 +116,8 @@
 
 	List<OrderDetailVo> findApiOrderListInPage(OrderListDto orderListDto, PaginationVO pageVo);
 
+	List<PadOrderDetailVo> findPadApiOrderListInPage(PadOrderListDto orderListDto, PaginationVO pageVo);
+
 	int findApiOrderListTotal(OrderListDto orderListDto);
 
 	OrderDetailVo findApiOrderDetailByOrderId(Long orderId);
@@ -145,4 +126,5 @@
 
 	BigDecimal findVipArrearsByVipId(Long vipId);
 
+	int findPadApiOrderListTotal(PadOrderListDto orderListDto);
 }
\ No newline at end of file

--
Gitblit v1.9.1