Merge branch 'developer' into 'master'

Developer

See merge request !84

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java

@@ -6,6 +6,7 @@ import java.util.List;
 import com.gic.api.base.commons.JSONResponse;
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
 import com.gic.haoban.manage.api.dto.MemberStoreDTO;
 import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 
@@ -17,7 +18,7 @@ public interface MemberUnionidRelatedApiService {
 	
 	void delMemberUnionidRelated(MemberUnionidRelatedDTO dto);
 
-	MemberUnionidRelatedDTO getByMemberId(String staffId, String memberId);
+	ExternalClerkRelatedDTO getByMemberId(String staffId, String memberId);
 
 	List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId);
 	

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java

@@ -41,4 +41,6 @@ public interface TabHaobanExternalClerkRelatedMapper {
 	List<TabHaobanExternalClerkRelated> listByWxEnterpriseIdAndWxUserId(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId);
 
 	List<TabHaobanExternalClerkRelated> listByWxEnterpriseIdAndWxUserIds(@Param("userIdList")List<String> userIdList, @Param("wxEnterpriseId")String wxEnterpriseId);
+
+	TabHaobanExternalClerkRelated getByMemberId(@Param("wxUserId")String wxUserId, @Param("memberId")String memberId);
 }
\ No newline at end of file

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.service;
 
 import java.util.List;
 
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
 import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
 
@@ -21,4 +22,6 @@ public interface ExternalClerkRelatedService {
 
 	List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId);
 
+	ExternalClerkRelatedDTO getByMemberId(String wxUserId, String memberId);
+
 }

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

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.dubbo.config.annotation.Service;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.StringUtil;
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
 import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
@@ -73,4 +74,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
 		return mapper.listByExTernalUseridAndWxUserId(externalUserid,wxUserId);
 	}
 
+	@Override
+	public ExternalClerkRelatedDTO getByMemberId(String wxUserId, String memberId) {
+		return EntityUtil.changeEntityByJSON(ExternalClerkRelatedDTO.class, mapper.getByMemberId(wxUserId,memberId));
+	}
+
 }

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

@@ -93,8 +93,10 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         String staffId = staffClerkRelation.getStaffId();
         String wxEnterpriseId = staffClerkRelation.getWxEnterpriseId();
         TabHaobanClerkMainStoreRelated r = clerkMainStoreRelatedService.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId);
-        r.setStatusFlag(0);
-        clerkMainStoreRelatedService.update(r);
+        if(r != null){
+            r.setStatusFlag(0);
+            clerkMainStoreRelatedService.update(r);
+        }
         externalClerkRelatedService.delByClerkIdAndStaffId(staffClerkRelation.getClerkId(), staffId);
         List<StaffClerkRelationDTO> list = this.lisByStaffId(wxEnterpriseId, staffId);
         if (list != null && list.size() >= 1) {

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

@@ -589,13 +589,13 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	}
 
 	@Override
-	public MemberUnionidRelatedDTO getByMemberId(String staffId, String memberId) {
+	public ExternalClerkRelatedDTO getByMemberId(String staffId, String memberId) {
 		TabHaobanStaff staff = staffService.selectById(staffId);
 		if(staff == null){
 			return null;
 		}
 		log.info("【查询会员】wxUserId={},unionid={}",staff.getWxUserId(),memberId);
-		return memberUnionRelatedService.getByMemberId(staff.getWxUserId(),memberId);
+		return externalClerkRelatedService.getByMemberId(staff.getWxUserId(),memberId);
 	}
 	@Override
 	public List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId) {

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

@@ -332,4 +332,13 @@
     and wx_enterprise_id = #{wxEnterpriseId}
     and status_flag = 1
   </select>
+  
+  <select id="getByMemberId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_external_clerk_related
+    where wx_user_id = #{wxUserId} 
+    and member_id = #{memberId}
+    and status_flag = 1
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -102,7 +102,9 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_1);
 		}
 		WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
-		
+		if(wxEnterpriseDTO == null){
+			return resultResponse(HaoBanErrCode.ERR_100018);
+		}
 		wxEnterpriseDTO.setSmallVersion("免费版");
 		wxEnterpriseDTO.setStoreTotal(departmentApiService.totalStoreCountByEnterpriseId(wxEnterpriseId));
 		return resultResponse(HaoBanErrCode.ERR_1,wxEnterpriseDTO);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -105,6 +105,7 @@ public enum HaoBanErrCode {
     
     ERR_100016(100016,"审核失败"),
     ERR_100017(100017,"secret已经设置过"),
+    ERR_100018(100018,"企业不存在"),
 
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");

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

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,6 +33,7 @@ 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.web.anno.HttpLimit;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.AuditVO;
 
@@ -180,6 +182,7 @@ public class AuditController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1,vo);
 	}
 	//审核，1同意，2拒绝，3取消审核
+	@HttpLimit
 	@RequestMapping("clerk-audit")
 	public HaobanResponse clerkAudit(String auditId,String auditReason,Integer auditStatus,String wxEnterpriseId,String staffId){
 		if(StringUtils.isAnyBlank(auditId,wxEnterpriseId)){

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

@@ -476,6 +476,7 @@ public class ClerkController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1,clerkStoreList);
 	}
 	//绑定
+	@HttpLimit
 	@RequestMapping("bind-staff")
 	public HaobanResponse bindStaff(String clerkId,String staffId ,Integer auditType){
 		if(StringUtils.isAnyBlank(clerkId,staffId)){