Merge branch 'feature/xgh/202506迭代' into 'developer'

Feature/xgh/202506迭代

See merge request !3017

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

 package com.gic.haoban.manage.web.controller.moment;
 
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.api.dto.StoreDTO;
-import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.web.vo.moment.MomentDataClickVO;
 import com.gic.member.api.dto.es.MemberDataDTO;
 import com.gic.web.common.download.DownloadHandlerAbstract;
@@ -29,15 +29,16 @@ public class MomentDataClickExcelHandler extends DownloadHandlerAbstract<MomentD
     @Override
     public List<MomentDataClickVO> getData(Context context, String json, Integer currentPage) {
         Map<String, Object> res = DataApiUtils.http(json, "data_qw_moment_mbr_click_detail");
+        JSONObject jsonObject = JSONObject.parseObject(json) ;
         Page page =  DataApiUtils.getPageData(res);
         List<MomentDataClickVO> voList = EntityUtil.changeEntityListByJSON(MomentDataClickVO.class, page.getResult());
         if(CollectionUtils.isNotEmpty(voList)) {
             List<String> memberIdList = voList.stream().map(o->o.getMbrId()).collect(Collectors.toList());
-            Map<String, MemberDataDTO> map = this.qwMomentController.getMemberMap(AuthWebRequestUtil.getLoginUser().getEnterpriseId(),memberIdList) ;
+            Map<String, MemberDataDTO> map = this.qwMomentController.getMemberMap(jsonObject.getString("enterpriseId"),memberIdList) ;
             for (MomentDataClickVO vo : voList) {
                 String memberId = vo.getMbrId();
                 vo.setMemberId(memberId);
-                if(null != map.get(memberId)) {
+                if(null == map.get(memberId)) {
                     vo.setMemberScene(2);
                 }else {
                     MemberDataDTO data = map.get(memberId) ;

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

 package com.gic.haoban.manage.web.controller.moment;
 
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.commons.util.EntityUtil;
@@ -28,16 +29,17 @@ public class MomentDataMemberExcelHandler extends DownloadHandlerAbstract<Moment
 
     @Override
     public List<MomentDataMemberVO> getData(Context context, String json, Integer currentPage) {
+        JSONObject jsonObject = JSONObject.parseObject(json) ;
         Map<String, Object> res = DataApiUtils.http(json, "data_qw_moment_mbr_detail");
         Page page =  DataApiUtils.getPageData(res);
         List<MomentDataMemberVO> voList = EntityUtil.changeEntityListByJSON(MomentDataMemberVO.class, page.getResult());
         if(CollectionUtils.isNotEmpty(voList)) {
             List<String> memberIdList = voList.stream().map(o->o.getMbrId()).collect(Collectors.toList());
-            Map<String, MemberDataDTO> map = this.qwMomentController.getMemberMap(AuthWebRequestUtil.getLoginUser().getEnterpriseId(),memberIdList) ;
+            Map<String, MemberDataDTO> map = this.qwMomentController.getMemberMap(jsonObject.getString("enterpriseId"),memberIdList) ;
             for (MomentDataMemberVO vo : voList) {
                 String memberId = vo.getMbrId();
                 vo.setMemberId(memberId);
-                if(null != map.get(memberId)) {
+                if(null == map.get(memberId)) {
                     vo.setMemberScene(2);
                 }else {
                     MemberDataDTO data = map.get(memberId) ;

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

 package com.gic.haoban.manage.web.controller.moment;
 
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.api.dto.StoreDTO;
@@ -28,16 +29,17 @@ public class MomentDataOrderExcelHandler extends DownloadHandlerAbstract<MomentD
 
     @Override
     public List<MomentDataOrderVO> getData(Context context, String json, Integer currentPage) {
+        JSONObject jsonObject = JSONObject.parseObject(json) ;
         Map<String, Object> res = DataApiUtils.http(json, "data_qw_moment_order_detail");
         Page page =  DataApiUtils.getPageData(res);
         List<MomentDataOrderVO> voList = EntityUtil.changeEntityListByJSON(MomentDataOrderVO.class, page.getResult());
         if(CollectionUtils.isNotEmpty(voList)) {
             List<String> memberIdList = voList.stream().map(o -> o.getMbrId()).collect(Collectors.toList());
-            Map<String, MemberDataDTO> map = this.qwMomentController.getMemberMap(AuthWebRequestUtil.getLoginUser().getEnterpriseId(), memberIdList);
+            Map<String, MemberDataDTO> map = this.qwMomentController.getMemberMap(jsonObject.getString("enterpriseId"), memberIdList);
             for (MomentDataOrderVO vo : voList) {
                 String memberId = vo.getMbrId();
                 vo.setMemberId(memberId);
-                if (null != map.get(memberId)) {
+                if (null == map.get(memberId)) {
                     vo.setMemberScene(2);
                 } else {
                     MemberDataDTO data = map.get(memberId);