Merge remote-tracking branch 'origin/master'

data-base/base-sync-sku/src/main/java/com/bailuntec/domain/pojo/SkuMappingResponse.java

 package com.bailuntec.domain.pojo;
 
+import com.bailuntec.domain.entity.DcBaseSkuMapping;
 import lombok.Data;
 
 import java.util.List;
@@ -12,5 +13,5 @@ public class SkuMappingResponse {
     private Integer totalPage;
     private Integer rows;
     private Long costtime;
-    private List<SkuMappingInfo> data;
+    private List<DcBaseSkuMapping> data;
 }

data-base/base-sync-sku/src/main/java/com/bailuntec/job/SkuMappingSyncJob.java

@@ -66,17 +66,10 @@ public class SkuMappingSyncJob extends PointJob {
 
             if (StringUtils.isNotBlank(resultStr)) {
                 SkuMappingResponse skuMappingResponse = JSONObject.parseObject(resultStr, SkuMappingResponse.class);
-                log.warn("请求参数:"+map+ "  返回结果:" + resultStr);
                 if (skuMappingResponse.getData()!= null && skuMappingResponse.getData().size() > 0) {
-                    List<SkuMappingInfo> skuMappingInfoList = skuMappingResponse.getData();
-                    DcBaseSkuMapping dcBaseSkuMapping = new DcBaseSkuMapping();
-                    for(SkuMappingInfo skuMappingInfo : skuMappingInfoList) {
-                        try {
-                            BeanUtils.copyProperties(dcBaseSkuMapping, skuMappingInfo);
-                        } catch (Exception e) {
-                            throw new RuntimeException("BeanUtils.copyProperties失败");
-                        }
-
+                    List<DcBaseSkuMapping> skuMappingInfoList = skuMappingResponse.getData();
+                    for(DcBaseSkuMapping dcBaseSkuMapping : skuMappingInfoList) {
+                        log.warn("请求参数:"+map+ "  返回结果:" + dcBaseSkuMapping);
                         DcBaseSkuMappingMapper dcBaseSkuMappingMapper = SessionUtil.getSession().getMapper(DcBaseSkuMappingMapper.class);
                         dcBaseSkuMappingMapper.upsertSelective(dcBaseSkuMapping);
                     }

data-common/src/main/java/com/bailuntec/domain/entity/DcBaseSkuMapping.java

 package com.bailuntec.domain.entity;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -13,6 +14,7 @@ public class DcBaseSkuMapping {
      *
      * @mbg.generated
      */
+    @JSONField(name = "nullId")
     private Integer id;
 
     /**
@@ -22,6 +24,7 @@ public class DcBaseSkuMapping {
      *
      * @mbg.generated
      */
+    @JSONField(name = "id")
     private Integer unicodeId;
 
     /**
@@ -121,6 +124,7 @@ public class DcBaseSkuMapping {
      *
      * @mbg.generated
      */
+    @JSONField(name = "setNo")
     private String bailunSku;
 
     /**
@@ -157,6 +161,7 @@ public class DcBaseSkuMapping {
      *
      * @mbg.generated
      */
+    @JSONField(name = "newSku")
     private String platformSku;
 
     /**
@@ -193,6 +198,7 @@ public class DcBaseSkuMapping {
      *
      * @mbg.generated
      */
+    @JSONField(name = "isDeleted")
     private Boolean hasDeleted;
 
     /**
@@ -202,6 +208,7 @@ public class DcBaseSkuMapping {
      *
      * @mbg.generated
      */
+    @JSONField(name = "creatorOrganizeId")
     private Integer companyId;
 
     /**