product、order服务model更新

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/base/BaseModel.java

@@ -2,6 +2,7 @@ package com.sckw.core.model.base;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -12,6 +13,7 @@ import java.util.Date;
  * @date Nov 24, 2018
  */
 @Data
+@Accessors(chain = true)
 public class BaseModel implements Serializable {
 	private static final long serialVersionUID = 1L;
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/dao/KwoTradeOrderSettlementMapper.java

@@ -1,15 +0,0 @@
-package com.sckw.order.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.order.model.KwoTradeOrderSettlement;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @desc: 交易订单结算（采购订单/销售订单）mapper
- * @author: yzc
- * @date: 2023-06-25 14:18
- */
-@Mapper
-public interface KwoTradeOrderSettlementMapper extends BaseMapper<KwoTradeOrderSettlement> {
-
-}

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoProject.java

@@ -2,10 +2,10 @@ package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
 
@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwo_project")
 public class KwoProject extends BaseModel {
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoProjectOrder.java

@@ -2,10 +2,10 @@ package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
 
 /**
  * @desc: 项目-销售订单/采购订单
@@ -15,7 +15,7 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwo_project_order")
 public class KwoProjectOrder extends BaseModel {
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrder.java

@@ -2,10 +2,10 @@ package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwo_trade_order")
 public class KwoTradeOrder extends BaseModel {
 
@@ -38,19 +38,19 @@ public class KwoTradeOrder extends BaseModel {
     private String unit;
 
     /**
-     * 支付金额
+     * 价格
      */
     private BigDecimal price;
 
     /**
-     * 订单创建来源类型
+     * 交易方式(预付款、货到付款）
      */
-    private Integer source;
+    private Long trading;
 
     /**
-     * 付款方式(预付款、线下支付、第三方支付）
+     * 提货方式（采方自提、供应配送）
      */
-    private Long payment;
+    private Long pickupType;
 
     /**
      * 开始日期
@@ -62,4 +62,19 @@ public class KwoTradeOrder extends BaseModel {
      */
     private LocalDateTime entTime;
 
+    /**
+     * 已委托量
+     */
+    private BigDecimal entrustAmount;
+
+    /**
+     * 实际交付量
+     */
+    private BigDecimal actualAmount;
+
+    /**
+     * 订单创建来源类型（采购下单/销售代客下单）
+     */
+    private Integer source;
+
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderAddress.java

@@ -2,10 +2,10 @@ package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
 
 /**
  * @desc: 交易订单装卸货地址信息
@@ -15,7 +15,7 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwo_trade_order_address")
 public class KwoTradeOrderAddress extends BaseModel {
 
@@ -84,9 +84,4 @@ public class KwoTradeOrderAddress extends BaseModel {
      */
     private String fence;
 
-    /**
-     * 入场(1刷身份证、2上报车号、3上报户头、4其它)
-     */
-    private Integer entryType;
-
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderContract.java

@@ -0,0 +1,37 @@
+package com.sckw.order.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc: 交易订单合同（采购合同/销售合同）
+ * @author: yzc
+ * @date: 2023-06-25 9:31
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("kwo_trade_order_contract")
+public class KwoTradeOrderContract extends BaseModel {
+
+    /**
+     * 合同id
+     */
+    private Long contractId;
+
+    /**
+     * 订单id（销售订单/采购订单）
+     */
+    private Long orderId;
+
+    /**
+     * 订单编号（销售订单/采购订单）
+     */
+    private String orderNo;
+
+}

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderGoods.java

@@ -2,10 +2,10 @@ package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
 
@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwo_trade_order_goods")
 public class KwoTradeOrderGoods extends BaseModel {
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderSettlement.java

@@ -1,64 +0,0 @@
-package com.sckw.order.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.math.BigDecimal;
-
-/**
- * @desc: 交易订单结算（采购订单/销售订单）
- * @author: yzc
- * @date: 2023-06-25 9:31
- */
-@Getter
-@Setter
-@ToString
-@Builder
-@TableName("kwo_trade_order_settlement")
-public class KwoTradeOrderSettlement extends BaseModel {
-
-    /**
-     * 交易订单id
-     */
-    private Long orderId;
-
-    /**
-     * 订单编号
-     */
-    private String orderNo;
-
-    /**
-     * 数量
-     */
-    private BigDecimal amount;
-
-    /**
-     * 单位（吨、方、件、箱、其他）
-     */
-    private String unit;
-
-    /**
-     * 订单创建来源类型
-     */
-    private Integer source;
-
-    /**
-     * 付款方式(预付款、线下支付、第三方支付）
-     */
-    private Long payment;
-
-    /**
-     * 支付渠道
-     */
-    private Integer paymentChannel;
-
-    /**
-     * 支付价格
-     */
-    private BigDecimal price;
-
-}

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderTrack.java

@@ -6,6 +6,7 @@ import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
 
@@ -17,7 +18,7 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwo_trade_order_track")
 public class KwoTradeOrderTrack extends BaseModel {
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderUnit.java

@@ -6,6 +6,7 @@ import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
 
 /**
  * @desc: 交易订单采购/销售企业信息
@@ -15,7 +16,7 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwo_trade_order_unit")
 public class KwoTradeOrderUnit extends BaseModel {
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderSettlementService.java

@@ -1,20 +0,0 @@
-package com.sckw.order.serivce;
-
-import com.sckw.order.dao.KwoTradeOrderSettlementMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * @desc: 交易订单结算（采购订单/销售订单）service
- * @author: yzc
- * @date: 2023-06-25 14:28
- */
-@Service
-@Slf4j
-@RequiredArgsConstructor
-public class KwoTradeOrderSettlementService {
-
-    private KwoTradeOrderSettlementMapper kwoTradeOrderSettlementMapper;
-
-}

sckw-modules/sckw-product/src/main/java/com/sckw/product/dao/KwpGoodsContractMapper.java

@@ -1,15 +0,0 @@
-package com.sckw.product.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.product.model.KwpGoodsContract;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @desc: 商品-合同mapper
- * @author: yzc
- * @date: 2023-06-25 14:40
- */
-@Mapper
-public interface KwpGoodsContractMapper extends BaseMapper<KwpGoodsContract> {
-
-}

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoods.java

@@ -2,10 +2,10 @@ package com.sckw.product.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
 
@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwp_goods")
 public class KwpGoods extends BaseModel {
 
@@ -26,6 +26,11 @@ public class KwpGoods extends BaseModel {
      */
     private Long entId;
 
+    /**
+     * 供应单位
+     */
+    private Long supplyEntId;
+
     /**
      * 商品编号
      */
@@ -37,9 +42,9 @@ public class KwpGoods extends BaseModel {
     private String name;
 
     /**
-     * 供应单位
+     * 商品类型
      */
-    private Long supplyEntId;
+    private Long typeId;
 
     /**
      * 行业id
@@ -47,14 +52,9 @@ public class KwpGoods extends BaseModel {
     private Long industryId;
 
     /**
-     * 商品类型
-     */
-    private Long typeId;
-
-    /**
-     * 地址信息
+     * 库存数量
      */
-    private Integer addressId;
+    private BigDecimal amount;
 
     /**
      * 单位（吨、方、件、箱、其他）
@@ -64,23 +64,13 @@ public class KwpGoods extends BaseModel {
     /**
      * 尺寸大小
      */
-    private String size;
-
-    /**
-     * 价格
-     */
-    private BigDecimal price;
+    private String spec;
 
     /**
      * 发票税率（%）
      */
     private BigDecimal taxRate;
 
-    /**
-     * 货物数量
-     */
-    private BigDecimal amount;
-
     /**
      * 交易方式(合同采购、直接采购、预付款、货到付款、到款发货）
      */

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoodsAddress.java

@@ -2,10 +2,10 @@ package com.sckw.product.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
 
 /**
  * @desc: 商品地址信息
@@ -15,7 +15,7 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwp_goods_address")
 public class KwpGoodsAddress extends BaseModel {
 
@@ -74,9 +74,4 @@ public class KwpGoodsAddress extends BaseModel {
      */
     private String fence;
 
-    /**
-     * 入场(1刷身份证、2上报车号、3上报户头、4其它)
-     */
-    private Integer entryType;
-
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoodsAttribute.java

@@ -2,10 +2,10 @@ package com.sckw.product.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
 
 /**
  * @desc: 商品-参数类目
@@ -15,7 +15,7 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwp_goods_attribute")
 public class KwpGoodsAttribute extends BaseModel {
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoodsContract.java

@@ -1,32 +0,0 @@
-package com.sckw.product.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-/**
- * @desc: 商品-合同
- * @author: yzc
- * @date: 2023-06-25 9:04
- */
-@Getter
-@Setter
-@ToString
-@Builder
-@TableName("kwp_goods_contract")
-public class KwpGoodsContract extends BaseModel {
-
-    /**
-     * 商品id
-     */
-    private Long goodsId;
-
-    /**
-     * 合同模版
-     */
-    private String contractId;
-
-}

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoodsImage.java

@@ -2,10 +2,10 @@ package com.sckw.product.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
 
 /**
  * @desc: 商品-图片
@@ -15,7 +15,7 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwp_goods_image")
 public class KwpGoodsImage extends BaseModel {
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoodsPriceRange.java

@@ -2,10 +2,10 @@ package com.sckw.product.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
 
@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwp_goods_price_range")
 public class KwpGoodsPriceRange extends BaseModel {
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoodsSku.java

@@ -2,10 +2,10 @@ package com.sckw.product.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
 
 /**
  * @desc: 商品-规格（sku）
@@ -15,7 +15,7 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwp_goods_sku")
 public class KwpGoodsSku extends BaseModel {
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpTransportDemand.java

@@ -2,10 +2,12 @@ package com.sckw.product.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
 
 /**
  * @desc: 运需
@@ -15,9 +17,57 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwp_transport_demand")
 public class KwpTransportDemand extends BaseModel {
 
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 商品名称
+     */
+    private String name;
+
+    /**
+     * 商品分类
+     */
+    private Long typeId;
+
+    /**
+     * 尺寸大小
+     */
+    private String size;
+
+    /**
+     * 单位（吨、方、件、箱、其他）
+     */
+    private String unit;
+
+    /**
+     * 采购方式（线下支付、电子钱包、银联转账、第三方支付）
+     */
+    private Integer paymentChannel;
+
+    /**
+     * 运需单价（元）
+     */
+    private BigDecimal price;
+
+    /**
+     * 运输总量
+     */
+    private BigDecimal totalNum;
+
+    /**
+     * 装货地址id
+     */
+    private Long shippingAddressId;
 
+    /**
+     * 卸货地址id
+     */
+    private Long unloadingAddressId;
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpWantBuy.java

@@ -2,10 +2,12 @@ package com.sckw.product.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
 
 /**
  * @desc: 求购
@@ -15,9 +17,47 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@Builder
+@Accessors(chain = true)
 @TableName("kwp_want_buy")
 public class KwpWantBuy extends BaseModel {
 
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 商品名称
+     */
+    private String name;
+
+    /**
+     * 商品分类
+     */
+    private Long typeId;
+
+    /**
+     * 尺寸大小
+     */
+    private String size;
+
+    /**
+     * 单位（吨、方、件、箱、其他）
+     */
+    private String unit;
+
+    /**
+     * 采购方式（线下支付、电子钱包、银联转账、第三方支付）
+     */
+    private Integer paymentChannel;
+
+    /**
+     * 运需单价（元）
+     */
+    private BigDecimal price;
 
+    /**
+     * 运输总量
+     */
+    private BigDecimal totalNum;
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsContractService.java

@@ -1,21 +0,0 @@
-package com.sckw.product.service;
-
-import com.sckw.product.dao.KwpGoodsContractMapper;
-import com.sckw.product.dao.KwpGoodsMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * @desc: 商品-合同service
- * @author: yzc
- * @date: 2023-06-25 14:47
- */
-@Service
-@Slf4j
-@RequiredArgsConstructor
-public class KwpGoodsContractService {
-
-    private KwpGoodsContractMapper kwpGoodsContractMapper;
-
-}