优化jd订单

module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderItem.java

@@ -1,16 +1,18 @@
 package cn.qihangerp.module.open.jd.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import java.io.Serializable;
+import lombok.Data;
 
 /**
- * 
+ * 京东订单明细表
- * @TableName jd_order_item
+ * @TableName oms_jd_order_item
  */
-@TableName("oms_jd_order_item")
+@TableName(value ="oms_jd_order_item")
+@Data
 public class JdOrderItem implements Serializable {
     /**
      * 
@@ -19,7 +21,12 @@ public class JdOrderItem implements Serializable {
     private Long id;
 
     /**
-     *
+     * 外键id（jd_order表id）
+     */
+    private Long jdOrderId;
+
+    /**
+     * 京东平台订单id
      */
     private String orderId;
 
@@ -56,7 +63,7 @@ public class JdOrderItem implements Serializable {
     /**
      * 数量
      */
-    private String itemTotal;
+    private Integer itemTotal;
 
     /**
      * 
@@ -74,199 +81,15 @@ public class JdOrderItem implements Serializable {
     private String newStoreId;
 
     /**
-     * erp商品id
+     * 商品id(o_goods外键)
      */
-    private String oGoodsId;
+    private Long erpGoodsId;
 
     /**
-     * erp商品sku id
+     * 商品skuid(o_goods_sku外键)
      */
-    private Long oGoodsSkuId;
+    private Long erpGoodsSkuId;
 
+    @TableField(exist = false)
     private static final long serialVersionUID = 1L;
-
-    public String getoGoodsId() {
-        return oGoodsId;
-    }
-
-    public void setoGoodsId(String oGoodsId) {
-        this.oGoodsId = oGoodsId;
-    }
-
-    public Long getoGoodsSkuId() {
-        return oGoodsSkuId;
-    }
-
-    public void setoGoodsSkuId(Long oGoodsSkuId) {
-        this.oGoodsSkuId = oGoodsSkuId;
-    }
-
-    /**
-     * 
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * 
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     *
-     */
-    public String getOrderId() {
-        return orderId;
-    }
-
-    /**
-     * 外键id（jd_order表id）
-     */
-    public void setOrderId(String orderId) {
-        this.orderId = orderId;
-    }
-
-    /**
-     * 京东内部SKU的ID
-     */
-    public String getSkuId() {
-        return skuId;
-    }
-
-    /**
-     * 京东内部SKU的ID
-     */
-    public void setSkuId(String skuId) {
-        this.skuId = skuId;
-    }
-
-    /**
-     * SKU外部ID（极端情况下不保证返回，建议从商品接口获取
-     */
-    public String getOuterSkuId() {
-        return outerSkuId;
-    }
-
-    /**
-     * SKU外部ID（极端情况下不保证返回，建议从商品接口获取
-     */
-    public void setOuterSkuId(String outerSkuId) {
-        this.outerSkuId = outerSkuId;
-    }
-
-    /**
-     * 商品的名称+SKU规格
-     */
-    public String getSkuName() {
-        return skuName;
-    }
-
-    /**
-     * 商品的名称+SKU规格
-     */
-    public void setSkuName(String skuName) {
-        this.skuName = skuName;
-    }
-
-    /**
-     * SKU的京东价
-     */
-    public String getJdPrice() {
-        return jdPrice;
-    }
-
-    /**
-     * SKU的京东价
-     */
-    public void setJdPrice(String jdPrice) {
-        this.jdPrice = jdPrice;
-    }
-
-    /**
-     * 赠送积分
-     */
-    public String getGiftPoint() {
-        return giftPoint;
-    }
-
-    /**
-     * 赠送积分
-     */
-    public void setGiftPoint(String giftPoint) {
-        this.giftPoint = giftPoint;
-    }
-
-    /**
-     * 	京东内部商品ID（极端情况下不保证返回，建议从商品接口获取）
-     */
-    public String getWareId() {
-        return wareId;
-    }
-
-    /**
-     * 	京东内部商品ID（极端情况下不保证返回，建议从商品接口获取）
-     */
-    public void setWareId(String wareId) {
-        this.wareId = wareId;
-    }
-
-    /**
-     * 数量
-     */
-    public String getItemTotal() {
-        return itemTotal;
-    }
-
-    /**
-     * 数量
-     */
-    public void setItemTotal(String itemTotal) {
-        this.itemTotal = itemTotal;
-    }
-
-    /**
-     * 
-     */
-    public String getProductNo() {
-        return productNo;
-    }
-
-    /**
-     * 
-     */
-    public void setProductNo(String productNo) {
-        this.productNo = productNo;
-    }
-
-    /**
-     * 
-     */
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    /**
-     * 
-     */
-    public void setServiceName(String serviceName) {
-        this.serviceName = serviceName;
-    }
-
-    /**
-     * 
-     */
-    public String getNewStoreId() {
-        return newStoreId;
-    }
-
-    /**
-     * 
-     */
-    public void setNewStoreId(String newStoreId) {
-        this.newStoreId = newStoreId;
-    }
-
 }

module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderItemMapper.java

@@ -1,14 +1,13 @@
 package cn.qihangerp.module.open.jd.mapper;
 
-
 import cn.qihangerp.module.open.jd.domain.JdOrderItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
 * @author qilip
-* @description 针对表【jd_order_item】的数据库操作Mapper
+* @description 针对表【oms_jd_order_item(京东订单明细表)】的数据库操作Mapper
-* @createDate 2024-03-09 11:29:59
+* @createDate 2025-05-19 22:37:54
-* @Entity cn.qihangerp.jd.domain.JdOrderItem
+* @Entity cn.qihangerp.module.open.jd.domain.JdOrderItem
 */
 public interface JdOrderItemMapper extends BaseMapper<JdOrderItem> {
 

module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderItemService.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
 * @author qilip
-* @description 针对表【jd_order_item】的数据库操作Service
+* @description 针对表【oms_jd_order_item(京东订单明细表)】的数据库操作Service
-* @createDate 2024-03-09 11:29:59
+* @createDate 2025-05-19 22:37:54
 */
 public interface JdOrderItemService extends IService<JdOrderItem> {
 

module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderItemServiceImpl.java

@@ -8,8 +8,8 @@ import org.springframework.stereotype.Service;
 
 /**
 * @author qilip
-* @description 针对表【jd_order_item】的数据库操作Service实现
+* @description 针对表【oms_jd_order_item(京东订单明细表)】的数据库操作Service实现
-* @createDate 2024-03-09 11:29:59
+* @createDate 2025-05-19 22:37:54
 */
 @Service
 public class JdOrderItemServiceImpl extends ServiceImpl<JdOrderItemMapper, JdOrderItem>

module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java

@@ -117,10 +117,11 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder>
                             new LambdaQueryWrapper<JdGoodsSku>()
                                     .eq(JdGoodsSku::getSkuId, item.getSkuId()));
                     if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) {
-                        item.setoGoodsId(pddGoodsSku.get(0).getErpGoodsId().toString());
+                        item.setErpGoodsId(pddGoodsSku.get(0).getErpGoodsId());
-                        item.setoGoodsSkuId(pddGoodsSku.get(0).getErpGoodsId());
+                        item.setErpGoodsSkuId(pddGoodsSku.get(0).getErpGoodsId());
                     }
-                    item.setOrderId(jdOrders.get(0).getId());
+                    item.setJdOrderId(Long.parseLong(jdOrders.get(0).getId()));
+                    item.setOrderId(jdOrders.get(0).getOrderId());
                     itemMapper.insert(item);
                 }
                 // 更新item
