Merge remote-tracking branch 'origin/dev' into dev

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/LoginFilter.java

@@ -1,12 +1,11 @@
 package com.sckw.core.filter;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.sckw.core.web.config.CustomConfig;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.EncryUtil;
 import com.sckw.core.utils.StringUtils;
+import com.sckw.core.web.config.CustomConfig;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.constant.RequestConstant;
 import com.sckw.core.web.context.LoginUserHolder;
@@ -76,7 +75,8 @@ public class LoginFilter implements Filter {
         //从redis获取用户信息
         String clientType = request.getHeader(RequestConstant.CLIENT_TYPE);
         String systemType = request.getHeader(RequestConstant.SYSTEM_TYPE);
-        Object object = RedissonUtils.getString(Global.getFullUserLoginKey(Integer.parseInt(systemType), Long.parseLong(key), clientType));
+        String userLoginKey = Global.getFullUserLoginKey(Integer.parseInt(systemType), Long.parseLong(key), clientType);
+        Object object = RedissonUtils.getString(userLoginKey);
         if (Objects.isNull(object)) {
             throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.TOKEN_INVAILD);
         }
@@ -93,7 +93,7 @@ public class LoginFilter implements Filter {
             throw new SystemException(HttpStatus.AUTHORITY_NO_CODE, HttpStatus.ACCESS_FIAL);
         }
 
-        RedissonUtils.putString(Global.getFullUserLoginKey(Integer.parseInt(systemType), Long.parseLong(key), clientType), JSON.toJSONString(object), Global.PC_TOKEN_EXPIRE);
+        RedissonUtils.putString(userLoginKey, object.toString(), Global.PC_TOKEN_EXPIRE);
         LoginUserHolder.set(loginUserInfo);
         filterChain.doFilter(servletRequest, servletResponse);
         LoginUserHolder.remove();

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-common/sckw-common-core/src/main/java/com/sckw/core/web/response/HttpResult.java

@@ -38,6 +38,7 @@ public class HttpResult {
 		return r;
 	}
 
+
 	public static HttpResult ok() {
 		return new HttpResult();
 	}
@@ -54,6 +55,13 @@ public class HttpResult {
 		return r;
 	}
 
