Skip to content

H
haoban-manage3.0
Commit 4327c8f8 by fudahua
Options

Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer

parents 4ae5e655 76743a0f
Showing with 24 additions and 61 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxApplicationDTO.java
......@@ -8,6 +8,8 @@ public class WxApplicationDTO implements Serializable {
private String siteId;
private String corpid;
private String name;
private String permanentCode;
......@@ -115,4 +117,12 @@ public class WxApplicationDTO implements Serializable {
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getCorpid() {
return corpid;
}
public void setCorpid(String corpid) {
this.corpid = corpid;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/SecretSettingApiServiceImpl.java
......@@ -4,11 +4,13 @@ import com.gic.haoban.manage.api.dto.SecretSettingDTO;
import com.gic.haoban.manage.api.service.out.SecretSettingApiService;
import com.gic.haoban.manage.service.service.SecretSettingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @author mozhu
* @date 2022/1/10 09:45
*/
@Service
public class SecretSettingApiServiceImpl implements SecretSettingApiService {
@Autowired
private SecretSettingService secretSettingService;
......
haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
......@@ -67,6 +67,8 @@
ref="noticeMessageApiServiceImpl"
timeout="10000"/>
<dubbo:service interface="com.gic.haoban.manage.api.service.out.SecretSettingApiService" ref="secretSettingApiServiceImpl" timeout="10000"/>
<dubbo:reference interface="com.gic.enterprise.api.service.DepartmentService" id="gicDepartmentService"/>
<dubbo:reference interface="com.gic.wechat.api.service.qywx.QywxDepartmentApiService" id="qywxDepartmentApiService"/>
<dubbo:reference interface="com.gic.wechat.api.service.qywx.QywxSuiteApiService" id="qywxSuiteApiService"/>
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
......@@ -42,10 +42,7 @@ 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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
......@@ -671,8 +668,6 @@ public class ClerkController extends WebBaseController {
}).map(s -> s.getEnterpriseId()).collect(Collectors.toList());
List<String> storeIds = wxEnterpriseRelatedApiService.listStoreIdByWxEnterpriseId(wxEnterpriseId);
List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIdList, storeIds, keyword);
// List<ClerkDTO> clerkList = this.getClerkListBySearch(enterpriseIdList, storeIds, keyword, staffId);
// List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIdList, storeIds, keyword);
List<ClerkStoreVO> clerkStoreList = buildClerkRelation(clerkList, enterpriseIdList);
return resultResponse(HaoBanErrCode.ERR_1, clerkStoreList);
}
......@@ -824,9 +819,7 @@ public class ClerkController extends WebBaseController {
String wxEnterpriseId = staff.getWxEnterpriseId();
String wxUserId = staff.getWxUserId();
StaffClerkRelationDTO staffClerkRelation = staffClerkRelationApiService.getByCodeAndEnterpriseId(clerkCode, store.getEnterpriseId());
// if(staffClerkRelation != null){
// return resultResponse(HaoBanErrCode.ERR_111117);
// }
if (auditType == 2) {
//无需审核
if (staffClerkRelation == null) {
......@@ -873,7 +866,6 @@ public class ClerkController extends WebBaseController {
return resultResponse(HaoBanErrCode.ERR_1, resultDTO);
} else {
//需要审核
AuditDTO audit = new AuditDTO();
audit.setCommitStaffName(staff.getStaffName());
audit.setCommitStaffId(staffId);
......@@ -898,20 +890,6 @@ public class ClerkController extends WebBaseController {
audit.setCommitTime(new Date());
audit.setAuditType(2);
auditApiService.insert(audit);
//
// //TODO huang 发送店长，门店关联记录列表
// String messageTitle = "门店账号申请";
// String messageContent = staff.getStaffName()+"申请关联导购code（"+clerkCode+"）";
// JSONObject jsonObject = new JSONObject();
// jsonObject.put("storeId", clerk.getStoreId());
// String data = jsonObject.toJSONString();
// ClerkDTO gicClerk = clerkService.getClerkLeaderByStoreId(clerk.getStoreId());
// if(gicClerk == null){
// //店长不存在，直接返回
// return resultResponse(HaoBanErrCode.ERR_1);
// }
// String pageUrl = staffDepartmentRelatedApiService.getPageUrl(AppPageType.STORE_RELATED_RECORD.getCode(), data);
// staffDepartmentRelatedApiService.sendSingleMessage(gicClerk.getClerkId(), messageTitle, messageContent, pageUrl);
ClerkDTO gicClerk = clerkService.getClerkLeaderByStoreId(clerk.getStoreId());
if (gicClerk == null) {
......@@ -956,34 +934,6 @@ public class ClerkController extends WebBaseController {
return resultResponse(HaoBanErrCode.ERR_111145);
}
//解绑无需审核，只插入记录即可
// AuditDTO audit = new AuditDTO();
// audit.setCommitStaffName(clerk.getClerkName());
// audit.setCommitStaffId(staffId);
// audit.setCommitStaffImg(staff.getHeadImg());
// audit.setCommitStoreId(clerk.getStoreId());
// audit.setCommitStoreName(store.getStoreName());
// audit.setAuditStatus(AuditStatus.NOT_NEED_AUDIT.getCode());
// audit.setWxEnterpriseId(staffClerkRelation.getWxEnterpriseId());
// audit.setEnterpriseId(store.getEnterpriseId());
// audit.setStatusFlag(1);
// audit.setRelatedId(staffId);
// audit.setRelatedId(clerkId);
// audit.setAuditName(staff.getStaffName());
//
// JSONObject json = new JSONObject();
// json.put("clerkId", clerkId);
// json.put("clerkCode", clerkCode);
// json.put("clerkName", clerk.getClerkName());
// json.put("staffName", staff.getStaffName());
// json.put("staffId", staffId);
// json.put("headPic", staff.getHeadImg());
// audit.setOldValue(json.toJSONString());
// audit.setCommitTime(new Date());
// audit.setAuditName(staff.getStaffName());
// audit.setAuditType(5);
// auditApiService.insert(audit);
staffClerkRelationApiService.delByStoreIdAndCode(storeId, clerkCode);
//加入日志
staffClerkRelationApiService.pushToBindLog(staffClerkRelation.getStaffId(), staffId, BindTypeEnum.UNBIND.getVal(), ChannelCodeEnum.SELF_UNBIND.getCode(), staffClerkRelation.getStaffClerkRelationId());
......@@ -1151,11 +1101,6 @@ public class ClerkController extends WebBaseController {
*/
@RequestMapping("/save-clerk")
public HaobanResponse clerkSave(String clerkId, String fieldValue, Integer fieldType) {
// StaffClerkRelationDTO staffRelation = staffClerkRelationApiService.getByClerkId(clerkId);
// if(staffRelation == null){
// return resultResponse(HaoBanErrCode.ERR_10006);
// }
if (StringUtils.isBlank(clerkId) || StringUtils.isBlank(fieldValue) || null == fieldType) {
return resultResponse(HaoBanErrCode.ERR_5);
}
......@@ -1185,7 +1130,6 @@ public class ClerkController extends WebBaseController {
return resultResponse(HaoBanErrCode.ERR_1);
}
return resultResponse(HaoBanErrCode.ERR_0, res, null, res);
}
/**
......@@ -1275,7 +1219,7 @@ public class ClerkController extends WebBaseController {
* @author mozhu
* @date 2021-12-29 10:42:24
*/
@RequestMapping("getOpenIdByStaffId")
@RequestMapping(value = "getOpenIdByStaffId",method = {RequestMethod.POST,RequestMethod.GET})
public RestResponse<String> getOpenIdByStaffId() {
String staffId = this.getLoginUser().getStaffId();
String wxEnterpriseId = this.getLoginUser().getWxEnterpriseId();
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
......@@ -241,7 +241,11 @@ public class WxEnterpriseInfoController extends WebBaseController {
return resultResponse(HaoBanErrCode.ERR_1);
}
/**
* 会员小程序-获取登录用户信息
* @param qo
* @return
*/
@RequestMapping("get-user-by-member-code")
@IgnoreLogin
public HaobanResponse getInfoByMemberCode(GetUserByMemberCodeQo qo) {
......@@ -391,7 +395,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
}
/**
* 获取绑定信息
* 获取绑定信息(会员小程序用)
*
* @param externalUserid
* @param wxUserId
......
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