Skip to content

H
haoban-manage3.0
Commit 565ae7fe by 墨竹
Options

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

parents a4d6a555 0b757ebd
Showing with 178 additions and 208 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanOperationSettingMapper.java
......@@ -2,7 +2,6 @@ package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.service.entity.TabHaobanOperationSetting;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
......@@ -33,14 +32,6 @@ public interface TabHaobanOperationSettingMapper {
int update(TabHaobanOperationSetting setting);
/**
* 通过主键删除数据
*
* @param settingId 主键
* @return 影响行数
*/
int deleteById(String settingId);
/**
* 通过ID查询单条数据
*
* @param settingId 主键
......@@ -56,22 +47,4 @@ public interface TabHaobanOperationSettingMapper {
*/
List<TabHaobanOperationSetting> queryAll(TabHaobanOperationSetting setting);
/**
* 分页总数
*
* @return 对象列表
*/
int queryCountByPage();
/**
* 分页列表
*
* @param offset 查询起始位置
* @param limit 查询条数
* @return 对象列表
*/
List<TabHaobanOperationSetting> queryListByPage(@Param("offset") int offset, @Param("limit") int limit);
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/ApplicationController.java
......@@ -2,6 +2,7 @@ package com.gic.haoban.manage.web.controller;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
......@@ -26,7 +27,6 @@ import com.gic.haoban.common.anno.IgnoreLogin;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.ApplicationDTO;
import com.gic.haoban.manage.api.dto.ApplicationSettingDTO;
import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
import com.gic.haoban.manage.api.dto.QywxCorpInfoDTO;
import com.gic.haoban.manage.api.dto.SecretSettingDTO;
......@@ -48,8 +48,6 @@ import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
import com.gic.wechat.api.service.qywx.QywxUserApiService;
import cn.hutool.core.collection.CollectionUtil;
@RestController
public class ApplicationController extends WebBaseController {
......@@ -102,28 +100,13 @@ public class ApplicationController extends WebBaseController {
Iterator<ApplicationDTO> it = list.iterator();
while (it.hasNext()) {
ApplicationDTO s = it.next();
if (s.getApplicationName().contains("内购券")) {
// 我的客户、营销任务、看数据、云日报、月指标、商品中心、订单评价、扫码核销、E袋洗、佣金结算
if(Arrays.asList("11111","11114","11121","11122").contains(s.getApplicationId())) {
it.remove();
}
}
}
List<String> applicationIds = list.stream().map(s -> s.getApplicationId()).collect(Collectors.toList());
List<ApplicationSettingDTO> result = applicationSettingApiService.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId, applicationIds);
//开启
List<ApplicationDTO> openList = new ArrayList<ApplicationDTO>();
List<String> openApplicationIds = new ArrayList<>();
if (CollectionUtil.isNotEmpty(result)) {
openApplicationIds = result.stream().map(s -> s.getApplicationId()).collect(Collectors.toList());
openList = applicationApiService.listByApplications(openApplicationIds);
}
//关闭
List<ApplicationDTO> closeList = new ArrayList<ApplicationDTO>();
applicationIds.removeAll(openApplicationIds);
if (CollectionUtil.isNotEmpty(applicationIds)) {
closeList = applicationApiService.listByApplications(applicationIds);
}
List<ApplicationVO> allList = new ArrayList<>();
list.forEach(item->{
ApplicationVO vo = EntityUtil.changeEntity(ApplicationVO.class, item) ;
......@@ -134,8 +117,6 @@ public class ApplicationController extends WebBaseController {
}
allList.add(vo) ;
});
map.put("open", openList);
map.put("close", closeList);
map.put("allList", allList) ;
if(null != loginUser) {
String enterpriseId = loginUser.getEnterpriseId() ;
......@@ -151,16 +132,16 @@ public class ApplicationController extends WebBaseController {
WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
String wxEnterpriseId = login.getWxEnterpriseId();
String enterpriseId = login.getEnterpriseId();
log.info("dataJson={}",dataJson);
if(StringUtils.isBlank(dataJson)) {
return resultResponse(HaoBanErrCode.ERR_2);
}
JSONArray jsonArr = JSONArray.parseArray(dataJson) ;
if(jsonArr.size()<=0) {
return resultResponse(HaoBanErrCode.ERR_2);
log.info("dataJson={},{}",dataJson,JSON.toJSONString(clerkEditInfo));
if(StringUtils.isNotBlank(dataJson)) {
JSONArray jsonArr = JSONArray.parseArray(dataJson) ;
if(jsonArr.size()<=0) {
return resultResponse(HaoBanErrCode.ERR_2);
}
this.applicationSettingApiService.saveSetting(wxEnterpriseId,jsonArr);
}else {
this.wxEnterpriseRelatedApiService.saveClerkEditFlag(wxEnterpriseId, enterpriseId, ClerkEditInfoVO.getValue(clerkEditInfo));
}
this.wxEnterpriseRelatedApiService.saveClerkEditFlag(wxEnterpriseId, enterpriseId, ClerkEditInfoVO.getValue(clerkEditInfo));
applicationSettingApiService.saveSetting(wxEnterpriseId,jsonArr);
return resultResponse(HaoBanErrCode.ERR_1);
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java
......@@ -187,8 +187,8 @@ public class AuditController extends WebBaseController{
//审核拒绝
@HttpLimit
@RequestMapping("refuse")
public HaobanResponse refuse(String auditId,String auditReason ,String auditName) {
if(StringUtils.isAnyBlank(auditId,auditReason,auditName)){
public HaobanResponse refuse(String auditId,String auditReason) {
if(StringUtils.isAnyBlank(auditId,auditReason)){
return resultResponse(HaoBanErrCode.ERR_2);
}
WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WelcomeController.java
......@@ -67,8 +67,8 @@ public class WelcomeController extends WebBaseController {
qdto.setWxEnterpriseId(qo.getWxEnterpriseId());
qdto.setTitle(qo.getTitle());
qdto.setWelcomeContent(qo.getWelcomeContent());
qdto.setOperatorId(null);
qdto.setOperatorName(null);
qdto.setOperatorId(login.getClerkId());
qdto.setOperatorName(login.getClerkName());
qdto.setDefaultWelcomeFlag(qo.getDefaultWelcomeFlag());
qdto.setWelcomeMediaList(EntityUtil.changeEntityListNew(SaveWelcomeMediaQDTO.class, qo.getWelcomeMediaList()));
qdto.setSuitDepartmentAddList(qo.getSuitDepartmentAddList());
......
haoban-manage3-web/src/main/webapp/WEB-INF/spring-interceptor.xml
......@@ -24,7 +24,26 @@
<mvc:exclude-mapping path="/get-login-qrcode"/>
<bean class="com.gic.haoban.common.interceptor.AuthWebInterceptor"/>
</mvc:interceptor>
<bean class="com.gic.web.common.inteceptor.RightInterceptor" />
<mvc:interceptor>
<mvc:mapping path="/**"/>
<mvc:exclude-mapping path="/login.json"/>
<mvc:exclude-mapping path="/login-*"/>
<mvc:exclude-mapping path="/*login*"/>
<mvc:exclude-mapping path="/login_*"/>
<mvc:exclude-mapping path="/gic-login*"/>
<mvc:exclude-mapping path="/*test.json"/>
<mvc:exclude-mapping path="/test/*"/>
<mvc:exclude-mapping path="/login"/>
<mvc:exclude-mapping path="/nationcode/get-nationcode-list"/>
<mvc:exclude-mapping path="/get-pic-code"/>
<mvc:exclude-mapping path="/department-batch-del"/>
<mvc:exclude-mapping path="/staff-batch-del"/>
<mvc:exclude-mapping path="/upload-file*"/>
<mvc:exclude-mapping path="/upload-file-voice"/>
<mvc:exclude-mapping path="/get-login-qrcode"/>
<mvc:exclude-mapping path="/gic-login-check"/>
<bean class="com.gic.web.common.inteceptor.RightInterceptor" />
</mvc:interceptor>
</mvc:interceptors>
</beans>
\ No newline at end of file
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java
package com.gic.haoban.manage.web.controller;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
......@@ -19,28 +30,14 @@ import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.dto.StaffDTO;
import com.gic.haoban.manage.api.enums.AuditType;
import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
import com.gic.haoban.manage.api.service.AuditApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.vo.AuditVO;
import com.gic.haoban.manage.web.vo.StaffClerkBindLogDetailVO;
import com.gic.redis.data.util.RedisUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
......@@ -258,7 +258,7 @@ public class ClerkController extends WebBaseController {
@IgnoreLogin
@RequestMapping("/get-operation-setting")
public HaobanResponse getOperatorSetting(String wxEnterpriseId, String enterpriseId) {
// 查询操作配置
/* // 查询操作配置
OperationSettingDTO dto = operationSettingApiService.getByWxEnterpriseId(wxEnterpriseId);
if (Objects.isNull(dto)) {
OperationSettingVO vo = new OperationSettingVO();
......@@ -274,7 +274,9 @@ public class ClerkController extends WebBaseController {
vo.setEffectFlag(1);
} else {
vo.setEffectFlag(0);
}
}*/
OperationSettingVO vo = new OperationSettingVO();
vo.setClerkPhoneFlag(1);
return resultResponse(HaoBanErrCode.ERR_1, vo);
}
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
......@@ -109,7 +109,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
String userDTOJson = qywxCorpApiService.getCodeSession(config.getWxSuiteid(), code);
// {"errcode":0,"corpid":"wweac4ef962720aa12","session_key":"oNKOu4tDcnTWdj4wOg75YQ==","errmsg":"ok",
// "open_userid":"wo59NLDQAAxeJ-Nr7_vwkZVc7QOG73PQ","userid":"xugaohua","deviceid":"0BB1D1FA-C5A2-4BDD-80A2-33B6BB230F8A"}
logger.info("userDTOJson=============>{}", userDTOJson);
logger.info("好办登录={}", userDTOJson);
UserDTO user = JSON.parseObject(userDTOJson, UserDTO.class);
if (user == null) {
return resultResponse(HaoBanErrCode.ERR_6);
......@@ -120,16 +120,13 @@ public class WxEnterpriseInfoController extends WebBaseController {
StaffDTO loginStaff = null;
if (enterprise != null) {
loginStaff = staffApiService.getByUserIdAndReflushWhenNoPhone(userId, enterprise.getWxEnterpriseId());
}
//手机号不存在
if (loginStaff == null) {
if (enterprise != null) {
if (loginStaff == null) {
staffApiService.wxGetAdd(userId, enterprise.getWxEnterpriseId());
loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId, enterprise.getWxEnterpriseId());
}
}
if (loginStaff == null) {
logger.info("游客用户");
WellDoneLoginInfoVO wellDoneLoginInfoVo = new WellDoneLoginInfoVO();
wellDoneLoginInfoVo.setWxOpenUseId(userId);
StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByUserId(userId);
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/OperationSettingVO.java
package com.gic.haoban.manage.web.vo;
import java.io.Serializable;
import java.util.Date;
/**
*
* @author YongEn
* @date 2021-08-26 10:38:04
*/
public class OperationSettingVO implements Serializable {
private static final long serialVersionUID = 382528365529162044L;
/**
* 是否生效
*/
private Integer effectFlag;
/**
* 操作设置id
*/
private String settingId;
/**
* 企业微信id
*/
private String wxEnterpriseId;
/**
* 导购手机号是否必填 1 是 0 否
*/
private Integer clerkPhoneFlag;
/**
* 店长是否可编辑门店 1 是 0 否
*/
private Integer storeEditFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 数据状态 1 正常 0 已删除
*/
private Integer statusFlag;
public Integer getEffectFlag() {
return effectFlag;
}
public void setEffectFlag(Integer effectFlag) {
this.effectFlag = effectFlag;
}
public String getSettingId() {
return settingId;
}
public void setSettingId(String settingId) {
this.settingId = settingId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getClerkPhoneFlag() {
return clerkPhoneFlag;
}
public void setClerkPhoneFlag(Integer clerkPhoneFlag) {
this.clerkPhoneFlag = clerkPhoneFlag;
}
public Integer getStoreEditFlag() {
return storeEditFlag;
}
public void setStoreEditFlag(Integer storeEditFlag) {
this.storeEditFlag = storeEditFlag;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
@Override
public String toString() {
return "OperationSettingDTO{" +
"settingId='" + settingId + '\'' +
", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", clerkPhoneFlag=" + clerkPhoneFlag +
", storeEditFlag=" + storeEditFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
", statusFlag=" + statusFlag +
'}';
}
}
package com.gic.haoban.manage.web.vo;
import java.io.Serializable;
import java.util.Date;
/**
*
* @author YongEn
* @date 2021-08-26 10:38:04
*/
public class OperationSettingVO implements Serializable {
private static final long serialVersionUID = 382528365529162044L;
/**
* 是否生效
*/
private Integer effectFlag;
/**
* 操作设置id
*/
private String settingId;
/**
* 企业微信id
*/
private String wxEnterpriseId;
/**
* 导购手机号是否必填 1 是 0 否
*/
private Integer clerkPhoneFlag;
/**
* 店长是否可编辑门店 1 是 0 否
*/
private Integer storeEditFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 数据状态 1 正常 0 已删除
*/
private Integer statusFlag;
public Integer getEffectFlag() {
return effectFlag;
}
public void setEffectFlag(Integer effectFlag) {
this.effectFlag = effectFlag;
}
public String getSettingId() {
return settingId;
}
public void setSettingId(String settingId) {
this.settingId = settingId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getClerkPhoneFlag() {
return 1;
}
public void setClerkPhoneFlag(Integer clerkPhoneFlag) {
this.clerkPhoneFlag = 1;
}
public Integer getStoreEditFlag() {
return storeEditFlag;
}
public void setStoreEditFlag(Integer storeEditFlag) {
this.storeEditFlag = storeEditFlag;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
@Override
public String toString() {
return "OperationSettingDTO{" +
"settingId='" + settingId + '\'' +
", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", clerkPhoneFlag=" + clerkPhoneFlag +
", storeEditFlag=" + storeEditFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
", statusFlag=" + statusFlag +
'}';
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment