From 3d1f4f2663e97e0bb2973164bc1fbc46ef56bfbe Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 31 May 2022 12:14:37 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into developer

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml                    |   11 +----------
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java |    2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
index f32259e..c3bd40b 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
@@ -359,7 +359,7 @@
 
     private void buildAchieve(SysOrder pageOrder, SysOrderItem orderItem, AchieveNew achieveNew) {
         BusParameterSettings shopManageJjcpasConsume =null;
-        if (Dictionary.ORDER_STATU_TK.equals(pageOrder.getStatu())) {
+        if (SysOrder.ORDER_TYPE_REFUND == pageOrder.getOrderType()) {
             achieveNew.setId(null);
             achieveNew.setProjPercentage(0 - achieveNew.getProjPercentage());
             achieveNew.setGoodsCash(0 - achieveNew.getGoodsCash());
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
index bec32e5..7ab788a 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
@@ -440,9 +440,6 @@
             <if test="shopId != null and shopId !='' ">
                 SHOP_ID = #{shopId},
             </if>
-            <if test="isDelete != null and isDelete !='' ">
-                IS_DELETE = #{isDelete},
-            </if>
             <if test="passWord != null and passWord !='' ">
                 PASSWORD = #{passWord},
             </if>
@@ -863,9 +860,6 @@
             <if test="record.shopId != null and record.shopId !='' ">
                 and a.SHOP_ID = #{record.shopId}
             </if>
-            <if test="record.isDelete != null and record.isDelete !='' ">
-                and a.IS_DELETE = #{record.isDelete}
-            </if>
             <if test="record.passWord != null and record.passWord !='' ">
                 and a.PASSWORD = #{record.passWord}
             </if>
@@ -932,7 +926,7 @@
 
 
     <sql id="where1">
-        where 1=1
+        where    a.IS_DELETE = 'N'
         <if test="record!=null">
             <if test="record.id != null and record.id !='' ">
                 and a.ID = #{record.id}
@@ -994,9 +988,6 @@
             </if>
             <if test="record.shopId != null and record.shopId !='' ">
                 and a.SHOP_ID = #{record.shopId}
-            </if>
-            <if test="record.isDelete != null and record.isDelete !='' ">
-                and a.IS_DELETE = #{record.isDelete}
             </if>
             <if test="record.passWord != null and record.passWord !='' ">
                 and a.PASSWORD = #{record.passWord}

--
Gitblit v1.9.1