From 2e773eadb5876015e80c9e4c88502f4a28530643 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 24 Dec 2020 18:43:39 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml                |    2 +-
 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
index 84cb5ca..96325cc 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
@@ -1,6 +1,9 @@
 package com.matrix.system.app.action;
 
+import com.matrix.core.pojo.AjaxResult;
 import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,4 +15,10 @@
 @RestController
 @RequestMapping(value = "/api/serviceOrder")
 public class ApiServiceOrderAction {
+
+    @GetMapping(value = "/findVipProject/{vipId}")
+    public AjaxResult findVipProject(@PathVariable("vipId") Long vipId) {
+        return null;
+    }
+
 }
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
index 302d7bf..d86c4f7 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -540,7 +540,7 @@
                a.cash_Pay cashPay,
                a.card_Pay cardPay,
                a.ZK_TOTAL needPay,
-               a.card_Pay + a.card_Pay realPay,
+               a.cash_Pay + a.card_Pay realPay,
                a.arrears arrears,
                a.TOTAL - a.ZK_TOTAL discount,
                a.STATU orderStatus,

--
Gitblit v1.9.1