From 8243c06e629d79bba0388e6fb4f0e1ae70281ded Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 25 Mar 2022 12:30:10 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/feature/订单服务单代码改造' into feature/订单服务单代码改造 --- zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java | 29 +++-------------------------- 1 files changed, 3 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..3b8db13 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,7 @@ 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 javax.servlet.http.HttpSession; import java.math.BigDecimal; import java.util.List; @@ -83,19 +80,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 +100,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); /** * 校验订单是否满足结算条件 -- Gitblit v1.9.1