Merge branch '20251119-wyp-weCom' into test

api-module/src/main/java/com/tzld/piaoquan/api/controller/wecom/thirdpart/WeComThirdPartyCallBackController.java

@@ -19,7 +19,7 @@ public class WeComThirdPartyCallBackController {
     private WeComThirdPartyCallBackService service;
 
     @PostMapping("/callback")
-    public CommonResponse<String> callback(@RequestBody JSONObject param) {
+    public CommonResponse<String> callback(@RequestBody WeComThirdPartyCallBackParam param) {
         service.handleCallback(param);
         return CommonResponse.success();
     }

api-module/src/main/java/com/tzld/piaoquan/api/model/param/wecom/thirdpart/WeComThirdPartyCallBackParam.java

@@ -0,0 +1,11 @@
+package com.tzld.piaoquan.api.model.param.wecom.thirdpart;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+@Data
+public class WeComThirdPartyCallBackParam {
+    private String uuid;
+    private Integer type;
+    private JSONObject json;
+}

api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/thirdparty/WeComThirdPartyCallBackService.java

@@ -1,6 +1,6 @@
 package com.tzld.piaoquan.api.service.wecom.thirdparty;
 
-import com.alibaba.fastjson.JSONObject;
+import com.tzld.piaoquan.api.model.param.wecom.thirdpart.WeComThirdPartyCallBackParam;
 
 public interface WeComThirdPartyCallBackService {
 
@@ -9,5 +9,5 @@ public interface WeComThirdPartyCallBackService {
      *
      * @param param
      */
-    void handleCallback(JSONObject param);
+    void handleCallback(WeComThirdPartyCallBackParam param);
 }

api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/thirdparty/impl/WeComThirdPartyCallBackServiceImpl.java

@@ -5,6 +5,7 @@ import com.tzld.piaoquan.api.component.WeComThirdPartyApiClient;
 import com.tzld.piaoquan.api.dao.mapper.wecom.thirdpart.ThirdPartWeComCorpMapper;
 import com.tzld.piaoquan.api.dao.mapper.wecom.thirdpart.ThirdPartWeComRoomMapper;
 import com.tzld.piaoquan.api.dao.mapper.wecom.thirdpart.ThirdPartWeComStaffMapper;
+import com.tzld.piaoquan.api.model.param.wecom.thirdpart.WeComThirdPartyCallBackParam;
 import com.tzld.piaoquan.api.service.wecom.thirdparty.WeComThirdPartyCallBackService;
 import com.tzld.piaoquan.growth.common.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -28,7 +29,7 @@ public class WeComThirdPartyCallBackServiceImpl implements WeComThirdPartyCallBa
     private RedisUtils redisUtils;
 
     @Override
-    public void handleCallback(JSONObject param) {
-        log.info("handleCallback param: {}", param);
+    public void handleCallback(WeComThirdPartyCallBackParam param) {
+        log.info("handleCallback param: {}", JSONObject.toJSONString(param));
     }
 }