完善tao商品api

tao-api/src/main/java/com/qihang/tao/controller/GoodsApiController.java

@@ -50,7 +50,7 @@ public class GoodsApiController {
         String appSecret = checkResult.getData().getAppSecret();
 
         Long pageIndex = 1L;
-        Long pageSize = 40L;
+        Long pageSize = 100L;
 
         ApiResult<TaoGoods> listApiResult = GoodsApiHelper.pullGoods(pageIndex, pageSize, url, appKey, appSecret, sessionKey);
 

tao-api/src/main/java/com/qihang/tao/controller/OrderApiController.java

@@ -2,7 +2,11 @@ package com.qihang.tao.controller;
 
 import com.qihang.common.common.ApiResult;
 import com.qihang.common.common.ResultVoEnum;
+import com.qihang.common.enums.EnumShopType;
 import com.qihang.common.enums.HttpStatus;
+import com.qihang.common.mq.MqMessage;
+import com.qihang.common.mq.MqType;
+import com.qihang.common.mq.MqUtils;
 import com.qihang.tao.openApi.ApiCommon;
 //import com.qihang.tao.api.ApiResult;
 import com.qihang.tao.openApi.OrderApiHelper;
@@ -26,6 +30,7 @@ public class OrderApiController {
 
     private final TaoOrderService orderService;
     private final ApiCommon apiCommon;
+    private final MqUtils mqUtils;
 
 
     /**
@@ -77,9 +82,11 @@ public class OrderApiController {
             if (result.getCode() == ResultVoEnum.DataExist.getIndex()) {
                 //已经存在
                 log.info("/**************主动更新tao订单：开始更新数据库：" + order.getId() + "存在、更新****************/");
+                mqUtils.sendApiMessage(MqMessage.build(EnumShopType.TAO, MqType.ORDER_MESSAGE,order.getTid().toString()));
                 hasExistOrder++;
             } else if (result.getCode() == ResultVoEnum.SUCCESS.getIndex()) {
                 log.info("/**************主动更新tao订单：开始更新数据库：" + order.getId() + "不存在、新增****************/");
+                mqUtils.sendApiMessage(MqMessage.build(EnumShopType.TAO,MqType.ORDER_MESSAGE,order.getTid().toString()));
                 insertSuccess++;
             } else {
                 log.info("/**************主动更新tao订单：开始更新数据库：" + order.getId() + "报错****************/");

tao-api/src/main/java/com/qihang/tao/domain/OGoods.java

@@ -0,0 +1,859 @@
+package com.qihang.tao.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 商品库存管理
+ * @TableName o_goods
+ */
+public class OGoods implements Serializable {
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 商品名称
+     */
+    private String name;
+
+    /**
+     * 商品图片地址
+     */
+    private String image;
+
+    /**
+     * 商品唯一ID
+     */
+    private Long erpGoodsId;
+
+    /**
+     * 商品编号
+     */
+    private String goodsNum;
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+
+    /**
+     * 商品分类ID
+     */
+    private Integer categoryId;
+
+    /**
+     * 条码
+     */
+    private String barCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态1销售中2已下架
+     */
+    private Integer status;
+
+    /**
+     * 衣长/裙长/裤长
+     */
+    private Double length;
+
+    /**
+     * 高度/袖长
+     */
+    private Double height;
+
+    /**
+     * 宽度/胸阔(围)
+     */
+    private Double width;
+
+    /**
+     * 肩阔
+     */
+    private Double width1;
+
+    /**
+     * 腰阔
+     */
+    private Double width2;
+
+    /**
+     * 臀阔
+     */
+    private Double width3;
+
+    /**
+     * 重量
+     */
+    private Double weight;
+
+    /**
+     * 0启用   1禁用
+     */
+    private Integer disable;
+
+    /**
+     * 保质期
+     */
+    private String period;
+
+    /**
+     * 预计采购价格
+     */
+    private BigDecimal purPrice;
+
+    /**
+     * 建议批发价
+     */
+    private BigDecimal wholePrice;
+
+    /**
+     * 建议零售价
+     */
+    private BigDecimal retailPrice;
+
+    /**
+     * 单位成本
+     */
+    private BigDecimal unitCost;
+
+    /**
+     * 供应商id
+     */
+    private Integer supplierId;
+
+    /**
+     * 品牌id
+     */
+    private Integer brandId;
+
+    /**
+     * 属性1：季节
+     */
+    private String attr1;
+
+    /**
+     * 属性2：分类
+     */
+    private String attr2;
+
+    /**
+     * 属性3：风格
+     */
+    private String attr3;
+
+    /**
+     * 属性4：年份
+     */
+    private String attr4;
+
+    /**
+     * 属性5：面料
+     */
+    private String attr5;
+
+    /**
+     * 外链url
+     */
+    private String linkUrl;
+
+    /**
+     * 最低库存（预警）
+     */
+    private Integer lowQty;
+
+    /**
+     * 最高库存（预警）
+     */
+    private Integer highQty;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 主键id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 商品名称
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 商品名称
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * 商品图片地址
+     */
+    public String getImage() {
+        return image;
+    }
+
+    /**
+     * 商品图片地址
+     */
+    public void setImage(String image) {
+        this.image = image;
+    }
+
+    /**
+     * 商品唯一ID
+     */
+    public Long getErpGoodsId() {
+        return erpGoodsId;
+    }
+
+    /**
+     * 商品唯一ID
+     */
+    public void setErpGoodsId(Long erpGoodsId) {
+        this.erpGoodsId = erpGoodsId;
+    }
+
+    /**
+     * 商品编号
+     */
+    public String getGoodsNum() {
+        return goodsNum;
+    }
+
+    /**
+     * 商品编号
+     */
+    public void setGoodsNum(String goodsNum) {
+        this.goodsNum = goodsNum;
+    }
+
+    /**
+     * 单位名称
+     */
+    public String getUnitName() {
+        return unitName;
+    }
+
+    /**
+     * 单位名称
+     */
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    /**
+     * 商品分类ID
+     */
+    public Integer getCategoryId() {
+        return categoryId;
+    }
+
+    /**
+     * 商品分类ID
+     */
+    public void setCategoryId(Integer categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    /**
+     * 条码
+     */
+    public String getBarCode() {
+        return barCode;
+    }
+
+    /**
+     * 条码
+     */
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
+    /**
+     * 备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    /**
+     * 状态1销售中2已下架
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 状态1销售中2已下架
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 衣长/裙长/裤长
+     */
+    public Double getLength() {
+        return length;
+    }
+
+    /**
+     * 衣长/裙长/裤长
+     */
+    public void setLength(Double length) {
+        this.length = length;
+    }
+
+    /**
+     * 高度/袖长
+     */
+    public Double getHeight() {
+        return height;
+    }
+
+    /**
+     * 高度/袖长
+     */
+    public void setHeight(Double height) {
+        this.height = height;
+    }
+
+    /**
+     * 宽度/胸阔(围)
+     */
+    public Double getWidth() {
+        return width;
+    }
+
+    /**
+     * 宽度/胸阔(围)
+     */
+    public void setWidth(Double width) {
+        this.width = width;
+    }
+
+    /**
+     * 肩阔
+     */
+    public Double getWidth1() {
+        return width1;
+    }
+
+    /**
+     * 肩阔
+     */
+    public void setWidth1(Double width1) {
+        this.width1 = width1;
+    }
+
+    /**
+     * 腰阔
+     */
+    public Double getWidth2() {
+        return width2;
+    }
+
+    /**
+     * 腰阔
+     */
+    public void setWidth2(Double width2) {
+        this.width2 = width2;
+    }
+
+    /**
+     * 臀阔
+     */
+    public Double getWidth3() {
+        return width3;
+    }
+
+    /**
+     * 臀阔
+     */
+    public void setWidth3(Double width3) {
+        this.width3 = width3;
+    }
+
+    /**
+     * 重量
+     */
+    public Double getWeight() {
+        return weight;
+    }
+
+    /**
+     * 重量
+     */
+    public void setWeight(Double weight) {
+        this.weight = weight;
+    }
+
+    /**
+     * 0启用   1禁用
+     */
+    public Integer getDisable() {
+        return disable;
+    }
+
+    /**
+     * 0启用   1禁用
+     */
+    public void setDisable(Integer disable) {
+        this.disable = disable;
+    }
+
+    /**
+     * 保质期
+     */
+    public String getPeriod() {
+        return period;
+    }
+
+    /**
+     * 保质期
+     */
+    public void setPeriod(String period) {
+        this.period = period;
+    }
+
+    /**
+     * 预计采购价格
+     */
+    public BigDecimal getPurPrice() {
+        return purPrice;
+    }
+
+    /**
+     * 预计采购价格
+     */
+    public void setPurPrice(BigDecimal purPrice) {
+        this.purPrice = purPrice;
+    }
+
+    /**
+     * 建议批发价
+     */
+    public BigDecimal getWholePrice() {
+        return wholePrice;
+    }
+
+    /**
+     * 建议批发价
+     */
+    public void setWholePrice(BigDecimal wholePrice) {
+        this.wholePrice = wholePrice;
+    }
+
+    /**
+     * 建议零售价
+     */
+    public BigDecimal getRetailPrice() {
+        return retailPrice;
+    }
+
+    /**
+     * 建议零售价
+     */
+    public void setRetailPrice(BigDecimal retailPrice) {
+        this.retailPrice = retailPrice;
+    }
+
+    /**
+     * 单位成本
+     */
+    public BigDecimal getUnitCost() {
+        return unitCost;
+    }
+
+    /**
+     * 单位成本
+     */
+    public void setUnitCost(BigDecimal unitCost) {
+        this.unitCost = unitCost;
+    }
+
+    /**
+     * 供应商id
+     */
+    public Integer getSupplierId() {
+        return supplierId;
+    }
+
+    /**
+     * 供应商id
+     */
+    public void setSupplierId(Integer supplierId) {
+        this.supplierId = supplierId;
+    }
+
+    /**
+     * 品牌id
+     */
+    public Integer getBrandId() {
+        return brandId;
+    }
+
+    /**
+     * 品牌id
+     */
+    public void setBrandId(Integer brandId) {
+        this.brandId = brandId;
+    }
+
+    /**
+     * 属性1：季节
+     */
+    public String getAttr1() {
+        return attr1;
+    }
+
+    /**
+     * 属性1：季节
+     */
+    public void setAttr1(String attr1) {
+        this.attr1 = attr1;
+    }
+
+    /**
+     * 属性2：分类
+     */
+    public String getAttr2() {
+        return attr2;
+    }
+
+    /**
+     * 属性2：分类
+     */
+    public void setAttr2(String attr2) {
+        this.attr2 = attr2;
+    }
+
+    /**
+     * 属性3：风格
+     */
+    public String getAttr3() {
+        return attr3;
+    }
+
+    /**
+     * 属性3：风格
+     */
+    public void setAttr3(String attr3) {
+        this.attr3 = attr3;
+    }
+
+    /**
+     * 属性4：年份
+     */
+    public String getAttr4() {
+        return attr4;
+    }
+
+    /**
+     * 属性4：年份
+     */
+    public void setAttr4(String attr4) {
+        this.attr4 = attr4;
+    }
+
+    /**
+     * 属性5：面料
+     */
+    public String getAttr5() {
+        return attr5;
+    }
+
+    /**
+     * 属性5：面料
+     */
+    public void setAttr5(String attr5) {
+        this.attr5 = attr5;
+    }
+
+    /**
+     * 外链url
+     */
+    public String getLinkUrl() {
+        return linkUrl;
+    }
+
+    /**
+     * 外链url
+     */
+    public void setLinkUrl(String linkUrl) {
+        this.linkUrl = linkUrl;
+    }
+
+    /**
+     * 最低库存（预警）
+     */
+    public Integer getLowQty() {
+        return lowQty;
+    }
+
+    /**
+     * 最低库存（预警）
+     */
+    public void setLowQty(Integer lowQty) {
+        this.lowQty = lowQty;
+    }
+
+    /**
+     * 最高库存（预警）
+     */
+    public Integer getHighQty() {
+        return highQty;
+    }
+
+    /**
+     * 最高库存（预警）
+     */
+    public void setHighQty(Integer highQty) {
+        this.highQty = highQty;
+    }
+
+    /**
+     * 创建人
+     */
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    /**
+     * 创建人
+     */
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    /**
+     * 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 更新人
+     */
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    /**
+     * 更新人
+     */
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    /**
+     * 更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        OGoods other = (OGoods) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
+            && (this.getImage() == null ? other.getImage() == null : this.getImage().equals(other.getImage()))
+            && (this.getErpGoodsId() == null ? other.getErpGoodsId() == null : this.getErpGoodsId().equals(other.getErpGoodsId()))
+            && (this.getGoodsNum() == null ? other.getGoodsNum() == null : this.getGoodsNum().equals(other.getGoodsNum()))
+            && (this.getUnitName() == null ? other.getUnitName() == null : this.getUnitName().equals(other.getUnitName()))
+            && (this.getCategoryId() == null ? other.getCategoryId() == null : this.getCategoryId().equals(other.getCategoryId()))
+            && (this.getBarCode() == null ? other.getBarCode() == null : this.getBarCode().equals(other.getBarCode()))
+            && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getLength() == null ? other.getLength() == null : this.getLength().equals(other.getLength()))
+            && (this.getHeight() == null ? other.getHeight() == null : this.getHeight().equals(other.getHeight()))
+            && (this.getWidth() == null ? other.getWidth() == null : this.getWidth().equals(other.getWidth()))
+            && (this.getWidth1() == null ? other.getWidth1() == null : this.getWidth1().equals(other.getWidth1()))
+            && (this.getWidth2() == null ? other.getWidth2() == null : this.getWidth2().equals(other.getWidth2()))
+            && (this.getWidth3() == null ? other.getWidth3() == null : this.getWidth3().equals(other.getWidth3()))
+            && (this.getWeight() == null ? other.getWeight() == null : this.getWeight().equals(other.getWeight()))
+            && (this.getDisable() == null ? other.getDisable() == null : this.getDisable().equals(other.getDisable()))
+            && (this.getPeriod() == null ? other.getPeriod() == null : this.getPeriod().equals(other.getPeriod()))
+            && (this.getPurPrice() == null ? other.getPurPrice() == null : this.getPurPrice().equals(other.getPurPrice()))
+            && (this.getWholePrice() == null ? other.getWholePrice() == null : this.getWholePrice().equals(other.getWholePrice()))
+            && (this.getRetailPrice() == null ? other.getRetailPrice() == null : this.getRetailPrice().equals(other.getRetailPrice()))
+            && (this.getUnitCost() == null ? other.getUnitCost() == null : this.getUnitCost().equals(other.getUnitCost()))
+            && (this.getSupplierId() == null ? other.getSupplierId() == null : this.getSupplierId().equals(other.getSupplierId()))
+            && (this.getBrandId() == null ? other.getBrandId() == null : this.getBrandId().equals(other.getBrandId()))
+            && (this.getAttr1() == null ? other.getAttr1() == null : this.getAttr1().equals(other.getAttr1()))
+            && (this.getAttr2() == null ? other.getAttr2() == null : this.getAttr2().equals(other.getAttr2()))
+            && (this.getAttr3() == null ? other.getAttr3() == null : this.getAttr3().equals(other.getAttr3()))
+            && (this.getAttr4() == null ? other.getAttr4() == null : this.getAttr4().equals(other.getAttr4()))
+            && (this.getAttr5() == null ? other.getAttr5() == null : this.getAttr5().equals(other.getAttr5()))
+            && (this.getLinkUrl() == null ? other.getLinkUrl() == null : this.getLinkUrl().equals(other.getLinkUrl()))
+            && (this.getLowQty() == null ? other.getLowQty() == null : this.getLowQty().equals(other.getLowQty()))
+            && (this.getHighQty() == null ? other.getHighQty() == null : this.getHighQty().equals(other.getHighQty()))
+            && (this.getCreateBy() == null ? other.getCreateBy() == null : this.getCreateBy().equals(other.getCreateBy()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getUpdateBy() == null ? other.getUpdateBy() == null : this.getUpdateBy().equals(other.getUpdateBy()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
+        result = prime * result + ((getImage() == null) ? 0 : getImage().hashCode());
+        result = prime * result + ((getErpGoodsId() == null) ? 0 : getErpGoodsId().hashCode());
+        result = prime * result + ((getGoodsNum() == null) ? 0 : getGoodsNum().hashCode());
+        result = prime * result + ((getUnitName() == null) ? 0 : getUnitName().hashCode());
+        result = prime * result + ((getCategoryId() == null) ? 0 : getCategoryId().hashCode());
+        result = prime * result + ((getBarCode() == null) ? 0 : getBarCode().hashCode());
+        result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getLength() == null) ? 0 : getLength().hashCode());
+        result = prime * result + ((getHeight() == null) ? 0 : getHeight().hashCode());
+        result = prime * result + ((getWidth() == null) ? 0 : getWidth().hashCode());
+        result = prime * result + ((getWidth1() == null) ? 0 : getWidth1().hashCode());
+        result = prime * result + ((getWidth2() == null) ? 0 : getWidth2().hashCode());
+        result = prime * result + ((getWidth3() == null) ? 0 : getWidth3().hashCode());
+        result = prime * result + ((getWeight() == null) ? 0 : getWeight().hashCode());
+        result = prime * result + ((getDisable() == null) ? 0 : getDisable().hashCode());
+        result = prime * result + ((getPeriod() == null) ? 0 : getPeriod().hashCode());
+        result = prime * result + ((getPurPrice() == null) ? 0 : getPurPrice().hashCode());
+        result = prime * result + ((getWholePrice() == null) ? 0 : getWholePrice().hashCode());
+        result = prime * result + ((getRetailPrice() == null) ? 0 : getRetailPrice().hashCode());
+        result = prime * result + ((getUnitCost() == null) ? 0 : getUnitCost().hashCode());
+        result = prime * result + ((getSupplierId() == null) ? 0 : getSupplierId().hashCode());
+        result = prime * result + ((getBrandId() == null) ? 0 : getBrandId().hashCode());
+        result = prime * result + ((getAttr1() == null) ? 0 : getAttr1().hashCode());
+        result = prime * result + ((getAttr2() == null) ? 0 : getAttr2().hashCode());
+        result = prime * result + ((getAttr3() == null) ? 0 : getAttr3().hashCode());
+        result = prime * result + ((getAttr4() == null) ? 0 : getAttr4().hashCode());
+        result = prime * result + ((getAttr5() == null) ? 0 : getAttr5().hashCode());
+        result = prime * result + ((getLinkUrl() == null) ? 0 : getLinkUrl().hashCode());
+        result = prime * result + ((getLowQty() == null) ? 0 : getLowQty().hashCode());
+        result = prime * result + ((getHighQty() == null) ? 0 : getHighQty().hashCode());
+        result = prime * result + ((getCreateBy() == null) ? 0 : getCreateBy().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getUpdateBy() == null) ? 0 : getUpdateBy().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", name=").append(name);
+        sb.append(", image=").append(image);
+        sb.append(", erpGoodsId=").append(erpGoodsId);
+        sb.append(", goodsNum=").append(goodsNum);
+        sb.append(", unitName=").append(unitName);
+        sb.append(", categoryId=").append(categoryId);
+        sb.append(", barCode=").append(barCode);
+        sb.append(", remark=").append(remark);
+        sb.append(", status=").append(status);
+        sb.append(", length=").append(length);
+        sb.append(", height=").append(height);
+        sb.append(", width=").append(width);
+        sb.append(", width1=").append(width1);
+        sb.append(", width2=").append(width2);
+        sb.append(", width3=").append(width3);
+        sb.append(", weight=").append(weight);
+        sb.append(", disable=").append(disable);
+        sb.append(", period=").append(period);
+        sb.append(", purPrice=").append(purPrice);
+        sb.append(", wholePrice=").append(wholePrice);
+        sb.append(", retailPrice=").append(retailPrice);
+        sb.append(", unitCost=").append(unitCost);
+        sb.append(", supplierId=").append(supplierId);
+        sb.append(", brandId=").append(brandId);
+        sb.append(", attr1=").append(attr1);
+        sb.append(", attr2=").append(attr2);
+        sb.append(", attr3=").append(attr3);
+        sb.append(", attr4=").append(attr4);
+        sb.append(", attr5=").append(attr5);
+        sb.append(", linkUrl=").append(linkUrl);
+        sb.append(", lowQty=").append(lowQty);
+        sb.append(", highQty=").append(highQty);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateBy=").append(updateBy);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

tao-api/src/main/java/com/qihang/tao/domain/OGoodsSku.java

@@ -0,0 +1,528 @@
+package com.qihang.tao.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 商品规格库存管理
+ * @TableName o_goods_sku
+ */
+public class OGoodsSku implements Serializable {
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 商品id
+     */
+    private Long erpGoodsId;
+
+    /**
+     * skuId(唯一)
+     */
+    private Long erpSkuId;
+
+    /**
+     * 规格名
+     */
+    private String skuName;
+
+    /**
+     * 规格编码
+     */
+    private String skuNum;
+
+    /**
+     * 颜色id
+     */
+    private Integer colorId;
+
+    /**
+     * 颜色值
+     */
+    private String colorValue;
+
+    /**
+     * 颜色图片
+     */
+    private String colorImage;
+
+    /**
+     * 尺码id
+     */
+    private Integer sizeId;
+
+    /**
+     * 尺码值
+     */
+    private String sizeValue;
+
+    /**
+     * 款式id
+     */
+    private Integer styleId;
+
+    /**
+     * 款式值
+     */
+    private String styleValue;
+
+    /**
+     * 库存条形码
+     */
+    private String barCode;
+
+    /**
+     * 预计采购价
+     */
+    private BigDecimal purPrice;
+
+    /**
+     * 建议批发价
+     */
+    private BigDecimal wholePrice;
+
+    /**
+     * 建议零售价
+     */
+    private BigDecimal retailPrice;
+
+    /**
+     * 单位成本
+     */
+    private BigDecimal unitCost;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 最低库存（预警）
+     */
+    private Integer lowQty;
+
+    /**
+     * 最高库存（预警）
+     */
+    private Integer highQty;
+
+    /**
+     * 0启用   1禁用
+     */
+    private Integer disable;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 主键id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 商品id
+     */
+    public Long getErpGoodsId() {
+        return erpGoodsId;
+    }
+
+    /**
+     * 商品id
+     */
+    public void setErpGoodsId(Long erpGoodsId) {
+        this.erpGoodsId = erpGoodsId;
+    }
+
+    /**
+     * skuId(唯一)
+     */
+    public Long getErpSkuId() {
+        return erpSkuId;
+    }
+
+    /**
+     * skuId(唯一)
+     */
+    public void setErpSkuId(Long erpSkuId) {
+        this.erpSkuId = erpSkuId;
+    }
+
+    /**
+     * 规格名
+     */
+    public String getSkuName() {
+        return skuName;
+    }
+
+    /**
+     * 规格名
+     */
+    public void setSkuName(String skuName) {
+        this.skuName = skuName;
+    }
+
+    /**
+     * 规格编码
+     */
+    public String getSkuNum() {
+        return skuNum;
+    }
+
+    /**
+     * 规格编码
+     */
+    public void setSkuNum(String skuNum) {
+        this.skuNum = skuNum;
+    }
+
+    /**
+     * 颜色id
+     */
+    public Integer getColorId() {
+        return colorId;
+    }
+
+    /**
+     * 颜色id
+     */
+    public void setColorId(Integer colorId) {
+        this.colorId = colorId;
+    }
+
+    /**
+     * 颜色值
+     */
+    public String getColorValue() {
+        return colorValue;
+    }
+
+    /**
+     * 颜色值
+     */
+    public void setColorValue(String colorValue) {
+        this.colorValue = colorValue;
+    }
+
+    /**
+     * 颜色图片
+     */
+    public String getColorImage() {
+        return colorImage;
+    }
+
+    /**
+     * 颜色图片
+     */
+    public void setColorImage(String colorImage) {
+        this.colorImage = colorImage;
+    }
+
+    /**
+     * 尺码id
+     */
+    public Integer getSizeId() {
+        return sizeId;
+    }
+
+    /**
+     * 尺码id
+     */
+    public void setSizeId(Integer sizeId) {
+        this.sizeId = sizeId;
+    }
+
+    /**
+     * 尺码值
+     */
+    public String getSizeValue() {
+        return sizeValue;
+    }
+
+    /**
+     * 尺码值
+     */
+    public void setSizeValue(String sizeValue) {
+        this.sizeValue = sizeValue;
+    }
+
+    /**
+     * 款式id
+     */
+    public Integer getStyleId() {
+        return styleId;
+    }
+
+    /**
+     * 款式id
+     */
+    public void setStyleId(Integer styleId) {
+        this.styleId = styleId;
+    }
+
+    /**
+     * 款式值
+     */
+    public String getStyleValue() {
+        return styleValue;
+    }
+
+    /**
+     * 款式值
+     */
+    public void setStyleValue(String styleValue) {
+        this.styleValue = styleValue;
+    }
+
+    /**
+     * 库存条形码
+     */
+    public String getBarCode() {
+        return barCode;
+    }
+
+    /**
+     * 库存条形码
+     */
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
+    /**
+     * 预计采购价
+     */
+    public BigDecimal getPurPrice() {
+        return purPrice;
+    }
+
+    /**
+     * 预计采购价
+     */
+    public void setPurPrice(BigDecimal purPrice) {
+        this.purPrice = purPrice;
+    }
+
+    /**
+     * 建议批发价
+     */
+    public BigDecimal getWholePrice() {
+        return wholePrice;
+    }
+
+    /**
+     * 建议批发价
+     */
+    public void setWholePrice(BigDecimal wholePrice) {
+        this.wholePrice = wholePrice;
+    }
+
+    /**
+     * 建议零售价
+     */
+    public BigDecimal getRetailPrice() {
+        return retailPrice;
+    }
+
+    /**
+     * 建议零售价
+     */
+    public void setRetailPrice(BigDecimal retailPrice) {
+        this.retailPrice = retailPrice;
+    }
+
+    /**
+     * 单位成本
+     */
+    public BigDecimal getUnitCost() {
+        return unitCost;
+    }
+
+    /**
+     * 单位成本
+     */
+    public void setUnitCost(BigDecimal unitCost) {
+        this.unitCost = unitCost;
+    }
+
+    /**
+     * 备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    /**
+     * 状态
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 状态
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 最低库存（预警）
+     */
+    public Integer getLowQty() {
+        return lowQty;
+    }
+
+    /**
+     * 最低库存（预警）
+     */
+    public void setLowQty(Integer lowQty) {
+        this.lowQty = lowQty;
+    }
+
+    /**
+     * 最高库存（预警）
+     */
+    public Integer getHighQty() {
+        return highQty;
+    }
+
+    /**
+     * 最高库存（预警）
+     */
+    public void setHighQty(Integer highQty) {
+        this.highQty = highQty;
+    }
+
+    /**
+     * 0启用   1禁用
+     */
+    public Integer getDisable() {
+        return disable;
+    }
+
+    /**
+     * 0启用   1禁用
+     */
+    public void setDisable(Integer disable) {
+        this.disable = disable;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        OGoodsSku other = (OGoodsSku) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getErpGoodsId() == null ? other.getErpGoodsId() == null : this.getErpGoodsId().equals(other.getErpGoodsId()))
+            && (this.getErpSkuId() == null ? other.getErpSkuId() == null : this.getErpSkuId().equals(other.getErpSkuId()))
+            && (this.getSkuName() == null ? other.getSkuName() == null : this.getSkuName().equals(other.getSkuName()))
+            && (this.getSkuNum() == null ? other.getSkuNum() == null : this.getSkuNum().equals(other.getSkuNum()))
+            && (this.getColorId() == null ? other.getColorId() == null : this.getColorId().equals(other.getColorId()))
+            && (this.getColorValue() == null ? other.getColorValue() == null : this.getColorValue().equals(other.getColorValue()))
+            && (this.getColorImage() == null ? other.getColorImage() == null : this.getColorImage().equals(other.getColorImage()))
+            && (this.getSizeId() == null ? other.getSizeId() == null : this.getSizeId().equals(other.getSizeId()))
+            && (this.getSizeValue() == null ? other.getSizeValue() == null : this.getSizeValue().equals(other.getSizeValue()))
+            && (this.getStyleId() == null ? other.getStyleId() == null : this.getStyleId().equals(other.getStyleId()))
+            && (this.getStyleValue() == null ? other.getStyleValue() == null : this.getStyleValue().equals(other.getStyleValue()))
+            && (this.getBarCode() == null ? other.getBarCode() == null : this.getBarCode().equals(other.getBarCode()))
+            && (this.getPurPrice() == null ? other.getPurPrice() == null : this.getPurPrice().equals(other.getPurPrice()))
+            && (this.getWholePrice() == null ? other.getWholePrice() == null : this.getWholePrice().equals(other.getWholePrice()))
+            && (this.getRetailPrice() == null ? other.getRetailPrice() == null : this.getRetailPrice().equals(other.getRetailPrice()))
+            && (this.getUnitCost() == null ? other.getUnitCost() == null : this.getUnitCost().equals(other.getUnitCost()))
+            && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getLowQty() == null ? other.getLowQty() == null : this.getLowQty().equals(other.getLowQty()))
+            && (this.getHighQty() == null ? other.getHighQty() == null : this.getHighQty().equals(other.getHighQty()))
+            && (this.getDisable() == null ? other.getDisable() == null : this.getDisable().equals(other.getDisable()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getErpGoodsId() == null) ? 0 : getErpGoodsId().hashCode());
+        result = prime * result + ((getErpSkuId() == null) ? 0 : getErpSkuId().hashCode());
+        result = prime * result + ((getSkuName() == null) ? 0 : getSkuName().hashCode());
+        result = prime * result + ((getSkuNum() == null) ? 0 : getSkuNum().hashCode());
+        result = prime * result + ((getColorId() == null) ? 0 : getColorId().hashCode());
+        result = prime * result + ((getColorValue() == null) ? 0 : getColorValue().hashCode());
+        result = prime * result + ((getColorImage() == null) ? 0 : getColorImage().hashCode());
+        result = prime * result + ((getSizeId() == null) ? 0 : getSizeId().hashCode());
+        result = prime * result + ((getSizeValue() == null) ? 0 : getSizeValue().hashCode());
+        result = prime * result + ((getStyleId() == null) ? 0 : getStyleId().hashCode());
+        result = prime * result + ((getStyleValue() == null) ? 0 : getStyleValue().hashCode());
+        result = prime * result + ((getBarCode() == null) ? 0 : getBarCode().hashCode());
+        result = prime * result + ((getPurPrice() == null) ? 0 : getPurPrice().hashCode());
+        result = prime * result + ((getWholePrice() == null) ? 0 : getWholePrice().hashCode());
+        result = prime * result + ((getRetailPrice() == null) ? 0 : getRetailPrice().hashCode());
+        result = prime * result + ((getUnitCost() == null) ? 0 : getUnitCost().hashCode());
+        result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getLowQty() == null) ? 0 : getLowQty().hashCode());
+        result = prime * result + ((getHighQty() == null) ? 0 : getHighQty().hashCode());
+        result = prime * result + ((getDisable() == null) ? 0 : getDisable().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", erpGoodsId=").append(erpGoodsId);
+        sb.append(", erpSkuId=").append(erpSkuId);
+        sb.append(", skuName=").append(skuName);
+        sb.append(", skuNum=").append(skuNum);
+        sb.append(", colorId=").append(colorId);
+        sb.append(", colorValue=").append(colorValue);
+        sb.append(", colorImage=").append(colorImage);
+        sb.append(", sizeId=").append(sizeId);
+        sb.append(", sizeValue=").append(sizeValue);
+        sb.append(", styleId=").append(styleId);
+        sb.append(", styleValue=").append(styleValue);
+        sb.append(", barCode=").append(barCode);
+        sb.append(", purPrice=").append(purPrice);
+        sb.append(", wholePrice=").append(wholePrice);
+        sb.append(", retailPrice=").append(retailPrice);
+        sb.append(", unitCost=").append(unitCost);
+        sb.append(", remark=").append(remark);
+        sb.append(", status=").append(status);
+        sb.append(", lowQty=").append(lowQty);
+        sb.append(", highQty=").append(highQty);
+        sb.append(", disable=").append(disable);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

tao-api/src/main/java/com/qihang/tao/domain/TaoGoodsSku.java

@@ -1,6 +1,7 @@
 package com.qihang.tao.domain;
 
 import java.io.Serializable;
+import java.math.BigInteger;
 import java.util.Date;
 
 /**
@@ -91,12 +92,12 @@ public class TaoGoodsSku implements Serializable {
     /**
      * erp商品SKUid
      */
-    private Integer erpGoodsSkuId;
+    private Long erpGoodsSkuId;
 
     /**
      * erp商品id
      */
-    private Integer erpGoodsId;
+    private Long erpGoodsId;
 
     /**
      * 创建时间
@@ -332,28 +333,28 @@ public class TaoGoodsSku implements Serializable {
     /**
      * erp商品SKUid
      */
-    public Integer getErpGoodsSkuId() {
+    public Long getErpGoodsSkuId() {
         return erpGoodsSkuId;
     }
 
     /**
      * erp商品SKUid
      */
-    public void setErpGoodsSkuId(Integer erpGoodsSkuId) {
+    public void setErpGoodsSkuId(Long erpGoodsSkuId) {
         this.erpGoodsSkuId = erpGoodsSkuId;
     }
 
     /**
      * erp商品id
      */
-    public Integer getErpGoodsId() {
+    public Long getErpGoodsId() {
         return erpGoodsId;
     }
 
     /**
      * erp商品id
      */
-    public void setErpGoodsId(Integer erpGoodsId) {
+    public void setErpGoodsId(Long erpGoodsId) {
         this.erpGoodsId = erpGoodsId;
     }
 

tao-api/src/main/java/com/qihang/tao/mapper/OGoodsMapper.java

@@ -0,0 +1,18 @@
+package com.qihang.tao.mapper;
+
+import com.qihang.tao.domain.OGoods;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author qilip
+* @description 针对表【o_goods(商品库存管理)】的数据库操作Mapper
+* @createDate 2024-03-12 20:30:27
+* @Entity com.qihang.tao.domain.OGoods
+*/
+public interface OGoodsMapper extends BaseMapper<OGoods> {
+
+}
+
+
+
+

tao-api/src/main/java/com/qihang/tao/mapper/OGoodsSkuMapper.java

@@ -0,0 +1,18 @@
+package com.qihang.tao.mapper;
+
+import com.qihang.tao.domain.OGoodsSku;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author qilip
+* @description 针对表【o_goods_sku(商品规格库存管理)】的数据库操作Mapper
+* @createDate 2024-03-12 20:30:27
+* @Entity com.qihang.tao.domain.OGoodsSku
+*/
+public interface OGoodsSkuMapper extends BaseMapper<OGoodsSku> {
+
+}
+
+
+
+

tao-api/src/main/java/com/qihang/tao/service/OGoodsService.java

@@ -0,0 +1,13 @@
+package com.qihang.tao.service;
+
+import com.qihang.tao.domain.OGoods;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author qilip
+* @description 针对表【o_goods(商品库存管理)】的数据库操作Service
+* @createDate 2024-03-12 20:30:27
+*/
+public interface OGoodsService extends IService<OGoods> {
+
+}

tao-api/src/main/java/com/qihang/tao/service/OGoodsSkuService.java

@@ -0,0 +1,13 @@
+package com.qihang.tao.service;
+
+import com.qihang.tao.domain.OGoodsSku;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author qilip
+* @description 针对表【o_goods_sku(商品规格库存管理)】的数据库操作Service
+* @createDate 2024-03-12 20:30:27
+*/
+public interface OGoodsSkuService extends IService<OGoodsSku> {
+
+}

tao-api/src/main/java/com/qihang/tao/service/impl/OGoodsServiceImpl.java

@@ -0,0 +1,22 @@
+package com.qihang.tao.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qihang.tao.domain.OGoods;
+import com.qihang.tao.service.OGoodsService;
+import com.qihang.tao.mapper.OGoodsMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author qilip
+* @description 针对表【o_goods(商品库存管理)】的数据库操作Service实现
+* @createDate 2024-03-12 20:30:27
+*/
+@Service
+public class OGoodsServiceImpl extends ServiceImpl<OGoodsMapper, OGoods>
+    implements OGoodsService{
+
+}
+
+
+
+

tao-api/src/main/java/com/qihang/tao/service/impl/OGoodsSkuServiceImpl.java

@@ -0,0 +1,22 @@
+package com.qihang.tao.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qihang.tao.domain.OGoodsSku;
+import com.qihang.tao.service.OGoodsSkuService;
+import com.qihang.tao.mapper.OGoodsSkuMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author qilip
+* @description 针对表【o_goods_sku(商品规格库存管理)】的数据库操作Service实现
+* @createDate 2024-03-12 20:30:27
+*/
+@Service
+public class OGoodsSkuServiceImpl extends ServiceImpl<OGoodsSkuMapper, OGoodsSku>
+    implements OGoodsSkuService{
+
+}
+
+
+
+

tao-api/src/main/java/com/qihang/tao/service/impl/TaoGoodsServiceImpl.java

@@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qihang.common.common.ResultVoEnum;
+import com.qihang.common.utils.StringUtils;
 import com.qihang.tao.common.PageQuery;
 import com.qihang.tao.common.PageResult;
+import com.qihang.tao.domain.OGoodsSku;
 import com.qihang.tao.domain.TaoGoods;
 import com.qihang.tao.domain.TaoGoodsSku;
 import com.qihang.tao.domain.bo.TaoGoodsBo;
+import com.qihang.tao.mapper.OGoodsSkuMapper;
 import com.qihang.tao.mapper.TaoGoodsSkuMapper;
 import com.qihang.tao.service.TaoGoodsService;
 import com.qihang.tao.mapper.TaoGoodsMapper;
@@ -31,6 +34,7 @@ public class TaoGoodsServiceImpl extends ServiceImpl<TaoGoodsMapper, TaoGoods>
 
     private final TaoGoodsMapper mapper;
     private final TaoGoodsSkuMapper skuMapper;
+    private final OGoodsSkuMapper goodsSkuMapper;
 
     @Override
     public PageResult<TaoGoods> queryPageList(TaoGoodsBo bo, PageQuery pageQuery) {
@@ -57,6 +61,14 @@ public class TaoGoodsServiceImpl extends ServiceImpl<TaoGoodsMapper, TaoGoods>
             if(goods.getSkus()!=null) {
                 for (var sku : goods.getSkus()) {
                     sku.setTaoGoodsId(goods.getId());
+                    // 根据OuterId查找ERP系统中的skuid
+                    if(StringUtils.isNotEmpty(sku.getOuterId())) {
+                        List<OGoodsSku> oGoodsSkus = goodsSkuMapper.selectList(new LambdaQueryWrapper<OGoodsSku>().eq(OGoodsSku::getSkuNum, sku.getOuterId()));
+                        if(oGoodsSkus!=null && !oGoodsSkus.isEmpty()){
+                            sku.setErpGoodsId(oGoodsSkus.get(0).getErpGoodsId());
+                            sku.setErpGoodsSkuId(oGoodsSkus.get(0).getErpSkuId());
+                        }
+                    }
                     skuMapper.insert(sku);
                 }
             }
@@ -70,6 +82,15 @@ public class TaoGoodsServiceImpl extends ServiceImpl<TaoGoodsMapper, TaoGoods>
             if(goods.getSkus()!=null) {
                 for (var sku : goods.getSkus()) {
                     sku.setTaoGoodsId(goods.getId());
+                    // 根据OuterId查找ERP系统中的skuid
+                    if(StringUtils.isNotEmpty(sku.getOuterId())) {
+                        List<OGoodsSku> oGoodsSkus = goodsSkuMapper.selectList(new LambdaQueryWrapper<OGoodsSku>().eq(OGoodsSku::getSkuNum, sku.getOuterId()));
+                        if(oGoodsSkus!=null && !oGoodsSkus.isEmpty()){
+                            sku.setErpGoodsId(oGoodsSkus.get(0).getErpGoodsId());
+                            sku.setErpGoodsSkuId(oGoodsSkus.get(0).getErpSkuId());
+                        }
+                    }
+
                     skuMapper.insert(sku);
                 }
             }

tao-api/src/main/resources/mapper/OGoodsMapper.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qihang.tao.mapper.OGoodsMapper">
+
+    <resultMap id="BaseResultMap" type="com.qihang.tao.domain.OGoods">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="image" column="image" jdbcType="VARCHAR"/>
+            <result property="erpGoodsId" column="erp_goods_id" jdbcType="BIGINT"/>
+            <result property="goodsNum" column="goods_num" jdbcType="VARCHAR"/>
+            <result property="unitName" column="unit_name" jdbcType="VARCHAR"/>
+            <result property="categoryId" column="category_id" jdbcType="INTEGER"/>
+            <result property="barCode" column="bar_code" jdbcType="VARCHAR"/>
+            <result property="remark" column="remark" jdbcType="VARCHAR"/>
+            <result property="status" column="status" jdbcType="TINYINT"/>
+            <result property="length" column="length" jdbcType="FLOAT"/>
+            <result property="height" column="height" jdbcType="FLOAT"/>
+            <result property="width" column="width" jdbcType="FLOAT"/>
+            <result property="width1" column="width1" jdbcType="FLOAT"/>
+            <result property="width2" column="width2" jdbcType="FLOAT"/>
+            <result property="width3" column="width3" jdbcType="FLOAT"/>
+            <result property="weight" column="weight" jdbcType="FLOAT"/>
+            <result property="disable" column="disable" jdbcType="TINYINT"/>
+            <result property="period" column="period" jdbcType="VARCHAR"/>
+            <result property="purPrice" column="pur_price" jdbcType="DECIMAL"/>
+            <result property="wholePrice" column="whole_price" jdbcType="DECIMAL"/>
+            <result property="retailPrice" column="retail_price" jdbcType="DECIMAL"/>
+            <result property="unitCost" column="unit_cost" jdbcType="DECIMAL"/>
+            <result property="supplierId" column="supplier_id" jdbcType="INTEGER"/>
+            <result property="brandId" column="brand_id" jdbcType="INTEGER"/>
+            <result property="attr1" column="attr1" jdbcType="VARCHAR"/>
+            <result property="attr2" column="attr2" jdbcType="VARCHAR"/>
+            <result property="attr3" column="attr3" jdbcType="VARCHAR"/>
+            <result property="attr4" column="attr4" jdbcType="VARCHAR"/>
+            <result property="attr5" column="attr5" jdbcType="VARCHAR"/>
+            <result property="linkUrl" column="link_url" jdbcType="VARCHAR"/>
+            <result property="lowQty" column="low_qty" jdbcType="INTEGER"/>
+            <result property="highQty" column="high_qty" jdbcType="INTEGER"/>
+            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,name,image,
+        erp_goods_id,goods_num,unit_name,
+        category_id,bar_code,remark,
+        status,length,height,
+        width,width1,width2,
+        width3,weight,disable,
+        period,pur_price,whole_price,
+        retail_price,unit_cost,supplier_id,
+        brand_id,attr1,attr2,
+        attr3,attr4,attr5,
+        link_url,low_qty,high_qty,
+        create_by,create_time,update_by,
+        update_time
+    </sql>
+</mapper>

tao-api/src/main/resources/mapper/OGoodsSkuMapper.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qihang.tao.mapper.OGoodsSkuMapper">
+
+    <resultMap id="BaseResultMap" type="com.qihang.tao.domain.OGoodsSku">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="erpGoodsId" column="erp_goods_id" jdbcType="BIGINT"/>
+            <result property="erpSkuId" column="erp_sku_id" jdbcType="BIGINT"/>
+            <result property="skuName" column="sku_name" jdbcType="VARCHAR"/>
+            <result property="skuNum" column="sku_num" jdbcType="VARCHAR"/>
+            <result property="colorId" column="color_id" jdbcType="INTEGER"/>
+            <result property="colorValue" column="color_value" jdbcType="VARCHAR"/>
+            <result property="colorImage" column="color_image" jdbcType="VARCHAR"/>
+            <result property="sizeId" column="size_id" jdbcType="INTEGER"/>
+            <result property="sizeValue" column="size_value" jdbcType="VARCHAR"/>
+            <result property="styleId" column="style_id" jdbcType="INTEGER"/>
+            <result property="styleValue" column="style_value" jdbcType="VARCHAR"/>
+            <result property="barCode" column="bar_code" jdbcType="VARCHAR"/>
+            <result property="purPrice" column="pur_price" jdbcType="DECIMAL"/>
+            <result property="wholePrice" column="whole_price" jdbcType="DECIMAL"/>
+            <result property="retailPrice" column="retail_price" jdbcType="DECIMAL"/>
+            <result property="unitCost" column="unit_cost" jdbcType="DECIMAL"/>
+            <result property="remark" column="remark" jdbcType="VARCHAR"/>
+            <result property="status" column="status" jdbcType="TINYINT"/>
+            <result property="lowQty" column="low_qty" jdbcType="INTEGER"/>
+            <result property="highQty" column="high_qty" jdbcType="INTEGER"/>
+            <result property="disable" column="disable" jdbcType="TINYINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,erp_goods_id,erp_sku_id,
+        sku_name,sku_num,color_id,
+        color_value,color_image,size_id,
+        size_value,style_id,style_value,
+        bar_code,pur_price,whole_price,
+        retail_price,unit_cost,remark,
+        status,low_qty,high_qty,
+        disable
+    </sql>
+</mapper>

tao-api/src/main/resources/mapper/TaoGoodsSkuMapper.xml

@@ -21,8 +21,8 @@
             <result property="status" column="status" jdbcType="VARCHAR"/>
             <result property="skuSpecId" column="sku_spec_id" jdbcType="VARCHAR"/>
             <result property="barcode" column="barcode" jdbcType="VARCHAR"/>
-            <result property="erpGoodsSkuId" column="erp_goods_sku_id" jdbcType="INTEGER"/>
+            <result property="erpGoodsSkuId" column="erp_goods_sku_id" jdbcType="BIGINT"/>
-            <result property="erpGoodsId" column="erp_goods_id" jdbcType="INTEGER"/>
+            <result property="erpGoodsId" column="erp_goods_id" jdbcType="BIGINT"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
     </resultMap>