Merge branch 'feature/xgh/会员签到装修' into feature/xgh/7月零散

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

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

@@ -15,6 +15,9 @@ import java.util.stream.Collectors;
 
 import javax.validation.Valid;
 
+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 org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -47,10 +50,6 @@ import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.dto.StoreSearchDTO;
 import com.gic.enterprise.api.dto.enterprise.EnterpriseUsingStatusDTO;
-import com.gic.enterprise.api.service.EnterpriseService;
-import com.gic.enterprise.api.service.EnterpriseUseForbidService;
-import com.gic.enterprise.api.service.StoreService;
-import com.gic.enterprise.api.service.StoreWidgetService;
 import com.gic.haoban.app.customer.service.api.service.CustomerApiService;
 import com.gic.haoban.app.customer.service.api.service.DistributeApiService;
 import com.gic.haoban.base.api.common.BasePageInfo;
@@ -163,6 +162,8 @@ public class WxStaffController extends WebBaseController {
     private PowerService powerService;
     @Autowired
     private EnterpriseUseForbidService enterpriseUseForbidService;
+    @Autowired
+    private CustomPageNewService customPageNewService ;
 
     // 选择成员列表
     @RequestMapping("/staff-list")
@@ -351,9 +352,43 @@ public class WxStaffController extends WebBaseController {
         }
         auditSettingVO.setWxEnterpriseType(enterpriseBindInfo.getWxEnterpriseType());
         auditSettingVO.setFreshFriendFlag(mainStore.getFreshFriendFlag());
+        JSONObject  json = this.getMemberSignPage(storeDTO.getEnterpriseId()) ;
+        auditSettingVO.setShowMemberSign(null==json?0:1);
+        auditSettingVO.setShareMemberSignInfo(json);
         return resultResponse(HaoBanErrCode.ERR_1, auditSettingVO);
     }
 
+    /**
+     * 获取会员签到页分析配置
+     * @param enterpriseId
+     * @return
+     */
+    @IgnoreLogin
+    @RequestMapping("/get-member-sign-share")
+    public RestResponse<Object> getMemberSingInfo(String enterpriseId) {
+        JSONObject  json = this.getMemberSignPage(enterpriseId) ;
+        if(null != json) {
+           return RestResponse.successResult(json) ;
+        }
+        return RestResponse.failure("9999","请联系管理员先配置签到页") ;
+    }
+
+    private int showMemberSign(String enterpriseId) {
+        JSONObject dto = this.getMemberSignPage(enterpriseId) ;
+        if(null != dto) {
+            return 1 ;
+        }
+        return  0 ;
+    }
+    private JSONObject getMemberSignPage(String enterpriseId) {
+        CustomPageRenderDTO dto = this.customPageNewService.getPageRenderByPageType(CustomPageTypeEnum.PAGE_MEMBER_SIGN,enterpriseId) ;
+        if(null != dto && dto.getStatus()==1) {
+            JSONObject json = dto.getSetting().getJSONObject("pageConfig") ;
+            return json ;
+        }
+        return null ;
+    }
+
     @IgnoreLogin
     @RequestMapping("/get-operation-setting")
     public HaobanResponse getOperatorSetting(String wxEnterpriseId, String enterpriseId) {

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

 package com.gic.haoban.manage.web.vo;
 
+import com.alibaba.fastjson.JSONObject;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -21,9 +23,29 @@ public class AuditSettingVO implements Serializable {
     private int wxEnterpriseType;
     private int memberOpenCardFlag;
     private int freshFriendFlag;
+    // 是否显示会员签到
+    private int showMemberSign ;
+
+    private JSONObject shareMemberSignInfo ;
 
     private static final long serialVersionUID = 1L;
 
+    public JSONObject getShareMemberSignInfo() {
+        return shareMemberSignInfo;
+    }
+
+    public void setShareMemberSignInfo(JSONObject shareMemberSignInfo) {
+        this.shareMemberSignInfo = shareMemberSignInfo;
+    }
+
+    public int getShowMemberSign() {
+        return showMemberSign;
+    }
+
+    public void setShowMemberSign(int showMemberSign) {
+        this.showMemberSign = showMemberSign;
+    }
+
     public int getFreshFriendFlag() {
         return freshFriendFlag;
     }

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

@@ -14,6 +14,8 @@
     <dubbo:protocol name="dubbo" port="30010"/>
 
     <dubbo:reference interface="com.gic.haoban.manage.api.service.OpenStaffApiService" id="openStaffApiService" />
+
+    <dubbo:reference interface="com.gic.enterprise.api.service.CustomPageNewService" id="customPageNewService" />
     <dubbo:reference interface="com.gic.haoban.manage.api.service.chat.GroupChatPlanApiService" id="groupChatPlanApiService" />
     <dubbo:reference interface="com.gic.member.api.service.GradeService" id="gradeService" />
     <dubbo:reference interface="com.gic.ecm.api.service.EcmPlanService" id="ecmPlanService" />