登录

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

@@ -423,7 +423,7 @@
     and wx_enterprise_id = #{wxEnterpriseId}
     and enterprise_id = #{enterpriseId}
     and external_user_id = #{externalUserId}
-    and status_flag in(3,4)
+    and status_flag in(1,3,4)
     order by update_time desc
   </select>
 </mapper>
\ No newline at end of file

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

@@ -173,6 +173,33 @@ public class ClerkController extends WebBaseController{
 
         return resultResponse(HaoBanErrCode.ERR_1, auditSettingVO);
     }
+
+	//获取后台认证配置
+	@RequestMapping("/get-user-setting")
+	public HaobanResponse getUserSetting(String wxEnterpriseId, String staffId) {
+		if (StringUtils.isAnyBlank(wxEnterpriseId)) {
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
+
+		AuditSettingVO auditSettingVO = new AuditSettingVO();
+
+		ClerkMainStoreRelatedDTO mainStore = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId, staffId);
+		String mainStoreId = mainStore.getStoreId();
+		StoreDTO storeDTO = storeService.getStore(mainStoreId);
+		if (null == storeDTO) {
+			logger.info("该门店不存在");
+			return resultResponse(HaoBanErrCode.ERR_5);
+		}
+		WxEnterpriseRelationDetailDTO enterpriseBindInfo = wxEnterpriseRelatedApiService.getEnterpriseBindInfo(wxEnterpriseId, storeDTO.getEnterpriseId());
+		if (null == enterpriseBindInfo) {
+			logger.info("该企业未关联");
+			return resultResponse(HaoBanErrCode.ERR_5);
+		}
+		auditSettingVO.setMemberOpenCardFlag(enterpriseBindInfo.getMemberOpenCardFlag());
+		auditSettingVO.setWxEnterpriseType(enterpriseBindInfo.getWxEnterpriseType());
+
+		return resultResponse(HaoBanErrCode.ERR_1, auditSettingVO);
+	}
 	
 	//新增店员
 	@HttpLimit

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

@@ -7,7 +7,9 @@ import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.dict.api.dto.DictDTO;
 import com.gic.dict.api.service.ManagerDictService;
+import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.app.customer.dto.StaffOpenRelatedDTO;
 import com.gic.haoban.app.customer.service.api.service.StaffMemberRelationApiService;
 import com.gic.haoban.common.utils.EntityUtil;
@@ -90,6 +92,9 @@ public class InfoController extends WebBaseController{
     @Autowired
     private MemberOpenCardBusinessService memberOpenCardBusinessService;
 
+    @Autowired
+    private EnterpriseService enterpriseService;
+
     private static Logger logger= LoggerFactory.getLogger(InfoController.class);
 
 	@Autowired
@@ -362,13 +367,17 @@ public class InfoController extends WebBaseController{
             //todo 后续新增自动创建好友记录
             return resultResponse(HaoBanErrCode.ERR_11124);
         }
+        EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(gicEnterpriseId);
         ExternalClerkRelatedDTO clerkRelatedDTO = clerkRelatedDTOS.get(0);
         MemberSendMessageVo memberSendMessageVo = new MemberSendMessageVo();
         memberSendMessageVo.setRelationKey(clerkRelatedDTO.getRelationKey());
-        memberSendMessageVo.setImageUrl(settingDTO.getMediaId());
+        memberSendMessageVo.setImageUrl(settingDTO.getImageUrl());
         memberSendMessageVo.setMediaId(settingDTO.getMediaId());
         memberSendMessageVo.setSelfExteralUserId(externalUserid);
         memberSendMessageVo.setTitle(settingDTO.getTitle());
+        memberSendMessageVo.setWxaHandUrl(enterpriseDTO.getMallMiniprogramLogoUrl());
+        memberSendMessageVo.setBindFlag(clerkRelatedDTO.getStatusFlag() == 1 ? 1 : 0);
+
 
         return resultResponse(HaoBanErrCode.ERR_1, memberSendMessageVo);
     }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/MemberSendMessageVo.java

@@ -12,11 +12,29 @@ public class MemberSendMessageVo implements Serializable {
     private String selfExteralUserId;
     private String imageUrl;
     private String title;
+    private String wxaHandUrl;
+    private Integer bindFlag;
     /**
      *
      */
     private String mediaId;
 
+    public String getWxaHandUrl() {
+        return wxaHandUrl;
+    }
+
+    public void setWxaHandUrl(String wxaHandUrl) {
+        this.wxaHandUrl = wxaHandUrl;
+    }
+
+    public Integer getBindFlag() {
+        return bindFlag;
+    }
+
+    public void setBindFlag(Integer bindFlag) {
+        this.bindFlag = bindFlag;
+    }
+
     public String getMediaId() {
         return mediaId;
     }