Merge remote-tracking branch 'origin/feature-chat-activity' into feature-chat-activity

# Conflicts:
#	haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java

@@ -11,6 +11,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.dto.StoreDetailDTO;
+import com.gic.enterprise.api.dto.log.StoreLogDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.BasePageInfo;
@@ -316,7 +317,9 @@ public class AuditApiServiceImpl implements AuditApiService {
             detailDTO.setCloseTime(null);
             getStoreDTO(detailDTO, changeField, oldValue, newValue);
 
+            detailDTO.setStoreLogDTO(new StoreLogDTO().setUserName("好办").setUserId("好办"));
             logger.info("detailDTO====================>为{}", JSONObject.toJSONString(detailDTO));
+
             storeService.saveStore(detailDTO);
         } else {
             //门店图片修改

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/chat/GroupChatActivityLogApiServiceImpl.java

@@ -19,7 +19,7 @@ import java.util.List;
  * @author shangfeng
  * @date 2024-10-08 14:37:46
  */
-@Service("groupChatActivityInviteLogApiService")
+@Service("groupChatActivityLogApiService")
 public class GroupChatActivityLogApiServiceImpl implements GroupChatActivityLogApiService {
 
     @Resource

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -251,7 +251,7 @@
 
     <!--  社群邀请有礼  -->
     <dubbo:service interface="com.gic.haoban.manage.api.service.chat.GroupChatActivityLogApiService"
-                   ref="groupChatActivityInviteLogApiService" timeout="10000"/>
+                   ref="groupChatActivityLogApiService" timeout="10000"/>
     <dubbo:service interface="com.gic.haoban.manage.api.service.chat.GroupChatActivityShareApiService"
                    ref="groupChatActivityShareApiService" timeout="10000"/>
 </beans>
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatActivityController.java

 package com.gic.haoban.manage.web.controller.chat;
 
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.clerk.api.dto.AuthorizedUser;
+import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.api.service.EnterpriseWxaLinkService;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.chat.GroupChatActivityDTO;
@@ -31,6 +34,7 @@ import com.gic.log.record.anno.GicLogRecord;
 import com.gic.log.record.util.GicLogRecordCategoryEnum;
 import com.gic.log.record.util.GicLogRecordEvaluationContext;
 import com.gic.log.record.util.GicLogRecordOptTypeEnum;
+import com.gic.marketing.api.dto.CoupCardDTO;
 import com.gic.marketing.api.dto.card.CardStockAndInvalidDTO;
 import com.gic.marketing.api.service.CouponCardService;
 import com.gic.member.tag.api.dto.MemberTagGroupDTO;
@@ -44,10 +48,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -70,6 +71,9 @@ public class GroupChatActivityController {
     @Autowired
     private GroupChatHmApiService groupChatHmApiService;
 
+    @Autowired
+    private EnterpriseWxaLinkService enterpriseWxaLinkService ;
+
     /**
      * 社群活动分页查询
      *
@@ -303,4 +307,30 @@ public class GroupChatActivityController {
     }
 
 
+    /**
+     * 获取社群活动二维码
+     *
+     * @param chatActivityId
+     * @return
+     */
+    @RequestMapping("get-group-chat-activity-qrcode")
+    @ResponseBody
+    public RestResponse<Object> getGroupChatActivityQrcode(@RequestParam Long chatActivityId) {
+        AuthorizedUser user = SessionContextUtils.getLoginUser();
+        String enterpriseId = user.getEnterpriseId();
+        ServiceResponse<GroupChatActivityDTO> activityDetailResult = groupChatActivityApiService.getActivityDetail(enterpriseId, chatActivityId);
+        if (activityDetailResult.isSuccess() || Objects.isNull(activityDetailResult.getResult())) {
+            return RestResponse.failure("9999", "活动不存在或者活动已删除");
+        }
+        JSONObject param = new JSONObject();
+        JSONObject activityIdParam = new JSONObject();
+        activityIdParam.put("activityId", chatActivityId);
+        param.put("params", activityIdParam);
+        param.put("id", "group_chat_activity");
+        Map<String, Object> wxaLinkAndQrCode = enterpriseWxaLinkService.getWxaLinkAndQrCode(enterpriseId, param.toJSONString());
+        Map<String, String> map = new HashMap<>();
+        map.put("link", wxaLinkAndQrCode.get("link").toString());
+        map.put("url", wxaLinkAndQrCode.get("url").toString());
+        return RestResponse.successResult(map);
+    }
 }