Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MaidianLogDTO.java

@@ -45,6 +45,12 @@ public class MaidianLogDTO implements Serializable{
     private Integer stayTime;
     
     private String trackSign;
+    
+    private Integer storeStatus;
+    
+    private String storeId;
+    
+    private String clerkCode;
 
     private Date createTime;
 
@@ -227,6 +233,30 @@ public class MaidianLogDTO implements Serializable{
 	public void setTrackSign(String trackSign) {
 		this.trackSign = trackSign;
 	}
+
+	public Integer getStoreStatus() {
+		return storeStatus;
+	}
+
+	public void setStoreStatus(Integer storeStatus) {
+		this.storeStatus = storeStatus;
+	}
+
+	public String getStoreId() {
+		return storeId;
+	}
+
+	public void setStoreId(String storeId) {
+		this.storeId = storeId;
+	}
+
+	public String getClerkCode() {
+		return clerkCode;
+	}
+
+	public void setClerkCode(String clerkCode) {
+		this.clerkCode = clerkCode;
+	}
     
     
 

haoban-manage3-service/pom.xml

@@ -122,6 +122,11 @@
             <version>${gic-thirdparty-api}</version>
         </dependency>
 
+		<dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>haoban-app-customer-api</artifactId>
+            <version>${haoban-app-customer-api}</version>
+        </dependency>
 		</dependencies>
     
     <build>

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanMaidianLog.java

@@ -43,6 +43,12 @@ public class TabHaobanMaidianLog implements Serializable {
     private Integer stayTime;
     
     private String trackSign;
+    
+    private Integer storeStatus;
+    
+    private String storeId;
+    
+    private String clerkCode;
 
     private Date createTime;
 
@@ -225,6 +231,30 @@ public class TabHaobanMaidianLog implements Serializable {
 	public void setTrackSign(String trackSign) {
 		this.trackSign = trackSign;
 	}
+
+	public Integer getStoreStatus() {
+		return storeStatus;
+	}
+
+	public void setStoreStatus(Integer storeStatus) {
+		this.storeStatus = storeStatus;
+	}
+
+	public String getStoreId() {
+		return storeId;
+	}
+
+	public void setStoreId(String storeId) {
+		this.storeId = storeId;
+	}
+
+	public String getClerkCode() {
+		return clerkCode;
+	}
+
+	public void setClerkCode(String clerkCode) {
+		this.clerkCode = clerkCode;
+	}
     
     
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -5,6 +5,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.commons.util.GlobalInfo;
 import com.gic.commons.util.GlobalVar;
+import com.gic.haoban.app.customer.service.api.service.InnerApiService;
 import com.gic.haoban.base.api.common.Constant;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
@@ -71,6 +72,9 @@ public class MessageApiServiceImpl implements MessageApiService {
     @Autowired
 	private QQCloudPicService qqCloudPicService;
     
+    @Autowired
+    private InnerApiService innerApiService;
+    
     private final String CONTACT_APP = "contactSuiteId";
 
     @Override
@@ -347,6 +351,7 @@ public class MessageApiServiceImpl implements MessageApiService {
     				if(StringUtils.isNotBlank(staffRelated.getClerkCode())){
     					staffApiService.cleanGicClerk(staffRelated.getClerkCode(), staffRelated.getDepartmentId());
     				}
+    				innerApiService.delCardByStaffId(oldStaff.getStaffId());
     				this.staffDepartmentRelatedService.del(EntityUtil.changeEntityByJSON(StaffDepartmentRelatedDTO.class, staffRelated));
     				this.staffService.delByuserid(oldStaff.getStaffId());
                 }else {

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -61,5 +61,7 @@
 
 
     <dubbo:reference id="qqCloudPicService" interface="com.gic.thirdparty.api.service.QQCloudPicService" timeout="10000" retries="0" check="false" />
+    
+    <dubbo:reference id="innerApiService" interface="com.gic.haoban.app.customer.service.api.service.InnerApiService" timeout="10000" retries="0" check="false" />
 
 </beans>
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/TabHaobanMaidianLogMapper.xml

@@ -22,13 +22,16 @@
     <result column="system_info" property="systemInfo" jdbcType="VARCHAR" />
     <result column="stay_time" property="stayTime" jdbcType="INTEGER" />
     <result column="track_sign" property="trackSign" jdbcType="VARCHAR" />
+    <result column="store_id" property="storeId" jdbcType="VARCHAR" />
+    <result column="clerk_code" property="clerkCode" jdbcType="VARCHAR" />
+    <result column="store_status" property="storeStatus" jdbcType="INTEGER" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
     maidian_id, staff_id, wx_enterprise_id, phone_number, device_date, options, event, 
     url, context, scene, platform, model, brand, hbversion, system, sdk_version, version, 
-    system_info, stay_time, create_time, update_time,track_sign
+    system_info, stay_time, create_time, update_time,track_sign,store_id,,store_status,clerk_code
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -47,7 +50,7 @@
       scene, platform, model, 
       brand, hbversion, system, 
       sdk_version, version, system_info, 
-      stay_time, create_time, update_time,track_sign
+      stay_time, create_time, update_time,track_sign,store_status,clerk_code,store_id
       )
     values (#{maidianId,jdbcType=INTEGER}, #{staffId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, 
       #{phoneNumber,jdbcType=VARCHAR}, #{deviceDate,jdbcType=TIMESTAMP}, #{options,jdbcType=VARCHAR}, 
@@ -55,7 +58,8 @@
       #{scene,jdbcType=VARCHAR}, #{platform,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, 
       #{brand,jdbcType=VARCHAR}, #{hbversion,jdbcType=VARCHAR}, #{system,jdbcType=VARCHAR}, 
       #{sdkVersion,jdbcType=VARCHAR}, #{version,jdbcType=VARCHAR}, #{systemInfo,jdbcType=VARCHAR}, 
-      #{stayTime,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},#{trackSign}
+      #{stayTime,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},#{trackSign},
+      #{storeStatus},#{clerkCode},#{storeId}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianLog" >

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/auth/AuthRequestUtil.java

@@ -30,13 +30,13 @@ public class AuthRequestUtil {
     public static final String REDIS_FAKE_LOGIN_FLAG_PREFIX = "GIC:HAOBAN:HAOBAN_MOBILE_APP:FAKE_LOGIN_TOKEN:";
     public static String LOGIN_SESSION_KEY = "HAOBAN:LOGINUSER";
 
-    public static LoginVO getSessionUser() {
-        String json = (String) getSession().getAttribute(LOGIN_SESSION_KEY);
-        if (StringUtils.isBlank(json)){
-            return null;
-        }
-        return JSON.parseObject(json, LoginVO.class);
-    }
+//    public static LoginVO getSessionUser() {
+//        String json = (String) getSession().getAttribute(LOGIN_SESSION_KEY);
+//        if (StringUtils.isBlank(json)){
+//            return null;
+//        }
+//        return JSON.parseObject(json, LoginVO.class);
+//    }
 
     public static void setSessionUser(Object obj) {
         String userJson = JSON.toJSONString(obj);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/ApplicationController.java

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.web.controller;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -23,6 +24,7 @@ import com.gic.haoban.manage.web.anno.IgnoreLogin;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.vo.LoginVO;
+import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 
@@ -89,6 +91,25 @@ public class ApplicationController extends WebBaseController{
 		if(CollectionUtil.isNotEmpty(applicationIds)){
 			closeList = applicationApiService.listByApplications(applicationIds);
 		}		
+		Object o = RedisUtil.getCache("haobanWxEnterpriseIdAppOpen");
+		String wxEnterpriseIds = o == null?"":o.toString();
+		if(!wxEnterpriseIds.contains(wxEnterpriseId)){
+			//不开启
+			Iterator<ApplicationDTO> it = openList.iterator();
+			while(it.hasNext()){
+				ApplicationDTO s = it.next();
+				if(s.getApplicationName().contains("内购券")){
+					it.remove();
+				}
+			}
+			Iterator<ApplicationDTO> it2 = closeList.iterator();
+			while(it2.hasNext()){
+				ApplicationDTO s = it2.next();
+				if(s.getApplicationName().contains("内购券")){
+					it2.remove();
+				}
+			}
+		}
 		map.put("open", openList);
 		map.put("close", closeList);
 		return resultResponse(HaoBanErrCode.ERR_1,map);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java

@@ -234,7 +234,7 @@ public class DepartmentContoller extends WebBaseController{
 	
 	@RequestMapping("department-recycle-count")
 	public HaobanResponse departmentRecycleCount() {
-		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		Integer count = departmentApiService.departmentRecycleCount(wxEnterpriseId);
 		Map<String,Object> map = new HashMap<String, Object>();
@@ -270,7 +270,7 @@ public class DepartmentContoller extends WebBaseController{
 	@RequestMapping("department-batch-sync")
 	@ResponseBody
 	public HaobanResponse departmentBatchSync(@RequestBody SyncDepartmentQO args) {
-		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		String key = "haoban-sync-department-" + wxEnterpriseId;
 		if(RedisUtil.getCache(key) != null){
@@ -597,7 +597,7 @@ public class DepartmentContoller extends WebBaseController{
 	
 	@RequestMapping("department-recycle-list")
 	public HaobanResponse departmentRecycleList(String keyWord,Integer storeFlag,BasePageInfo pageInfo) {
-		LoginVO login =  (LoginVO) AuthRequestUtil.getSessionUser();
+		LoginVO login =  (LoginVO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId  = login.getWxEnterpriseId();
 		Integer recycleFlag = 1;
 		Page<DepartmentDTO> page = departmentApiService.pageDepartmentByParams(pageInfo,wxEnterpriseId,keyWord,storeFlag,recycleFlag);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/SyncDealContoller.java

@@ -157,7 +157,7 @@ public class SyncDealContoller extends WebBaseController {
     @ResponseBody
     public HaobanResponse syncTask(String wxEnterpriseId, BasePageInfo pageInfo) {
         if (StringUtils.isBlank(wxEnterpriseId)) {
-            LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
             wxEnterpriseId = login.getWxEnterpriseId();
         }
         Page<SyncTaskDTO> retPage = dealSyncOperationApiService.listSyncTask(wxEnterpriseId, pageInfo);
@@ -176,7 +176,7 @@ public class SyncDealContoller extends WebBaseController {
     @ResponseBody
     public HaobanResponse syncTaskDetail(String wxEnterpriseId, String taskId, BasePageInfo pageInfo) {
         if (StringUtils.isBlank(wxEnterpriseId)) {
-            LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
             wxEnterpriseId = login.getWxEnterpriseId();
         }
         Page<PreDealLogInfoDTO> retPage = dealSyncOperationApiService.listSyncTaskDetail(wxEnterpriseId, taskId, pageInfo);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -66,7 +66,7 @@ public class WxEnterpriseController extends WebBaseController{
 	@RequestMapping("wx-enterprise-list")
 	public HaobanResponse wxEnterpriseList() {
 //		String wxEnterpriseId = "123456";
-		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
 		if(CollectionUtil.isNotEmpty(list)){

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ApplicationController.java

@@ -49,6 +49,14 @@ public class ApplicationController extends WebBaseController{
 				it.remove();
 				continue ;
 			}
+			if("卡券赠送".equals(app.getApplicationName())){
+				it.remove();
+				continue ;
+			}
+			if("内购券".equals(app.getApplicationName())){
+				it.remove();
+				continue ;
+			}
 		}
 		
 		return resultResponse(HaoBanErrCode.ERR_1,list);