Merge remote-tracking branch 'origin/feature-wm' into feature-wm

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/message/InteractRecordMessageService.java

@@ -49,6 +49,7 @@ public class InteractRecordMessageService {
         // 参数是否完整
         // 根据businessId clerkId memberId materialId 构建唯一标识key
         String recordKey = context.buildRecordKey();
+        RedisUtil.lock(recordKey, 3L, TimeUnit.SECONDS, 2L);
         // 根据key 查询是否存在记录
         InteractRecordBO interactRecordBO = null;
         if (MaterialInteractRecordEventType.ORDER.getCode().equals(interactRecordMessageBO.getEventType())) {
@@ -65,7 +66,6 @@ public class InteractRecordMessageService {
                 interactRecordBO = interactRecordService.queryWithInteractInfo(interactRecordMessageBO.getEnterpriseId(), context.buildRecordKeyWithUnionId());
             }
         }
-        RedisUtil.lock(recordKey, 3L, TimeUnit.SECONDS, 2L);
         try {
             if (interactRecordBO == null) {
                 if (interactRecordMessageBO.getChannelSource() == null

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

@@ -8,13 +8,16 @@ import com.gic.content.api.service.ContentSettingApiService;
 import com.gic.haoban.manage.web.vo.content.ContentSettingVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
+ * 好办-内容配置
  * @Author MUSI
  * @Date 2023/11/29 10:43 AM
  * @Description
  * @Version
  **/
+@RestController
 @RequestMapping(path = "/content/setting")
 public class ContentSettingController {