wln同步

sd-business/src/main/java/com/sd/business/entity/sku/po/Sku.java

@@ -93,4 +93,9 @@ public class Sku extends BasePo {
      */
     private String detailText;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
 }

sd-wln/src/main/java/com/sd/wln/service/impl/WlnSkuServiceImpl.java

@@ -1,8 +1,10 @@
 package com.sd.wln.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.exception.ServiceException;
@@ -224,6 +226,7 @@ public class WlnSkuServiceImpl implements WlnSkuService {
         sku.setBrand(wlnSku.getString("brand_name"));
         sku.setMainImgUrl(wlnSku.getString("pic"));
         sku.setType(Objects.equals(sku.getBrand(), "胜德科技") ? 1 : 0);
+        sku.setRemark(wlnSku.getString("remark"));
         return sku;
     }
 
@@ -238,13 +241,14 @@ public class WlnSkuServiceImpl implements WlnSkuService {
         skuSpec.setWlnSkuSpecId(wlnSku.getString("sys_spec_uid"));
         skuSpec.setSpecImgUrl(wlnSku.getString("pic"));
         skuSpec.setCode(wlnSku.getString("spec_code"));
-        skuSpec.setName(sku.getName() + ":" + wlnSku.getString("spec1") + wlnSku.getString("spec2"));
+        skuSpec.setName(sku.getName() + ":" +
+                ObjectUtil.defaultIfNull(wlnSku.getString("spec1"), StringPool.EMPTY) +
+                ObjectUtil.defaultIfNull(wlnSku.getString("spec2"), StringPool.EMPTY));
         skuSpec.setBarCode(wlnSku.getString("barcode"));
         skuSpec.setLength(wlnSku.getBigDecimal("length"));
         skuSpec.setWidth(wlnSku.getBigDecimal("width"));
         skuSpec.setHeight(wlnSku.getBigDecimal("height"));
         skuSpec.setNetWeight(wlnSku.getBigDecimal("weight"));
-        skuSpec.setRemark(wlnSku.getString("spec1") + wlnSku.getString("spec2"));
         return skuSpec;
     }