From 058361ab0233f5e7d5dd4d6f674137432dd8d063 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 19 Apr 2021 17:58:43 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java |    2 +-
 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java                         |   15 +++++++++++++++
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java     |    4 ++--
 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java                       |   15 +++++++++++++++
 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml                        |    2 ++
 5 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
index 13decc4..8f9cbbb 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
@@ -39,6 +39,9 @@
     @ApiModelProperty(value = "快过期 1-是 2-否")
     private String isInvalid;
 
+    @ApiModelProperty(value = "项目状态 有效/无效")
+    private String status;
+
     public String getIsInvalid() {
         Date date = DateUtil.getDateAfterMonth(new Date(), 1);
         if (invalidTime != null) {
@@ -112,4 +115,16 @@
     public void setId(Long id) {
         this.id = id;
     }
+
+    public String getStatus() {
+        if ("有效".equals(status)) {
+            return "1";
+        } else {
+            return "2";
+        }
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
index 1c61e6d..67df2c9 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = "快过期 1-是 2-否")
     private String isInvalid;
 
+    @ApiModelProperty(value = "状态 有效/无效")
+    private String status;
+
     @ApiModelProperty(hidden = true)
     private List<SysProjUse> taocanProjUse;
 
@@ -135,4 +138,16 @@
     public void setProj(List<ServiceProjVo> proj) {
         this.proj = proj;
     }
+
+    public String getStatus() {
+        if ("有效".equals(status)) {
+            return "1";
+        } else {
+            return "2";
+        }
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }
diff --git a/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java b/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java
index e21ef75..e7597e6 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java
@@ -44,7 +44,7 @@
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
     if ("dev".equals(evn)) {
-            SysUsers sysUsers = sysUsersDao.selectById(1060L);
+            SysUsers sysUsers = sysUsersDao.selectById(1022L);
             request.getSession().setAttribute(MatrixConstance.LOGIN_KEY, sysUsers);
             return true;
         }
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 b22fdc1..f0c6d88 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
@@ -198,14 +198,14 @@
             achieveNew.setShoppingGoodsId(projUse.getProjId());
 
             if (flag) {
-                if (!achieveId.equals(beauticianState.getStaffId())) {
+//                if (!achieveId.equals(beauticianState.getStaffId())) {
                     AchieveNew saleMan = new AchieveNew();
                     BeanUtils.copyProperties(achieveNew, saleMan);
                     saleMan.setBeaultId(achieveId);
 
                     saleAchieveNumOfPeople(saleMan);
                     achieveNewList.add(saleMan);
-                }
+//                }
             }
 
             List<AchieveNew> beautyList = achieveNewDao.selectBeautyManAchieveList(beauticianState.getStaffId(), projServices.getVipId(), new Date());
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
index 295413f..d49243d 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -896,6 +896,7 @@
             <result property="timeLength" column="proj_time_length"/>
             <result property="img" column="proj_img"/>
             <result property="projId" column="proj_projId"/>
+            <result property="status" column="proj_status"/>
         </collection>
     </resultMap>
 
@@ -911,6 +912,7 @@
             e.SURPLUS_COUNT proj_SURPLUS_COUNT,
             e.id proj_info_id,
             e.proj_id proj_projId,
+            e.status proj_status,
             f.time_length proj_time_length,
             f.img proj_img
         from sys_proj_use a

--
Gitblit v1.9.1