Merge branch 'feature/xgh/会员签到装修' into 'developer'

会员签到

See merge request !2032

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

@@ -318,7 +318,9 @@ public class WxStaffController extends WebBaseController {
         }
         auditSettingVO.setWxEnterpriseType(enterpriseBindInfo.getWxEnterpriseType());
         auditSettingVO.setFreshFriendFlag(mainStore.getFreshFriendFlag());
-        auditSettingVO.setShowMemberSign(showMemberSign(storeDTO.getEnterpriseId()));
+        JSONObject  json = this.getMemberSignPage(storeDTO.getEnterpriseId()) ;
+        auditSettingVO.setShowMemberSign(null==json?0:1);
+        auditSettingVO.setShareMemberSignInfo(json);
         return resultResponse(HaoBanErrCode.ERR_1, auditSettingVO);
     }
 

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;
 
@@ -24,8 +26,18 @@ public class AuditSettingVO implements Serializable {
     // 是否显示会员签到
     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;
     }