From 9fbd7c475b86b79d2820fc6cf8b49c408dd279c7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 16 Jan 2021 23:19:17 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml                           |    1 +
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java |    4 +++-
 zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java                 |    2 +-
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java      |    2 ++
 zq-erp/src/main/resources/config/application.properties                                 |    2 +-
 zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml                    |    2 +-
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
index bdae1a1..5a4b4fe 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
@@ -64,7 +64,7 @@
             QueryUtil.setQueryLimitCom(achieveNew);
             achieveNew.setType(rankingDto.getType());
             achieveNew.setDatatime(new Date());
-            List<RankingVo> list = achieveNewDao.selectStaffSaleAchieveRanking(achieveNew);
+            List<RankingVo> list = achieveNewDao.selectShopConsumeAchieveRanking(achieveNew);
             ajaxResult.setRows(list);
         } else {
             AchieveNew achieveNew = new AchieveNew();
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 98cdde4..be82e79 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
@@ -186,6 +186,7 @@
             achieveNew.setServiceOrderId(projServices.getId());
             achieveNew.setOrderItemId(beauticianState.getId());
             achieveNew.setShopId(projServices.getShopId());
+            achieveNew.setCompanyId(projServices.getCompanyId());
             achieveNew.setShoppingGoodsId(projUse.getProjId());
             achieveNew.setNumberOfPeople(1D / size);
             achieveNew.setProjNum(1);
@@ -257,6 +258,7 @@
         achieveNew.setOrderId(pageOrder.getId());
         achieveNew.setOrderItemId(orderItem.getId());
         achieveNew.setShopId(pageOrder.getShopId());
+        achieveNew.setCompanyId(pageOrder.getCompanyId());
         achieveNew.setShoppingGoodsId(orderItem.getGoodsId());
         // 是否赠送
         achieveNew.setT2(orderItem.getIsFree());
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
index e8a589d..405a534 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
@@ -400,7 +400,7 @@
 
 
         // 设置成功状态
-        projServices.setState(Dictionary.SERVICE_STATU_YYCG);
+        projServices.setState(Dictionary.SERVICE_STATU_XPL);
         // 判断当前门店是否有历史美疗师
         LastestWorkBeatuistaff lastWorkStaff = new LastestWorkBeatuistaff();
         lastWorkStaff.setShopId(checkProjServices.getShopId());
@@ -578,6 +578,8 @@
             projServices.setState(Dictionary.SERVICE_STATU_FFJS);
             projServices.setConsumeTime(new Date());
             int result=sysProjServicesDao.update(projServices);
+            achieveNewService.addAchieveByServiceOrder(projServices);
+
             //发送微信公众号提醒
             UniformMsgParam uniformMsgParam=new UniformMsgParam(projServices.getCompanyId(),UniformMsgParam.GZH_FWWC);
             uniformMsgParam.put("serviceId",projServices.getId());
diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties
index c427966..0cc9ddf 100644
--- a/zq-erp/src/main/resources/config/application.properties
+++ b/zq-erp/src/main/resources/config/application.properties
@@ -1,4 +1,4 @@
-evn=ffff
+evn=dev
 server.port=8080
 
 
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
index bd84c02..ebf0f83 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
@@ -700,7 +700,7 @@
                         and a.company_id=#{companyId}
                     </if>
                     ) cardAchieve,
-                (select IFNULL(sum(amount),0) from sys_order_flow where flow_type = '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
+                (select IFNULL(sum(amount),0) from sys_order_flow where flow_type = '还款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
                     <if test="shopId != null">
                         and shop_id=#{shopId}
                     </if>
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 737b370..62c25ce 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -18,6 +18,7 @@
         <result property="statu" column="STATU"/>
         <result property="zkTotal" column="ZK_TOTAL"/>
         <result property="shopId" column="SHOP_ID"/>
+        <result property="companyId" column="company_id"/>
         <result property="vipName" column="VIP_NAME"/>
         <result property="vipNo" column="VIP_NO"/>
         <result property="staffName" column="STAFF_NAME"/>

--
Gitblit v1.9.1