Merge branch 'feature/xgh/240820' into developer

# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

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

@@ -472,6 +472,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
                     storeMemberVO.setClerkType(clerkDTO.getClerkType());
                     storeMemberVO.setStaffId(staffDTO.getStaffId());
                     storeMemberVO.setClerkId(clerkDTO.getClerkId());
+                    storeMemberVO.setClerkName(clerkDTO.getClerkName());
                     retList.add(storeMemberVO);
                 }
 

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

@@ -24,6 +24,8 @@ import com.gic.enterprise.api.dto.custompage.CustomPageRenderDTO;
 import com.gic.enterprise.api.enums.CustomPageTypeEnum;
 import com.gic.enterprise.api.service.*;
 import com.gic.haoban.manage.web.qo.StaffAddVO;
+import com.gic.haoban.manage.web.utils.CustomSwitcher;
+import com.gic.haoban.manage.web.vo.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -130,6 +132,8 @@ public class WxStaffController extends WebBaseController {
     private EnterpriseUseForbidService enterpriseUseForbidService;
     @Autowired
     private CustomPageNewService customPageNewService ;
+    @Autowired
+    private EnterpriseWxaLinkService enterpriseWxaLinkService ;
 
     // 选择成员列表
     @RequestMapping("/staff-list")
@@ -321,9 +325,45 @@ public class WxStaffController extends WebBaseController {
         JSONObject  json = this.getMemberSignPage(storeDTO.getEnterpriseId()) ;
         auditSettingVO.setShowMemberSign(null==json?0:1);
         auditSettingVO.setShareMemberSignInfo(json);
+
+        auditSettingVO.setShowAiCustom(this.aiCustom(storeDTO.getEnterpriseId()));
+
         return resultResponse(HaoBanErrCode.ERR_1, auditSettingVO);
     }
 
+
+    private int aiCustom(String enterpriseId) {
+        List<AiCustomVO> list = CustomSwitcher.haoban_ai_custom ;
+        list = list.stream().filter(o->o.getIsOpen()==1 && o.getEid().equals(enterpriseId)).collect(Collectors.toList());
+        if(CollectionUtils.isNotEmpty(list)) {
+            return 1 ;
+        }
+        return 0 ;
+    }
+
+    /**
+     * 获取会员签到页分析配置
+     * @param enterpriseId
+     * @return
+     */
+    @IgnoreLogin
+    @RequestMapping("/get-ai-custom-setting")
+    public RestResponse<Object> getAiCustomSetting(String enterpriseId , String clerkId) {
+        ClerkDTO clerkDTO = this.clerkService.getClerkByClerkId(clerkId) ;
+        List<AiCustomVO> list = CustomSwitcher.haoban_ai_custom ;
+        list = list.stream().filter(o->o.getIsOpen()==1 && o.getEid().equals(enterpriseId)).collect(Collectors.toList());
+        if(CollectionUtils.isNotEmpty(list)) {
+            AiCustomVO vo = list.get(0) ;
+            String h5 = String.format(vo.getUrl(),clerkDTO.getClerkCode()) ;
+            String str = "{\"url\":\""+h5+"\",\"id\":\"5\"}" ;
+            Map<String, Object> map = this.enterpriseWxaLinkService.getWxaLinkAndQrCode(enterpriseId,str) ;
+            vo.setPath(map.get("link").toString());
+            vo.setQrcode(map.get("url").toString());
+            return RestResponse.successResult(vo);
+        }
+        return RestResponse.failure("9999","请联系管理员配置") ;
+    }
+
     /**
      * 获取会员签到页分析配置
      * @param enterpriseId

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/utils/CustomSwitcher.java

+package com.gic.haoban.manage.web.utils;
+
+import com.gic.commons.switcher.Switcher;
+import com.gic.commons.switcher.SwitcherNamespace;
+import com.gic.haoban.manage.web.vo.AiCustomVO;
+
+import java.util.List;
+
+@SwitcherNamespace("BUZ.qywx.open")
+public class CustomSwitcher {
+
+    @Switcher
+    public static List<AiCustomVO> haoban_ai_custom ;
+
+}
\ No newline at end of file

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/utils/SwitcherInitialization.java

+package com.gic.haoban.manage.web.utils;
+
+import com.gic.commons.switcher.SwitcherApplication;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+@Component
+public class SwitcherInitialization implements InitializingBean {
+    static AtomicBoolean INIT = new AtomicBoolean(false);
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        SwitcherApplication.init(CustomSwitcher.class);
+    }
+}
\ No newline at end of file

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

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+public class AiCustomVO implements Serializable {
+
+    private int isOpen = 0 ;
+
+    private String eid ;
+
+    private String url ;
+
+    private String img ;
+
+
+    private String path ;
+    private String qrcode ;
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getQrcode() {
+        return qrcode;
+    }
+
+    public void setQrcode(String qrcode) {
+        this.qrcode = qrcode;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
+    public int getIsOpen() {
+        return isOpen;
+    }
+
+    public void setIsOpen(int isOpen) {
+        this.isOpen = isOpen;
+    }
+
+    public String getEid() {
+        return eid;
+    }
+
+    public void setEid(String eid) {
+        this.eid = eid;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}

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

@@ -17,7 +17,6 @@ public class AuditSettingVO implements Serializable {
     private Date updateTime;
 
     private Integer statusFlag;
-
     private Integer clerkChangeFlag;
 
     private int wxEnterpriseType;
@@ -25,9 +24,19 @@ public class AuditSettingVO implements Serializable {
     private int freshFriendFlag;
     // 是否显示会员签到
     private int showMemberSign ;
+    // 是否显示ai换装
+    private int showAiCustom ;
 
     private JSONObject shareMemberSignInfo ;
 
+    public int getShowAiCustom() {
+        return showAiCustom;
+    }
+
+    public void setShowAiCustom(int showAiCustom) {
+        this.showAiCustom = showAiCustom;
+    }
+
     private static final long serialVersionUID = 1L;
 
     public JSONObject getShareMemberSignInfo() {

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

@@ -21,6 +21,15 @@ public class StoreMemberVO implements Serializable {
     private String storeImg;
     private int clerkType;
 	private int bindFlag;
+	private String clerkName ;
+
+	public String getClerkName() {
+		return clerkName;
+	}
+
+	public void setClerkName(String clerkName) {
+		this.clerkName = clerkName;
+	}
 
 	public String getUserId() {
 		return userId;

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -174,6 +174,8 @@
     <dubbo:reference id="enterpriseChannelApiService" interface="com.gic.enterprise.api.service.EnterpriseChannelApiService" timeout="10000" retries="0" check="false"/>
 
     <dubbo:reference id="storeRankApiService" interface="com.gic.enterprise.api.service.rank.StoreRankApiService" timeout="100000" retries="0" check="false" />
+    <dubbo:reference id="enterpriseWxaLinkService" interface="com.gic.enterprise.api.service.EnterpriseWxaLinkService" timeout="100000" retries="0" check="false" />
+
 
     <dubbo:reference id="memberExtraPropertyApiService" interface="com.gic.member.api.service.extra.MemberExtraPropertyApiService" timeout="100000" retries="0" check="false" />