+    public static HttpResult ok(int code, String msg) {
+        HttpResult r = new HttpResult();
+        r.setCode(code);
+        r.setMsg(msg);
+        return r;
+    }
+
 	public static HttpResult ok(String msg, Object data) {
 		HttpResult r = new HttpResult();
 		r.setMsg(msg);

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/common/StringConstant.java

@@ -21,6 +21,11 @@ public final class StringConstant {
     public static final String G = "G";
     public static final String GB = "GB";
 
+    public static final String ENCODING_UTF_EIGHT = "UTF-8";
+    public static final String ENCODING_UTF_SIXTEEN = "UTF-16";
+    public static final String ENCODING_GBK = "GBK";
+    public static final String ENCODING_ISO = "ISO8859-1";
+
     public StringConstant() {
     }
 }

sckw-common/sckw-common-seata/src/main/java/com/sckw/seata/config/GlobalTransactionalConfig.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
  * @description 全局分布式事务{seata}bean
  * @date 2023/6/15 0015
  */
-//@Component
+@Component
 public class GlobalTransactionalConfig {
     @Bean
     public AspectTransactionalInterceptor aspectTransactionalInterceptor () {

sckw-gateway/pom.xml

@@ -58,4 +58,20 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

sckw-gateway/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,20 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 10.10.10.230:8848
+        # 命名空间
+        namespace: sckw-service-platform-dev
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr: 10.10.10.230:8848
+        # 配置文件格式
+        file-extension: yaml
+        # 命名空间
+        namespace: sckw-service-platform-dev
+        # 共享配置
+        group: sckw-service-platform
+

sckw-gateway/src/main/resources/bootstrap.yml

@@ -9,47 +9,5 @@ spring:
     name: sckw-gateway
   profiles:
     # 环境配置
-    active: sckw-dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 10.10.10.230:8848
-        # 命名空间
-        namespace: sckw_zk
-        # 共享配置
-        group: sckw-service-platform
-      config:
-        # 配置中心地址
-        server-addr: 10.10.10.230:8848
-        # 配置文件格式
-        file-extension: yaml
-        # 命名空间
-        namespace: sckw_zk
-        # 共享配置
-        group: sckw-service-platform
-        # 共享配置
-#        shared-configs:
-#          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-# Spring
+    active: ${DEPLOY_MODE:dev}
 
-dubbo:
-  application:
-    name: gateway-dubbo-server
-    parameters:
-      group: ${spring.cloud.nacos.discovery.group}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-    # 该配置在producer-server中是没有的，但是在consumer这里要配置一下
-    # 如果不配置这个QOS的端口，它会延用dubbo自动生成的端口，在启动的时候，QOS注册就会提示该端口已经被使用的错误
-    # 虽然启动时有打印端口已经被使用的错误，但是依旧可以正常启动服务，并且dubbo也可以正常调用，但是为了解决启动报错还是加上这个端口
-    # 这个也是apache官方给出的解决方案，这个端口不能给-1,它不会自动找到一个可用的端口，给-1会报错，端口1-65535自己选择一个
-    qos-port: 3334
-  protocol:
-    name: dubbo
-    # port为-1表示自动找一个可用的端口
-    port: -1
-  registry:
-    address: nacos://${spring.cloud.nacos.discovery.server-addr}
-    group: ${spring.cloud.nacos.discovery.group}
-    namespace: ${spring.cloud.nacos.discovery.namespace}
-    protocol: nacos

sckw-modules/sckw-file/pom.xml

@@ -100,6 +100,9 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <mainClass>com.sckw.file.FileApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>

sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/FileApiController.java

@@ -80,14 +80,14 @@ public class FileApiController {
 
     /**
      * oss删除文件
-     * @param fileName  kll/uploads/20230621/07ccbec381a011d121a215719199ac49.html
+     * @param fileName  https://kaiwu-saas.oss-cn-chengdu.aliyuncs.com/kll/uploads/20230621/07ccbec381a011d121a215719199ac49.html
      * @return
      */
     @RequestMapping(value = "/remove",method = RequestMethod.GET)
     public HttpResult remove(String fileName) {
         //获取上传文件
         fileService.remove(fileName);
-        return HttpResult.ok();
+        return HttpResult.ok(HttpStatus.SUCCESS_CODE,HttpStatus.SUCCESS_MESSAGE);
     }
 
     /***

sckw-modules/sckw-file/src/main/java/com/sckw/file/model/FileInfo.java

@@ -19,7 +19,6 @@ public class FileInfo extends BaseModel {
 
     private static final long serialVersionUID = 8295075842951977226L;
 
-    private Long id;
     /**
      * 文件存储方式(OSS）
      */
@@ -53,33 +52,4 @@ public class FileInfo extends BaseModel {
      * 文件服务器存储相对路径
      */
     private String filePath;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 状态:0正常/1锁定
-     */
-//    private String status = "0";
-    /**
-     * 创建人
-     */
-//    private String createBy;
-    /**
-     * 创建时间
-     */
-//    private LocalDateTime createTime;
-    /**
-     * 更新人
-     */
-//    private String updateBy;
-    /**
-     * 更新时间
-     */
-//    private LocalDateTime updateTime;
-    /**
-     * 删除标识(0正常/1删除)
-     */
-//    private Integer delFlag = 0;
-
 }

sckw-modules/sckw-file/src/main/java/com/sckw/file/service/FileService.java

@@ -5,6 +5,7 @@ import com.aliyun.oss.model.OSSObject;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
+import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.common.NumberConstant;
 import com.sckw.excel.common.StringConstant;
@@ -17,9 +18,9 @@ import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -47,18 +48,6 @@ import java.util.zip.ZipOutputStream;
 @Service
 public class FileService {
 
-    @Value("${aliyun.oss.endpoint}")
-    private String oss_endpoint;
-
-    @Value("${aliyun.oss.accessKeyId}")
-    private String oss_accessKeyId;
-
-    @Value("${aliyun.oss.secret}")
-    private String oss_accessKeySecret;
-
-    @Value("${aliyun.oss.bucket}")
-    public String oss_bucketName;
-
     @Autowired
     KwsFileInfoDao fileInfoDao;
 
@@ -68,6 +57,7 @@ public class FileService {
      * @param file
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public HttpResult uploadFile(MultipartFile file) {
         HttpResult result = new HttpResult();
         List<Map<String, Object>> resultList = new ArrayList<>();
@@ -78,23 +68,13 @@ public class FileService {
             result.setMsg("上传请不要选择空文件");
             return result;
         }
-        //获取文件类型
-        String contentType = file.getContentType();
-        //获取上传文件的原始文件名
         String oFileName = file.getOriginalFilename();
-        //文件大小
         BigDecimal fileSize = FileUtils.getFileSize(file, StringConstant.KB);
         FileInfo fileInfo = new FileInfo();
         fileInfo.setOriginalName(oFileName);
-        //获取文件后缀
         fileInfo.setFileSuffix(FilenameUtils.getExtension(oFileName));
-        fileInfo.setFileSize(StringUtils.isBlank(fileSize) ? new BigDecimal("0") : fileSize);
+        fileInfo.setFileSize(StringUtils.isBlank(fileSize) ? new BigDecimal(NumberConstant.ZERO) : fileSize);
         Map<String, String> infoMap = FileUtils.uploadFileByInfo(file, FileEnum.DOCUMENT_ADDRESS);
-//        Map<String, String> infoMap=new HashMap<>();
-//        infoMap.put("fileName","fileName");
-//        infoMap.put("fileMd5","fileMd5");
-//        infoMap.put("filePath","filePath");
-//        infoMap.put("fileKey","fileKey");
         fileInfo.setId(new IdWorker(1).nextId());
         fileInfo.setType(FileEnum.FILE_STORE_TYPE_OSS.getFileType());
         fileInfo.setFileName(infoMap.get("fileName"));
@@ -104,12 +84,10 @@ public class FileService {
         fileInfo.setUpdateTime(new Date());
         fileInfo.setStatus(0);
         fileInfo.setDelFlag(0);
-        fileInfo.setCreateBy(1L);
-        fileInfo.setUpdateBy(1L);
+        fileInfo.setCreateBy(LoginUserHolder.getUserId());
+        fileInfo.setUpdateBy(LoginUserHolder.getUserId());
         fileInfoDao.insert(fileInfo);
-        //上传至oss文件地址
         if (StringUtils.isNotBlank(infoMap.get("filePath"))) {
-            result.setCode(HttpStatus.SUCCESS_CODE);
             result.setMsg("上传成功");
             Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
             map.put("fileKey", infoMap.get("fileMd5"));
@@ -137,7 +115,7 @@ public class FileService {
         if (!ObjectUtils.isEmpty(file) && file.length > 0) {
             List<MultipartFile> multipartFiles = Arrays.asList(file);
             for (MultipartFile multipartFile : multipartFiles) {
-                Map<String, Object> map = new HashMap<>();
+                Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
                 //文件大小
                 String fileSize = FileUtils.getFileSize(multipartFile);
                 //文件名称
@@ -184,13 +162,7 @@ public class FileService {
 
 
     public void remove(String fileName) {
-        String str = StringConstant.HTTP_STRING
-                + StringConstant.COLON
-                + StringConstant.LEFT_SEPARATORS
-                + oss_bucketName
-                + StringConstant.POINT
-                + oss_endpoint
-                + StringConstant.LEFT_SEPARATOR;
+        String str = FileUtils.getOSSAddressPrefix();
         String fileNameSubstring = StringUtils.substring(fileName, str.length() + 1);
         FileUtils.remove(fileName);
     }
@@ -232,10 +204,11 @@ public class FileService {
             zos.close();
             String header = request.getHeader("User-Agent").toUpperCase();
             if (header.contains("MSIE") || header.contains("TRIDENT") || header.contains("EDGE")) {
-                momentFileName = URLEncoder.encode(momentFileName, "utf-8");
-                momentFileName = momentFileName.replace("+", "%20");    //IE下载文件名空格变+号问题
+                momentFileName = URLEncoder.encode(momentFileName, StringConstant.ENCODING_UTF_EIGHT);
+                //IE下载文件名空格变+号问题
+                momentFileName = momentFileName.replace("+", "%20");
             } else {
-                momentFileName = new String(momentFileName.getBytes(), "ISO8859-1");
+                momentFileName = new String(momentFileName.getBytes(), StringConstant.ENCODING_ISO);
             }
             response.reset();
             response.setContentType("text/plain");

sckw-modules/sckw-file/src/main/java/com/sckw/file/utils/FileUtils.java

@@ -7,6 +7,7 @@ import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.PasswordUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.excel.common.NumberConstant;
+import com.sckw.excel.common.StringConstant;
 import com.sckw.file.common.enums.AliyunOssFileTypeEnum;
 import com.sckw.file.common.enums.FileEnum;
 import jakarta.annotation.PostConstruct;
@@ -89,6 +90,21 @@ public class FileUtils {
         bucketName = this.oss_bucketName;
     }
 
+    /**
+     * 获取oss 地址前缀
+     * @return
+     */
+    public static String getOSSAddressPrefix() {
+        defalutOSS();
+        return StringConstant.HTTP_STRING
+                + StringConstant.COLON
+                + StringConstant.LEFT_SEPARATORS
+                + bucketName
+                + StringConstant.POINT
+                + endpoint
+                + StringConstant.LEFT_SEPARATOR;
+    }
+
     /**
      * 获取指定文件或文件夹的后缀名
      *
@@ -202,7 +218,7 @@ public class FileUtils {
             ObjectMetadata objectMeta = new ObjectMetadata();
             objectMeta.setContentType(FileUtils.getContentTypeByOSS(file.getOriginalFilename()));
             //调用方法实现上传
-            ossClient.putObject(bucketName, filePath, inputStream,objectMeta);
+            ossClient.putObject(bucketName, filePath, inputStream, objectMeta);
             //上传后的文件地址
 //            String url1 = getUrl(ossClient, bucketName, filePath);
 //            System.out.println(url1);
@@ -321,7 +337,6 @@ public class FileUtils {
     }
 
     /**
-     *
      * @param fileName
      * @param response
      */
@@ -873,6 +888,8 @@ public class FileUtils {
      * 删除文件
      *
      * @param url 示例：'download/file.xsl' oss服务器文件路径以及文件名
+     *            https://kaiwu-saas.oss-cn-chengdu.aliyuncs.com/kll/uploads/20230621/07ccbec381a011d121a215719199ac49.html
+     *            删除时,去掉默认前缀,只需要相对路径 “kll/uploads/20230621/07ccbec381a011d121a215719199ac49.html”
      */
     public static void remove(String url) {
         try {

sckw-modules/sckw-message/src/main/resources/bootstrap-dev.yml

@@ -5,7 +5,7 @@ spring:
         # 服务注册地址
         server-addr: 10.10.10.230:8848
         # 命名空间
-        namespace: sckw_zk
+        namespace: sckw-service-platform-dev
         # 共享配置
         group: sckw-service-platform
       config:
@@ -14,7 +14,7 @@ spring:
         # 配置文件格式
         file-extension: yaml
         # 命名空间
-        namespace: sckw_zk
+        namespace: sckw-service-platform-dev
         # 共享配置
         group: sckw-service-platform
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组

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;
-
-}