1、数据处理

hx-customer/src/main/java/com/fjhx/customer/entity/xiaoman/po/XiaomanCustomer.java

@@ -60,21 +60,21 @@ public class XiaomanCustomer {
      * 最近更新时间
      */
     @JsonProperty("order_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "Asia/Shanghai")
     private Date orderTime;
 
     /**
      * 公司建档时间
      */
     @JsonProperty("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "Asia/Shanghai")
     private Date createTime;
 
     /**
      * 公司更新时间
      */
     @JsonProperty("update_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "Asia/Shanghai")
     private Date updateTime;
 
     /**
@@ -87,7 +87,7 @@ public class XiaomanCustomer {
      * 公司修改时间
      */
     @JsonProperty("edit_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "Asia/Shanghai")
     private Date editTime;
 
     /**

hx-customer/src/main/java/com/fjhx/customer/entity/xiaoman/vo/CustomerInfoVo.java

@@ -62,7 +62,7 @@ public class CustomerInfoVo {
     private String poolName;
 
     @JsonProperty("private_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "Asia/Shanghai")
     private Date privateTime;
 
     @JsonProperty("public_time")
@@ -72,7 +72,7 @@ public class CustomerInfoVo {
     private int releaseCount;
 
     @JsonProperty("edit_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "Asia/Shanghai")
     private Date editTime;
 
     @JsonProperty("main_lead_id")
@@ -184,7 +184,7 @@ public class CustomerInfoVo {
     private List<Integer> categoryIds;
 
     @JsonProperty("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "Asia/Shanghai")
     private Date createTime;
 
     @JsonProperty("customers")

hx-customer/src/main/java/com/fjhx/customer/handle/HandleXiaomanData.java

@@ -111,7 +111,7 @@ public class HandleXiaomanData {
             XiaomanConfig config = xiaomanConfigService.getConfig();
             String token = config.getAccessToken();
             List<XiaomanCustomerVo> list = xiaomanCustomerService.getList(new XiaomanCustomerSelectDto());
-            Set<Long> collect = list.stream().map(XiaomanCustomerVo::getCustomerId).collect(Collectors.toSet());
+            Set<Long> collect = list.stream().map(XiaomanCustomerVo::getCompanyId).collect(Collectors.toSet());
             int pageIndex = 1;
             int totalPage;
             do {
@@ -158,7 +158,7 @@ public class HandleXiaomanData {
             XiaomanConfig config = xiaomanConfigService.getConfig();
             String token = config.getAccessToken();
             List<XiaomanCustomerVo> list = xiaomanCustomerService.getList(new XiaomanCustomerSelectDto());
-            Set<Long> collect = list.stream().map(XiaomanCustomerVo::getCustomerId).collect(Collectors.toSet());
+            Set<Long> collect = list.stream().map(XiaomanCustomerVo::getCompanyId).collect(Collectors.toSet());
             int pageIndex = 1;
             int totalPage;
             do {

hx-customer/src/main/java/com/fjhx/customer/handle/aaa.json

@@ -1,291 +1,120 @@
 {
   "code": 200,
   "message": "success",
-  "now": "2024-04-06 15:08:24",
+  "now": "2024-04-06 22:37:30",
   "data": {
     "list": [
       {
-        "company_id": 18846628768390,
-        "user_id": "{56322068}",
-        "name": "CLP Trading GmbH",
+        "company_id": 14203706522664,
+        "name": "lamyfay",
         "short_name": "",
-        "serial_id": "86795",
-        "order_time": "2024-04-05 17:49:05",
-        "create_time": "2024-04-05 17:39:57",
-        "update_time": "2024-04-05 17:49:05",
-        "create_user": 56322068,
-        "last_edit_user": 56322068,
-        "archive_type": 4,
-        "edit_time": "2024-04-05 17:39:58"
+        "serial_id": "73725",
+        "order_time": "2024-03-30 07:07:45",
+        "create_time": "2023-12-14 13:12:07",
+        "update_time": "2024-04-06 19:15:24",
+        "edit_time": "2024-04-06 19:15:24",
+        "user_id": "{}"
       },
       {
-        "company_id": 18821262794263,
-        "user_id": "{56324651}",
-        "name": "zuo Vicky",
+        "company_id": 14203738273951,
+        "name": "Globel traders",
         "short_name": "",
-        "serial_id": "86794",
-        "order_time": "2024-04-05 00:26:11",
-        "create_time": "2024-04-05 00:24:06",
-        "update_time": "2024-04-06 06:48:00",
-        "create_user": 56324651,
-        "last_edit_user": 56321852,
-        "archive_type": 4,
-        "edit_time": "2024-04-06 06:48:00"
+        "serial_id": "73927",
+        "order_time": "2024-03-21 19:00:24",
+        "create_time": "2023-12-14 13:13:07",
+        "update_time": "2024-04-06 19:15:17",
+        "edit_time": "2024-04-06 19:15:17",
+        "user_id": "{}"
       },
       {
-        "company_id": 18797590212301,
-        "user_id": "{}",
-        "name": "Chevroni Garden and home",
+        "company_id": 18246876705558,
+        "name": "ADIBAADCADI DREAMZZ",
         "short_name": "",
-        "serial_id": "86793",
-        "order_time": "2024-04-04 08:08:48",
-        "create_time": "2024-04-04 08:08:48",
-        "update_time": "2024-04-04 08:08:48",
-        "create_user": 56321852,
-        "last_edit_user": 56321852,
-        "archive_type": 4,
-        "edit_time": "2024-04-04 08:08:48"
+        "serial_id": "86650",
+        "order_time": "2024-04-06 19:14:35",
+        "create_time": "2024-03-23 14:40:59",
+        "update_time": "2024-04-06 19:14:35",
+        "edit_time": "2024-04-06 19:14:35",
+        "user_id": "{56322072}"
       },
       {
-        "company_id": 18775848055399,
-        "user_id": "{56322073}",
-        "name": "ATREAT",
+        "company_id": 14199321404156,
+        "name": "KAME",
         "short_name": "",
-        "serial_id": "86792",
-        "order_time": "2024-04-03 17:58:15",
-        "create_time": "2024-04-03 17:13:16",
-        "update_time": "2024-04-04 07:06:39",
-        "create_user": 56322073,
-        "last_edit_user": 56321852,
-        "archive_type": 4,
-        "edit_time": "2024-04-04 07:06:39"
+        "serial_id": "48731",
+        "order_time": "2024-04-06 19:12:56",
+        "create_time": "2023-12-14 11:05:21",
+        "update_time": "2024-04-06 19:12:56",
+        "edit_time": "2024-04-06 19:12:56",
+        "user_id": "{}"
       },
       {
-        "company_id": 18774421148353,
-        "user_id": "{56322072}",
-        "name": "okkorokoshop LLC",
+        "company_id": 14204005293537,
+        "name": "3Paleo5 LLC",
         "short_name": "",
-        "serial_id": "86791",
-        "order_time": "2024-04-03 16:43:23",
-        "create_time": "2024-04-03 16:43:09",
-        "update_time": "2024-04-03 16:43:23",
-        "create_user": 56322072,
-        "last_edit_user": 56322072,
-        "archive_type": 4,
-        "edit_time": "2024-04-03 16:43:10"
+        "serial_id": "75824",
+        "order_time": "2024-03-21 19:07:55",
+        "create_time": "2023-12-14 13:22:55",
+        "update_time": "2024-04-06 19:12:37",
+        "edit_time": "2024-04-06 19:12:37",
+        "user_id": "{}"
       },
       {
-        "company_id": 18768032408126,
-        "user_id": "{56322068}",
-        "name": "STRIKEONE INC",
+        "company_id": 14123845623072,
+        "name": "AJS Supplies",
         "short_name": "",
-        "serial_id": "86790",
-        "order_time": "2024-04-03 14:46:11",
-        "create_time": "2024-04-03 14:44:53",
-        "update_time": "2024-04-04 06:42:39",
-        "create_user": 56322068,
-        "last_edit_user": 56321852,
-        "archive_type": 4,
-        "edit_time": "2024-04-04 06:42:39"
+        "serial_id": "8871",
+        "order_time": "2024-03-21 18:22:25",
+        "create_time": "2023-12-12 16:06:43",
+        "update_time": "2024-04-06 19:10:59",
+        "edit_time": "2024-04-06 19:10:59",
+        "user_id": "{}"
       },
       {
-        "company_id": 18767388666654,
-        "user_id": "{56322073}",
-        "name": "Solutions VD",
+        "company_id": 14122778058183,
+        "name": "hammers",
         "short_name": "",
-        "serial_id": "86789",
-        "order_time": "2024-04-05 18:09:53",
-        "create_time": "2024-04-03 14:32:24",
-        "update_time": "2024-04-05 18:09:53",
-        "create_user": 56322073,
-        "last_edit_user": 56321852,
-        "archive_type": 4,
-        "edit_time": "2024-04-05 18:09:53"
+        "serial_id": "4786",
+        "order_time": "2024-04-06 19:09:20",
+        "create_time": "2023-12-12 15:43:23",
+        "update_time": "2024-04-06 19:09:20",
+        "edit_time": "2024-04-06 19:09:20",
+        "user_id": "{}"
       },
       {
-        "company_id": 18754703809198,
-        "user_id": "{56322068}",
-        "name": "Pinisi Home",
+        "company_id": 14162263762410,
+        "name": "Nismo kod kuce",
         "short_name": "",
-        "serial_id": "86788",
-        "order_time": "2024-04-06 03:49:02",
-        "create_time": "2024-04-03 09:56:29",
-        "update_time": "2024-04-06 03:49:02",
-        "create_user": 56322068,
-        "last_edit_user": 56321852,
-        "archive_type": 4,
-        "edit_time": "2024-04-04 07:05:41"
+        "serial_id": "24437",
+        "order_time": "2024-03-22 18:27:02",
+        "create_time": "2023-12-13 14:34:36",
+        "update_time": "2024-04-06 19:08:25",
+        "edit_time": "2024-04-06 19:08:25",
+        "user_id": "{}"
       },
       {
-        "company_id": 18752693448624,
-        "user_id": "{56322068}",
-        "name": "Sowvital Ltd",
+        "company_id": 14197417631231,
+        "name": "Inspiral Balllet",
         "short_name": "",
-        "serial_id": "86787",
-        "order_time": "2024-04-06 02:03:40",
-        "create_time": "2024-04-03 09:24:30",
-        "update_time": "2024-04-06 02:03:40",
-        "create_user": 56322068,
-        "last_edit_user": 56322068,
-        "archive_type": 4,
-        "edit_time": "2024-04-03 09:24:30"
+        "serial_id": "37487",
+        "order_time": "2024-03-22 18:19:57",
+        "create_time": "2023-12-14 10:28:35",
+        "update_time": "2024-04-06 19:04:29",
+        "edit_time": "2024-04-06 19:04:29",
+        "user_id": "{}"
       },
       {
-        "company_id": 18723459104412,
-        "user_id": "{56322068}",
-        "name": "Groupe BMR Inc",
+        "company_id": 14127323759259,
+        "name": "No Company Name_10042229155",
         "short_name": "",
-        "serial_id": "86786",
-        "order_time": "2024-04-02 16:41:29",
-        "create_time": "2024-04-02 16:36:33",
-        "update_time": "2024-04-02 16:36:33",
-        "create_user": 56322068,
-        "last_edit_user": 56322068,
-        "archive_type": 1,
-        "edit_time": "2024-04-02 16:36:33"
-      },
-      {
-        "company_id": 18723361827089,
-        "user_id": "{56322068}",
-        "name": "Cali Bamboo, LLC",
-        "short_name": "",
-        "serial_id": "86785",
-        "order_time": "2024-04-02 16:40:00",
-        "create_time": "2024-04-02 16:34:32",
-        "update_time": "2024-04-02 16:34:32",
-        "create_user": 56322068,
-        "last_edit_user": 56322068,
-        "archive_type": 1,
-        "edit_time": "2024-04-02 16:34:32"
-      },
-      {
-        "company_id": 18723308422201,
-        "user_id": "{56322068}",
-        "name": "Mesun Bamboo Co., Ltd.",
-        "short_name": "",
-        "serial_id": "86784",
-        "order_time": "2024-04-02 16:34:06",
-        "create_time": "2024-04-02 16:33:42",
-        "update_time": "2024-04-02 16:33:42",
-        "create_user": 56322068,
-        "last_edit_user": 56322068,
-        "archive_type": 1,
-        "edit_time": "2024-04-02 16:33:42"
-      },
-      {
-        "company_id": 18717411514550,
-        "user_id": "{56322069}",
-        "name": "ARIAS ONLINE  LLC",
-        "short_name": "",
-        "serial_id": "86783",
-        "order_time": "2024-04-03 10:57:31",
-        "create_time": "2024-04-02 14:53:19",
-        "update_time": "2024-04-03 10:57:31",
-        "create_user": 56322069,
-        "last_edit_user": 56321852,
-        "archive_type": 4,
-        "edit_time": "2024-04-03 08:17:48"
-      },
-      {
-        "company_id": 18714863120466,
-        "user_id": "{56322068}",
-        "name": "NoCompanyName_1952634383",
-        "short_name": "",
-        "serial_id": "86782",
-        "order_time": "2024-04-04 06:57:25",
-        "create_time": "2024-04-02 14:12:51",
-        "update_time": "2024-04-04 06:57:25",
-        "create_user": 56322068,
-        "last_edit_user": 56321852,
-        "archive_type": 4,
-        "edit_time": "2024-04-04 06:57:25"
-      },
-      {
-        "company_id": 18704156643104,
-        "user_id": "{56322068}",
-        "name": "Haroon tradors",
-        "short_name": "",
-        "serial_id": "86781",
-        "order_time": "2024-04-06 08:32:34",
-        "create_time": "2024-04-02 10:24:02",
-        "update_time": "2024-04-06 08:32:34",
-        "create_user": 56322068,
-        "last_edit_user": 56321852,
-        "archive_type": 4,
-        "edit_time": "2024-04-02 18:07:54"
-      },
-      {
-        "company_id": 18702369666786,
-        "user_id": "{56322069}",
-        "name": "Broad Leaf",
-        "short_name": "",
-        "serial_id": "86780",
-        "order_time": "2024-04-06 09:44:28",
-        "create_time": "2024-04-02 09:58:46",
-        "update_time": "2024-04-06 09:44:28",
-        "create_user": 56322069,
-        "last_edit_user": 56321852,
-        "archive_type": 1,
-        "edit_time": "2024-04-03 09:28:28"
-      },
-      {
-        "company_id": 18701988985054,
-        "user_id": "{56322068}",
-        "name": "Jake Paulin",
-        "short_name": "",
-        "serial_id": "86779",
-        "order_time": "2024-04-02 09:52:25",
-        "create_time": "2024-04-02 09:52:25",
-        "update_time": "2024-04-03 18:13:24",
-        "create_user": 56322068,
-        "last_edit_user": 56321852,
-        "archive_type": 4,
-        "edit_time": "2024-04-03 18:13:24"
-      },
-      {
-        "company_id": 18701916426712,
-        "user_id": "{56322073}",
-        "name": "MKS Commerce LLC",
-        "short_name": "",
-        "serial_id": "86778",
-        "order_time": "2024-04-05 19:34:50",
-        "create_time": "2024-04-02 09:51:09",
-        "update_time": "2024-04-05 19:34:50",
-        "create_user": 56322073,
-        "last_edit_user": 56322073,
-        "archive_type": 4,
-        "edit_time": "2024-04-02 09:51:10"
-      },
-      {
-        "company_id": 18670119196518,
-        "user_id": "{56322068}",
-        "name": "Danica",
-        "short_name": "",
-        "serial_id": "86777",
-        "order_time": "2024-04-03 16:05:22",
-        "create_time": "2024-04-01 16:11:12",
-        "update_time": "2024-04-03 16:05:22",
-        "create_user": 56322068,
-        "last_edit_user": 56322068,
-        "archive_type": 1,
-        "edit_time": "2024-04-01 16:11:32"
-      },
-      {
-        "company_id": 18669166854018,
-        "user_id": "{56322072}",
-        "name": "Thu Pham",
-        "short_name": "",
-        "serial_id": "86776",
-        "order_time": "2024-04-06 11:12:47",
-        "create_time": "2024-04-01 15:55:47",
-        "update_time": "2024-04-06 11:12:47",
-        "create_user": 56322072,
-        "last_edit_user": 56322072,
-        "archive_type": 4,
-        "edit_time": "2024-04-06 11:12:46"
+        "serial_id": "22124",
+        "order_time": "2024-03-21 18:21:59",
+        "create_time": "2023-12-12 17:21:18",
+        "update_time": "2024-04-06 19:03:59",
+        "edit_time": "2024-04-06 19:03:59",
+        "user_id": "{}"
       }
     ],
-    "totalItem": 86509,
-    "count": 86509
+    "totalItem": 108
   }
 }

hx-customer/src/main/java/com/fjhx/customer/handle/ccc.json

@@ -1,319 +1,100 @@
 {
   "code": 200,
   "message": "success",
-  "now": "2024-04-06 20:48:31",
+  "now": "2024-04-06 22:09:10",
   "data": {
-    "company_id": 18846628768390,
-    "short_name": "",
-    "name": "CLP Trading GmbH",
-    "category_ids": [],
-    "serial_id": "86795",
-    "archive_time": "2024-04-05 17:39:53",
+    "company_id": 18246876705558,
+    "serial_id": "86650",
+    "user_id": [
+      "56322072"
+    ],
     "owner": [
       {
-        "user_id": "56322068",
-        "avatar": "https://v4client.oss-cn-hangzhou.aliyuncs.com/other/img/56322068/1a2df65fa32a4ee0a6b637c0ca6b3f4b29582e092cbd79b9a49536ccb82fa3fe.png",
-        "name": "Cici",
-        "nickname": "Cici"
+        "user_id": "56322072",
+        "avatar": "https:\/\/v4client.oss-cn-hangzhou.aliyuncs.com\/other\/img\/56322072\/600d4e6ddf7d5b6ee403f5c6f522e79ea773f6ccf548e9d03ccc9a96988987d1.png",
+        "name": "Jimmy",
+        "nickname": "Jimmy"
       }
     ],
-    "archive_type": 4,
-    "country": "DE",
-    "biz_type": "",
+    "create_user": 56322072,
     "last_owner_info": {
       "nickname": "无",
       "user_id": 0,
       "avatar": ""
     },
-    "private_time": "2024-04-05 17:39:57",
+    "pool_id": 0,
+    "pool_name": "",
+    "private_time": "2024-03-23 14:40:59",
     "public_time": "",
-    "intention_level": 0,
+    "release_count": 0,
+    "edit_time": "2024-04-06 19:14:35",
+    "main_lead_id": 0,
+    "lead_name": "",
+    "origin": "阿里巴巴（B2B平台）",
+    "origin_name": "阿里巴巴（B2B平台）",
+    "tag": [],
+    "client_tag_list": [],
+    "source_detail": {
+      "alibaba_store_info": [
+        {
+          "store_id": "239374100",
+          "store_name": "福建尔泓时代家居用品有限公司",
+          "enable_flag": "1",
+          "oauth_flag": "1",
+          "sync_customer_flag": "1"
+        }
+      ],
+      "site_info": []
+    },
+    "name": "ADIBAADCADI DREAMZZ",
+    "short_name": "",
+    "origin_list": [
+      "阿里巴巴（B2B平台）"
+    ],
+    "biz_type": "",
     "annual_procurement": 0,
+    "country": "AU",
+    "intention_level": 0,
     "province": "",
+    "timezone": "10",
     "city": "",
-    "timezone": "1",
     "scale_id": 0,
-    "star": 0,
-    "group_id": 0,
-    "trail_status": {
-      "status_id": "0",
-      "status_name": "无",
-      "status_color": "#cccccc"
-    },
-    "origin": 404,
-    "origin_list": [
-      404
-    ],
-    "origin_name": "TM咨询",
+    "trail_status": "无",
     "homepage": "",
     "fax": "",
-    "tel": [
-      "",
-      ""
-    ],
     "tel_area_code": "",
+    "tel": "",
     "address": "",
     "remark": "",
-    "image_list": [],
-    "next_follow_up_time": "",
-    "create_user": 56322068,
-    "create_time": "2024-04-05 17:39:57",
-    "last_edit_user": "56321852",
-    "update_time": "2024-04-06 18:23:46",
-    "tag": [],
-    "product_group_ids": [],
-    "release_count": 0,
-    "public_type": 0,
-    "edit_time": "2024-04-06 18:23:46",
-    "main_lead_id": 0,
-    "order_time": "2024-04-05 17:49:05",
-    "recent_follow_up_time": "2024-04-05 17:49:06",
-    "client_tag_list": [],
-    "pool_user_map": [],
-    "company": [
-      {
-        "group_id": 1,
-        "name": "基本信息",
-        "fields": [
-          {
-            "id": "name",
-            "name": "公司名称",
-            "field_type": "1",
-            "value": "CLP Trading GmbH"
-          },
-          {
-            "id": "short_name",
-            "name": "简称",
-            "field_type": "1",
-            "value": ""
-          },
-          {
-            "id": "origin_list",
-            "name": "客户来源",
-            "field_type": "7",
-            "value": [
-              "TM咨询"
-            ]
-          },
-          {
-            "id": "origin",
-            "name": "客户来源",
-            "field_type": 3,
-            "value": "TM咨询"
-          }
-        ]
-      },
-      {
-        "group_id": 2,
-        "name": "特征信息",
-        "fields": [
-          {
-            "id": "biz_type",
-            "name": "客户类型",
-            "field_type": "3",
-            "value": ""
-          },
-          {
-            "id": "annual_procurement",
-            "name": "年采购额",
-            "field_type": "3",
-            "value": 0
-          },
-          {
-            "id": "country",
-            "name": "国家地区",
-            "field_type": "3",
-            "value": "DE"
-          },
-          {
-            "id": "intention_level",
-            "name": "采购意向",
-            "field_type": "3",
-            "value": 0
-          },
-          {
-            "id": "province",
-            "name": "省份",
-            "field_type": "3",
-            "value": ""
-          },
-          {
-            "id": "timezone",
-            "name": "时区",
-            "field_type": "3",
-            "value": "1"
-          },
-          {
-            "id": "city",
-            "name": "城市",
-            "field_type": "3",
-            "value": ""
-          },
-          {
-            "id": "scale_id",
-            "name": "规模",
-            "field_type": "3",
-            "value": 0
-          }
-        ]
-      },
-      {
-        "group_id": 3,
-        "name": "管理信息",
-        "fields": [
-          {
-            "id": "trail_status",
-            "name": "客户阶段",
-            "field_type": "3",
-            "value": "无"
-          }
-        ]
-      },
-      {
-        "group_id": 4,
-        "name": "联系信息",
-        "fields": [
-          {
-            "id": "homepage",
-            "name": "公司网址",
-            "field_type": "1",
-            "value": ""
-          },
-          {
-            "id": "fax",
-            "name": "传真",
-            "field_type": "1",
-            "value": ""
-          },
-          {
-            "id": "tel",
-            "name": "座机",
-            "field_type": "1",
-            "value": {
-              "tel_area_code": "",
-              "tel": ""
-            }
-          },
-          {
-            "id": "address",
-            "name": "详细地址",
-            "field_type": "2",
-            "value": ""
-          }
-        ]
-      },
-      {
-        "group_id": 5,
-        "name": "其他信息",
-        "fields": [
-          {
-            "id": "remark",
-            "name": "公司备注",
-            "field_type": "2",
-            "value": ""
-          },
-          {
-            "id": "14200691088213",
-            "name": "餐厨用品",
-            "field_type": "3",
-            "value": ""
-          }
-        ]
-      }
-    ],
-    "lead": {
-      "main_lead_id": 0,
-      "lead_name": null
-    },
+    "category_ids": [],
+    "create_time": "2024-03-23 14:40:59",
     "customers": [
       {
-        "customer_id": 18846628830511,
-        "company_id": 18846628768390,
-        "name": "Camon Ye",
+        "customer_id": 18246877321569,
+        "company_id": 18246876705558,
+        "name": "DAVID WARNER",
         "email": "",
         "gender": 0,
         "remark": "",
         "birth": "",
-        "tel_list": [],
         "post_grade": 1,
         "post": "",
-        "image_list": "",
+        "image_list": [
+          {
+            "file_id": 18246876705312,
+            "file_name": "A0c84be547b734c148a006ab7ec4bb4c4p.jpg",
+            "file_size": "87087",
+            "file_path": "https:\/\/v4client.oss-cn-hangzhou.aliyuncs.com\/other\/img\/56322072\/6f9f4639a022279a6eb1d9557221dd368dfcc0e1029a2b1f326f4c08517b3773.jpg",
+            "file_preview_url": "https:\/\/v4client.oss-cn-hangzhou.aliyuncs.com\/other%2Fimg%2F56322072%2F6f9f4639a022279a6eb1d9557221dd368dfcc0e1029a2b1f326f4c08517b3773.jpg?response-content-disposition=inline%3B%20filename%3DA0c84be547b734c148a006ab7ec4bb4c4p.jpg%3B%20filename%2A%3Dutf-8%27%27A0c84be547b734c148a006ab7ec4bb4c4p.jpg&response-content-type=image%2Fjpeg&OSSAccessKeyId=LTAI5tCRVsUWyca4YrKZMPQP&Signature=sE1ERZL2hMwtU7oIWR5GT1WHEvg%3D&Expires=1713276550"
+          }
+        ],
         "contact": [],
         "main_customer_flag": 1,
-        "external_field_data": []
-      }
-    ],
-    "alibaba_store_info": [
-      {
-        "store_id": "215261497",
-        "store_name": "福州尔泓商贸有限公司",
-        "enable_flag": "1",
-        "oauth_flag": "1",
-        "sync_customer_flag": "1"
-      }
-    ],
-    "source_detail": {
-      "alibaba_store_info": [
-        {
-          "store_id": "215261497",
-          "store_name": "福州尔泓商贸有限公司",
-          "enable_flag": "1",
-          "oauth_flag": "1",
-          "sync_customer_flag": "1"
-        }
-      ],
-      "site_info": []
-    },
-    "alibaba_relation_list": [
-      {
-        "store_id": 215261497,
-        "alibaba_company_name": "CLP Trading GmbH",
-        "owner_account_id": 251334597,
-        "detail_url": "https://alicrm.alibaba.com/#customerId=e0e701bc9084d1d2689c83a62f247a0e",
-        "company_id": 18846628768390,
-        "owner_info": {
-          "seller_account_id": "251334597",
-          "seller_email": "sale13@bridge-style.cc",
-          "enable_flag": "1",
-          "login_id": "cn1541175228pgco",
-          "first_name": "Cici",
-          "last_name": "Chen"
-        },
-        "last_owner_info": {
-          "seller_account_id": 0,
-          "seller_email": "",
-          "enable_flag": 0,
-          "first_name": "",
-          "last_name": "",
-          "login_id": ""
-        },
-        "company_info": {
-          "company_id": 18846628768390,
-          "name": "CLP Trading GmbH",
-          "serial_id": "86795",
-          "pool_id": 0,
-          "is_archive": 1,
-          "create_time": "2024-04-05 17:39:57",
-          "trail_status": 0,
-          "user_id": [
-            56322068
-          ],
-          "user_info": [
-            {
-              "user_id": "56322068",
-              "nickname": "Cici"
-            }
-          ]
-        },
-        "store_info": {
-          "store_id": "215261497",
-          "store_name": "福州尔泓商贸有限公司",
-          "delete_flag": false,
-          "exception": 0
-        }
+        "tel_area_code": "",
+        "tel": ""
       }
     ],
-    "deal_time": "",
-    "country_name": "德国"
+    "14200691088213": "",
+    "country_name": "澳大利亚"
   }
 }

hx-customer/src/main/java/com/fjhx/customer/service/xiaoman/impl/XiaomanCustomerServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fjhx.customer.service.xiaoman.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fjhx.customer.entity.xiaoman.po.XiaomanCustomer;
 import com.fjhx.customer.entity.xiaoman.po.XiaomanCustomerInfoJson;
@@ -81,38 +82,40 @@ public class XiaomanCustomerServiceImpl extends ServiceImpl<XiaomanCustomerMappe
     }
 
     @Override
-    @Transactional
+    @DSTransactional
     public void handleSaveOrUpdate(List<CustomerApiVo> customerApiVoList, Set<Long> allCustomer) {
         List<XiaomanCustomer> xiaomanCustomerList = new ArrayList<>(customerApiVoList);
         for (XiaomanCustomer customer : xiaomanCustomerList){
-            if (allCustomer.contains(customer.getCompanyId())){
-                updateById(customer);
-                //TODO 获取详情
-                String customerDetailJson = HandleXiaomanData.getCustomerDetail(customer.getCompanyId());
-                XiaomanCustomerInfoJson xiaomanCustomerInfoJson = new XiaomanCustomerInfoJson();
-                xiaomanCustomerInfoJson.setCompanyId(customer.getCompanyId());
-                xiaomanCustomerInfoJson.setJson(customerDetailJson);
-                xiaomanCustomerInfoJsonService.updateById(xiaomanCustomerInfoJson);
-                //TODO 更新数据
-                CustomerInfoVo infoVo = HandleXiaomanData.handleDate(customerDetailJson, new TypeReference<R<CustomerInfoVo>>() {
-                });
-                System.out.println("1");
-            }else {
-                save(customer);
-                //TODO 获取详情
-                String customerDetailJson = HandleXiaomanData.getCustomerDetail(customer.getCompanyId());
-                XiaomanCustomerInfoJson xiaomanCustomerInfoJson = new XiaomanCustomerInfoJson();
-                xiaomanCustomerInfoJson.setCompanyId(customer.getCompanyId());
-                xiaomanCustomerInfoJson.setJson(customerDetailJson);
-                xiaomanCustomerInfoJsonService.save(xiaomanCustomerInfoJson);
-
-                //TODO 更新数据
-                CustomerInfoVo infoVo = HandleXiaomanData.handleDate(customerDetailJson, new TypeReference<R<CustomerInfoVo>>() {
-                });
-                System.out.println("2");
+            try {
+                if (allCustomer.contains(customer.getCompanyId())){
+                    updateById(customer);
+                    //TODO 获取详情
+                    String customerDetailJson = HandleXiaomanData.getCustomerDetail(customer.getCompanyId());
+                    XiaomanCustomerInfoJson xiaomanCustomerInfoJson = new XiaomanCustomerInfoJson();
+                    xiaomanCustomerInfoJson.setCompanyId(customer.getCompanyId());
+                    xiaomanCustomerInfoJson.setJson(customerDetailJson);
+                    xiaomanCustomerInfoJsonService.updateById(xiaomanCustomerInfoJson);
+                    //TODO 更新数据
+                    CustomerInfoVo infoVo = HandleXiaomanData.handleDate(customerDetailJson, new TypeReference<R<CustomerInfoVo>>() {
+                    });
+                    System.out.println("1");
+                }else {
+                    save(customer);
+                    //TODO 获取详情
+                    String customerDetailJson = HandleXiaomanData.getCustomerDetail(customer.getCompanyId());
+                    XiaomanCustomerInfoJson xiaomanCustomerInfoJson = new XiaomanCustomerInfoJson();
+                    xiaomanCustomerInfoJson.setCompanyId(customer.getCompanyId());
+                    xiaomanCustomerInfoJson.setJson(customerDetailJson);
+                    xiaomanCustomerInfoJsonService.save(xiaomanCustomerInfoJson);
+
+                    //TODO 更新数据
+                    CustomerInfoVo infoVo = HandleXiaomanData.handleDate(customerDetailJson, new TypeReference<R<CustomerInfoVo>>() {
+                    });
+                    System.out.println("2");
+                }
+            }catch (Exception e){
+               e.printStackTrace();
             }
-
-
         }