From f83b62252df79afbfa19f4cf1be0487d9e37a123 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 May 2022 18:48:09 +0800
Subject: [PATCH] 20220505

---
 zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java |   40 ++++++++++++----------------------------
 1 files changed, 12 insertions(+), 28 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 23cfd15..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,10 @@
 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;
 
 /**
@@ -38,7 +38,7 @@
 	 */
 	public int remove(List<Long> list);
 
-	public int cancelOrder(Long id);
+	public void cancelOrder(Long id);
 	/**
 	 * 根据id删除SysOrder
 	 *
@@ -82,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);
 
 	/**
 	 * 补交
@@ -112,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);
 
 	/**
 	 * 校验订单是否满足结算条件
@@ -136,11 +116,15 @@
 
 	List<OrderDetailVo> findApiOrderListInPage(OrderListDto orderListDto, PaginationVO pageVo);
 
+	List<PadOrderDetailVo> findPadApiOrderListInPage(PadOrderListDto orderListDto, PaginationVO pageVo);
+
 	int findApiOrderListTotal(OrderListDto orderListDto);
 
 	OrderDetailVo findApiOrderDetailByOrderId(Long orderId);
 
 	List<RankingVo> findApiShopAchieveRanking(SysOrder sysOrder);
 
-	List<RankingVo> findStaffSaleAchieveRanking(SysOrder sysOrder);
+	BigDecimal findVipArrearsByVipId(Long vipId);
+
+	int findPadApiOrderListTotal(PadOrderListDto orderListDto);
 }
\ No newline at end of file

--
Gitblit v1.9.1