@@ -160,10 +161,11 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder>
                 for (var item : order.getItems()) {
                     List<JdGoodsSku> pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper<JdGoodsSku>().eq(JdGoodsSku::getSkuId, item.getSkuId()));
                     if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) {
-                        item.setoGoodsId(pddGoodsSku.get(0).getErpGoodsId().toString());
+                        item.setErpGoodsId(pddGoodsSku.get(0).getErpGoodsId());
-                        item.setoGoodsSkuId(pddGoodsSku.get(0).getErpGoodsId());
+                        item.setErpGoodsSkuId(pddGoodsSku.get(0).getErpGoodsId());
                     }
-                    item.setOrderId(order.getId());
+                    item.setJdOrderId(Long.parseLong(order.getId()));
+                    item.setOrderId(order.getOrderId());
                     itemMapper.insert(item);
                 }
 

module/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml

@@ -6,25 +6,27 @@
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.module.open.jd.domain.JdOrderItem">
             <id property="id" column="id" jdbcType="BIGINT"/>
-            <result property="orderId" column="order_id" jdbcType="BIGINT"/>
+            <result property="jdOrderId" column="jd_order_id" jdbcType="BIGINT"/>
+            <result property="orderId" column="order_id" jdbcType="VARCHAR"/>
             <result property="skuId" column="sku_id" jdbcType="VARCHAR"/>
             <result property="outerSkuId" column="outer_sku_id" jdbcType="VARCHAR"/>
             <result property="skuName" column="sku_name" jdbcType="VARCHAR"/>
             <result property="jdPrice" column="jd_price" jdbcType="VARCHAR"/>
             <result property="giftPoint" column="gift_point" jdbcType="VARCHAR"/>
             <result property="wareId" column="ware_id" jdbcType="VARCHAR"/>
-            <result property="itemTotal" column="item_total" jdbcType="VARCHAR"/>
+            <result property="itemTotal" column="item_total" jdbcType="INTEGER"/>
             <result property="productNo" column="product_no" jdbcType="VARCHAR"/>
             <result property="serviceName" column="service_name" jdbcType="VARCHAR"/>
             <result property="newStoreId" column="new_store_id" jdbcType="VARCHAR"/>
-            <result property="oGoodsId" column="o_goods_id" jdbcType="BIGINT"/>
+            <result property="erpGoodsId" column="erp_goods_id" jdbcType="BIGINT"/>
-            <result property="oGoodsSkuId" column="o_goods_sku_id" jdbcType="VARCHAR"/>
+            <result property="erpGoodsSkuId" column="erp_goods_sku_id" jdbcType="BIGINT"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,order_id,sku_id,
+        id,jd_order_id,order_id,
-        outer_sku_id,sku_name,jd_price,
+        sku_id,outer_sku_id,sku_name,
-        gift_point,ware_id,item_total,
+        jd_price,gift_point,ware_id,
-        product_no,service_name,new_store_id,o_goods_id,o_goods_sku_id
+        item_total,product_no,service_name,
+        new_store_id,erp_goods_id,erp_goods_sku_id
     </sql>
 </mapper>