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

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

@@ -2,7 +2,6 @@ package com.sckw.core.filter;
 
 import com.sckw.core.exception.SystemException;
 import jakarta.servlet.*;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;

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

@@ -1,24 +1,27 @@
-package com.sckw.core.filter;
-
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-/**
- * @author czh
- * @desc TODO
- * @date 2023/6/14
- */
-@Component
-public class LoginFilterConfig {
-
-
-    @Bean
-    public FilterRegistrationBean registerBusExceptionFilter() {
-        FilterRegistrationBean registration = new FilterRegistrationBean();
-        registration.setFilter(new ExceptionFilterConfig());
-        registration.setName("ExceptionFilter");
-        registration.setOrder(-1);
-        return registration;
-    }
-}
+//package com.sckw.core.filter;
+//
+//import jakarta.annotation.Resource;
+//import org.springframework.boot.web.servlet.FilterRegistrationBean;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.core.annotation.Order;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * @author czh
+// * @desc TODO
+// * @date 2023/6/14
+// */
+//@Component
+//public class LoginFilterConfig {
+//
+//
+//    @Bean
+//    public FilterRegistrationBean registerBusExceptionFilter() {
+//        FilterRegistrationBean registration = new FilterRegistrationBean();
+//        registration.setFilter(new ExceptionFilterConfig());
+//        registration.setName("ExceptionFilter");
+//        registration.setOrder(-1);
+//        return registration;
+//    }
+//}

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/constant/Global.java

@@ -139,6 +139,9 @@ public class Global {
     /**+符号**/
     public static final String PLUS = "+";
 
+    /**#符号**/
+    public static final String POUND = "#";
+
     /**下划线拼接*/
     public static final String BRACKET = "()";
     public static final String BRACKET_LEFT = "(";

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/RemoteSystemService.java

@@ -32,6 +32,15 @@ public interface RemoteSystemService {
      */
     SysDictResDto queryDictByTypeAndValue(String type, String value);
 
+    /**
+     * @param type 字典类型
+     * @return SysDictResDto
+     * @desc: 根据字典类型和key查字典
+     * @author: czh
+     * @date: 2023/7/7
+     */
+    List<SysDictGroupResDto> queryDictGroupByType(String type);
+
     /**
      * @param  type 字典类型，value key
      * @return SysDictGroupResDto
@@ -50,6 +59,24 @@ public interface RemoteSystemService {
      */
     EntCacheResDto queryEntCacheById(Long entId);
 
+    /**
+     * @desc: 从缓存批量查企业信息
+     * @author: yzc
+     * @date: 2023-07-10 8:59
+     * @Param entIds:
+     * @return: java.util.List<com.sckw.system.api.model.dto.res.EntCacheResDto>
+     */
+    List<EntCacheResDto> queryEntCacheByIds(List<Long> entIds);
+
+    /**
+     * @param entName 企业名
+     * @return EntCacheResDto
+     * @desc: 从缓存查企业信息 模糊匹配
+     * @author: czh
+     * @date: 2023/7/7
+     */
+    List<EntCacheResDto> queryEntCacheByName(String entName);
+
     /**
      * @param userId 用户id
      * @return UserCacheResDto

sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwoTradeOrderController.java

@@ -0,0 +1,104 @@
+package com.sckw.order.controller;
+
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.order.model.vo.req.PurchaseOrderParam;
+import com.sckw.order.model.vo.req.UpdateOrderParam;
+import com.sckw.order.model.vo.req.ValetOrderParam;
+import com.sckw.order.serivce.KwoTradeOrderService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @desc: 贸易订单相关
+ * @author: yzc
+ * @date: 2023-07-07 14:10
+ */
+@RestController
+@RequestMapping(value = "/kwoTradeOrder")
+@RequiredArgsConstructor
+public class KwoTradeOrderController {
+
+    private final KwoTradeOrderService kwoTradeOrderService;
+
+    /**
+     * @desc: 采购下单草稿
+     * @author: yzc
+     * @date: 2023-07-07 15:29
+     * @Param purchaseOrderParam:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
+    @PostMapping(value = "/addPurchaseOrderDraft", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult addPurchaseOrderDraft(@RequestBody PurchaseOrderParam purchaseOrderParam) {
+        kwoTradeOrderService.addPurchaseOrderDraft(purchaseOrderParam);
+        return HttpResult.ok("采购下单草稿保存成功");
+    }
+
+    /**
+     * @desc: 代客下单草稿
+     * @author: yzc
+     * @date: 2023-07-07 15:29
+     * @Param valetOrderParam:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
+    @PostMapping(value = "/addValetOrderDraft", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult addValetOrderDraft(@RequestBody ValetOrderParam valetOrderParam) {
+        kwoTradeOrderService.addValetOrderDraft(valetOrderParam);
+        return HttpResult.ok("代客下单草稿保存成功");
+    }
+
+
+    /**
+     * @desc: 采购下单提交
+     * @author: yzc
+     * @date: 2023-07-07 15:29
+     * @Param purchaseOrderParam:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
+    @PostMapping(value = "/addPurchaseOrderSubmit", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult addPurchaseOrderSubmit(@RequestBody @Validated PurchaseOrderParam purchaseOrderParam) {
+        kwoTradeOrderService.addPurchaseOrderSubmit(purchaseOrderParam);
+        return HttpResult.ok("采购下单提交成功");
+    }
+
+
+    /**
+     * @desc: 代客下单提交
+     * @author: yzc
+     * @date: 2023-07-07 15:30
+     * @Param valetOrderParam:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
+    @PostMapping(value = "/addValetOrderSubmit", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult addValetOrderSubmit(@RequestBody @Validated ValetOrderParam valetOrderParam) {
+        kwoTradeOrderService.addValetOrderSubmit(valetOrderParam);
+        return HttpResult.ok("代客下单提交成功");
+    }
+
+    /**
+     * @desc: 订单详情
+     * @author: yzc
+     * @date: 2023-07-07 15:30
+     * @Param id:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
+    @GetMapping("/detail")
+    public HttpResult detail(@RequestParam Long id) {
+        return HttpResult.ok(kwoTradeOrderService.detail(id));
+    }
+
+    /**
+     * @desc: 修改订单
+     * @author: yzc
+     * @date: 2023-07-07 15:34
+     * @Param updateOrderParam:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
+    @PostMapping(value = "/update", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult update(@RequestBody @Validated UpdateOrderParam updateOrderParam) {
+        kwoTradeOrderService.update(updateOrderParam);
+        return HttpResult.ok("修改成功");
+    }
+
+}

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/AddressInfo.java

@@ -0,0 +1,83 @@
+package com.sckw.order.model.vo.req;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @desc: 地址信息
+ * @author: yzc
+ * @date: 2023-07-07 14:27
+ */
+@Getter
+@Setter
+@ToString
+public class AddressInfo {
+
+    /**
+     * 地址类型（1装货地址、2卸货地址）
+     */
+    @NotNull(message = "地址类型不能为空")
+    private Integer addressType;
+
+    /**
+     * 地址名称
+     */
+    @NotBlank(message = "地址名称不能为空")
+    private String name;
+
+    /**
+     * 地址类型
+     */
+    @NotNull(message = "地址类型不能为空")
+    private Long type;
+
+    /**
+     * 联系人姓名
+     */
+    @NotBlank(message = "联系人姓名不能为空")
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    @NotBlank(message = "联系电话不能为空")
+    private String phone;
+
+    /**
+     * 所在地区
+     */
+    @NotNull(message = "所在地区code不能为空")
+    private Integer cityCode;
+
+    /**
+     * 所属区域名称
+     */
+    @NotBlank(message = "所属区域名称不能为空")
+    private String cityName;
+
+    /**
+     * 详细地址
+     */
+    @NotBlank(message = "详细地址不能为空")
+    private String detailAddress;
+
+    /**
+     * 纬度
+     */
+    @NotBlank(message = "纬度不能为空")
+    private String lat;
+
+    /**
+     * 经度
+     */
+    @NotBlank(message = "经度不能为空")
+    private String lng;
+
+    /**
+     * 电子围栏
+     */
+    private String fence;
+}

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/PurchaseOrderParam.java

@@ -0,0 +1,96 @@
+package com.sckw.order.model.vo.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @desc: 采购订单请求参数
+ * @author: yzc
+ * @date: 2023-07-07 14:19
+ */
+@Getter
+@Setter
+@ToString
+public class PurchaseOrderParam {
+
+    /**
+     * 商品id
+     */
+    @NotNull(message = "商品id不能为空")
+    private Long goodsId;
+    /**
+     * 单位（吨、方、箱、件）
+     */
+    @NotBlank(message = "单位不能为空")
+    private String unit;
+    /**
+     * 价格段id
+     */
+    @NotNull(message = "价格段id不能为空")
+    private Long priceRangeId;
+    /**
+     * 商品skuId
+     */
+    private Long skuId;
+    /**
+     * 订单总量
+     */
+    @NotNull(message = "订单总量不能为空")
+    private BigDecimal amount;
+    /**
+     * 商品单价
+     */
+    @NotNull(message = "商品单价不能为空")
+    private BigDecimal price;
+    /**
+     * 交易方式(预付款、货到付款）
+     */
+    @NotNull(message = "交易方式不能为空")
+    private Long trading;
+    /**
+     * 单位信息
+     */
+    @NotEmpty(message = "单位信息不能为空")
+    @Size(min = 2,max = 2,message = "单位信息只能有两条")
+    @Valid
+    private List<UnitInfo> unitInfo;
+    /**
+     * 地址信息
+     */
+    @NotEmpty(message = "地址信息不能为空")
+    @Size(min = 2,max = 2,message = "地址信息只能有两条")
+    @Valid
+    private List<AddressInfo> addressInfo;
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @NotNull(message = "开始时间不能为空")
+    private LocalDate startTime;
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @NotNull(message = "结束时间不能为空")
+    private LocalDate endTime;
+    /**
+     * 提货方式（采方自提、供应配送）
+     */
+    @NotNull(message = "提货方式不能为空")
+    private Long pickupType;
+    /**
+     * 备注
+     */
+    private String remark;
+}

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/UnitInfo.java

@@ -0,0 +1,48 @@
+package com.sckw.order.model.vo.req;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @desc: 单位信息
+ * @author: yzc
+ * @date: 2023-07-07 14:27
+ */
+@Getter
+@Setter
+@ToString
+public class UnitInfo {
+
+    /**
+     * 单位类型（1销售单位、2采购单位）
+     */
+    @NotNull(message = "单位类型不能为空")
+    private Integer unitType;
+
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Long entId;
+
+    /**
+     * 企业名称
+     */
+    @NotBlank(message = "企业名称不能为空")
+    private String firmName;
+
+    /**
+     * 联系人姓名
+     */
+    @NotBlank(message = "联系人姓名不能为空")
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    @NotBlank(message = "联系电话不能为空")
+    private String phone;
+}

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/UpdateOrderParam.java

@@ -0,0 +1,18 @@
+package com.sckw.order.model.vo.req;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @desc: 修改订单请求参数
+ * @author: yzc
+ * @date: 2023-07-07 15:33
+ */
+@Getter
+@Setter
+@ToString
+public class UpdateOrderParam {
+
+
+}

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/ValetOrderParam.java

@@ -0,0 +1,27 @@
+package com.sckw.order.model.vo.req;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @desc: 代客下单请求参数
+ * @author: yzc
+ * @date: 2023-07-07 14:19
+ */
+@Getter
+@Setter
+@ToString
+public class ValetOrderParam extends PurchaseOrderParam {
+
+    @NotNull(message = "交付类型不能为空")
+    private Long deliveryType;
+
+    @NotNull(message = "合同id不能为空")
+    private Long contractId;
+
+    @NotNull(message = "合同编号不能为空")
+    private String contractNo;
+
+}

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/OrderDetail.java

@@ -0,0 +1,87 @@
+package com.sckw.order.model.vo.res;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * @desc: 订单详情
+ * @author: yzc
+ * @date: 2023-07-07 15:35
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class OrderDetail {
+
+    /**
+     * 订单id
+     */
+    private Long id;
+
+    /**
+     * 订单编号
+     */
+    private String tOrderNo;
+
+    /**
+     * 订单总量
+     */
+    private BigDecimal amount;
+
+    /**
+     * 单位（吨、方、件、箱、其他）
+     */
+    private String unit;
+
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 交易方式(预付款、货到付款）
+     */
+    private Long trading;
+
+    /**
+     * 提货方式（采方自提、供应配送）
+     */
+    private Long pickupType;
+
+    /**
+     * 交付类型（签发交付、签收交付）
+     */
+    private Long deliveryType;
+
+    /**
+     * 开始日期
+     */
+    private LocalDate startTime;
+
+    /**
+     * 结束日期
+     */
+    private LocalDate endTime;
+
+    /**
+     * 已委托量
+     */
+    private BigDecimal entrustAmount;
+
+    /**
+     * 实际交付量
+     */
+    private BigDecimal actualAmount;
+
+    /**
+     * 订单创建来源类型（采购下单/销售代客下单）
+     */
+    private Integer source;
+
+}

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class KwoProjectOrderService {
 
-    private KwoProjectOrderMapper kwoProjectOrderMapper;
+    private final KwoProjectOrderMapper kwoProjectOrderMapper;
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class KwoTradeOrderAddressService {
 
-    private KwoTradeOrderAddressMapper kwoTradeOrderAddressMapper;
+    private final KwoTradeOrderAddressMapper kwoTradeOrderAddressMapper;
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class KwoTradeOrderGoodsService {
 
-    private KwoTradeOrderGoodsMapper kwoTradeOrderGoodsMapper;
+    private final KwoTradeOrderGoodsMapper kwoTradeOrderGoodsMapper;
 
 }

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

@@ -1,6 +1,10 @@
 package com.sckw.order.serivce;
 
 import com.sckw.order.dao.KwoTradeOrderMapper;
+import com.sckw.order.model.vo.req.PurchaseOrderParam;
+import com.sckw.order.model.vo.req.UpdateOrderParam;
+import com.sckw.order.model.vo.req.ValetOrderParam;
+import com.sckw.order.model.vo.res.OrderDetail;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -15,6 +19,71 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class KwoTradeOrderService {
 
-    private KwoTradeOrderMapper kwoTradeOrderMapper;
+    private final KwoTradeOrderMapper kwoTradeOrderMapper;
 
+    /**
+     * @desc: 采购下单草稿
+     * @author: yzc
+     * @date: 2023-07-07 15:31
+     * @Param purchaseOrderParam:
+     * @return: void
+     */
+    public void addPurchaseOrderDraft(PurchaseOrderParam purchaseOrderParam) {
+
+    }
+
+    /**
+     * @desc: 代客下单草稿
+     * @author: yzc
+     * @date: 2023-07-07 15:31
+     * @Param valetOrderParam:
+     * @return: void
+     */
+    public void addValetOrderDraft(ValetOrderParam valetOrderParam) {
+
+    }
+
+    /**
+     * @desc: 采购下单提交
+     * @author: yzc
+     * @date: 2023-07-07 15:31
+     * @Param purchaseOrderParam:
+     * @return: void
+     */
+    public void addPurchaseOrderSubmit(PurchaseOrderParam purchaseOrderParam) {
+
+    }
+
+    /**
+     * @desc: 代客下单提交
+     * @author: yzc
+     * @date: 2023-07-07 15:32
+     * @Param valetOrderParam:
+     * @return: void
+     */
+    public void addValetOrderSubmit(ValetOrderParam valetOrderParam) {
+
+    }
+
+    /**
+     * @desc: 订单详情
+     * @author: yzc
+     * @date: 2023-07-07 15:32
+     * @Param id:
+     * @return: com.sckw.order.model.vo.res.OrderDetail
+     */
+    public OrderDetail detail(Long id) {
+        return null;
+    }
+
+    /**
+     * @desc: 修改订单
+     * @author: yzc
+     * @date: 2023-07-07 15:34
+     * @Param updateOrderParam:
+     * @return: void
+     */
+    public void update(UpdateOrderParam updateOrderParam) {
+
+    }
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class KwoTradeOrderTrackService {
 
-    private KwoTradeOrderTrackMapper kwoTradeOrderTrackMapper;
+    private final KwoTradeOrderTrackMapper kwoTradeOrderTrackMapper;
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class KwoTradeOrderUnitService {
 
-    private KwoTradeOrderUnitMapper kwoTradeOrderUnitMapper;
+    private final KwoTradeOrderUnitMapper kwoTradeOrderUnitMapper;
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class KwpTransportDemandService {
 
-    private KwpTransportDemandMapper kwpTransportDemandMapper;
+    private final KwpTransportDemandMapper kwpTransportDemandMapper;
 
 }

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

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class KwpWantBuyService {
 
-    private KwpWantBuyMapper kwpWantBuyMapper;
+    private final KwpWantBuyMapper kwpWantBuyMapper;
 
 
 }

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

@@ -48,11 +48,6 @@ public class KwpGoods extends BaseModel {
      */
     private Long typeId;
 
-    /**
-     * 行业id
-     */
-    private Long industryId;
-
     /**
      * 库存数量
      */
@@ -76,7 +71,7 @@ public class KwpGoods extends BaseModel {
     /**
      * 交易方式(合同采购、直接采购、预付款、货到付款、到款发货）
      */
-    private Long trading;
+    private String trading;
 
     /**
      * 预付款最低限额

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

@@ -32,7 +32,7 @@ public class KwpGoodsAddress extends BaseModel {
     /**
      * 地址类型
      */
-    private Long type;
+    private String type;
 
     /**
      * 联系人姓名

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddGoodsParam.java

@@ -68,7 +68,7 @@ public class AddGoodsParam {
      * 交易方式(合同采购、直接采购、预付款、货到付款、到款发货）
      */
     @NotNull(message = "交易方式不能为空")
-    private Long trading;
+    private String trading;
 
     /**
      * 预付款最低限额(万元)

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddressInfo.java

@@ -26,7 +26,7 @@ public class AddressInfo {
      * 地址类型
      */
     @NotNull(message = "地址类型不能为空")
-    private Long type;
+    private String type;
 
     /**
      * 联系人

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/BuildingMaterialsMarketListParam.java

@@ -50,6 +50,6 @@ public class BuildingMaterialsMarketListParam extends PageRequest {
     /**
      * 交易方式(预付款、货到付款、线下付款）
      */
-    private List<Long> tradings;
+    private List<String> tradings;
 
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/GoodsListParam.java

@@ -48,7 +48,7 @@ public class GoodsListParam {
     /**
      * 交易方式集合
      */
-    private List<Long> tradings;
+    private List<String> tradings;
 
 
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/SelectGoodsListParam.java

@@ -49,7 +49,7 @@ public class SelectGoodsListParam extends PageRequest {
     /**
      * 交易方式集合
      */
-    private List<Long> tradings;
+    private List<String> tradings;
 
 
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/UpdateGoodsParam.java

@@ -70,7 +70,7 @@ public class UpdateGoodsParam {
     /**
      * 交易方式(合同采购、直接采购、预付款、货到付款、到款发货）
      */
-    private Long trading;
+    private String trading;
 
     /**
      * 预付款最低限额(万元)

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

@@ -21,8 +21,11 @@ import com.sckw.product.model.vo.res.BuildingMaterialsMarketList;
 import com.sckw.product.model.vo.res.GoodsDetail;
 import com.sckw.product.model.vo.res.GoodsDropList;
 import com.sckw.product.model.vo.res.GoodsList;
+import com.sckw.system.api.RemoteSystemService;
+import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -40,12 +43,16 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class KwpGoodsService {
 
+    @DubboReference(version = "2.0.0", group = "design", check = false)
+    private RemoteSystemService remoteSystemService;
+
     private final KwpGoodsMapper kwpGoodsMapper;
     private final KwpGoodsAddressService kwpGoodsAddressService;
     private final KwpGoodsAttributeService kwpGoodsAttributeService;
     private final KwpGoodsImageService kwpGoodsImageService;
     private final KwpGoodsPriceRangeService kwpGoodsPriceRangeService;
 
+
     /**
      * @desc: 添加草稿商品
      * @author: yzc
@@ -474,8 +481,7 @@ public class KwpGoodsService {
         LambdaQueryWrapper<KwpGoods> wrapper = new LambdaQueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(params.getKeywords()), KwpGoods::getName, params.getKeywords())
                 .in(CollectionUtils.isNotEmpty(typeIds), KwpGoods::getTypeId, typeIds)
-                .in(CollectionUtils.isNotEmpty(params.getIndustryIds()), KwpGoods::getIndustryId, params.getIndustryIds())
-                .in(CollectionUtils.isNotEmpty(params.getTradings()), KwpGoods::getTypeId, params.getTradings())
+                .in(CollectionUtils.isNotEmpty(params.getTradings()), KwpGoods::getTrading, params.getTradings())
                 .eq(KwpGoods::getStatus, GoodsStatusEnum.PUT_ON_SHELVES.getCode()).eq(KwpGoods::getDelFlag, Global.NO);
         List<KwpGoods> list = kwpGoodsMapper.selectList(wrapper);
         List<BuildingMaterialsMarketList> result = BeanUtils.copyToList(list, BuildingMaterialsMarketList.class);
@@ -499,10 +505,13 @@ public class KwpGoodsService {
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
+        List<Long> supplyEntIds = list.stream().map(KwpGoods::getSupplyEntId).distinct().toList();
+        List<EntCacheResDto> entList = remoteSystemService.queryEntCacheByIds(supplyEntIds);
+        Map<Long, String> entMap = entList.stream().collect(Collectors.toMap(EntCacheResDto::getId, EntCacheResDto::getFirmName, (k1, k2) -> k1));
         List<GoodsDropList> result = new ArrayList<>();
         list.forEach(e -> {
             GoodsDropList goodsDropList = BeanUtils.copyProperties(e, GoodsDropList.class);
-            goodsDropList.setSupplyEnt("供应企业");
+            goodsDropList.setSupplyEnt(entMap.get(e.getSupplyEntId()));
             result.add(goodsDropList);
         });
         return result;

sckw-modules/sckw-product/src/main/resources/bootstrap-local.yml

@@ -0,0 +1,32 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+#        server-addr: 47.108.162.14:8848
+        server-addr: 10.10.10.178:8848
+        # 命名空间
+        namespace: sckw-service-platform-dev
+        # nacos用户名
+        username: nacos
+        # nacos密码
+        password: nacos
+        # 共享配置
+        group: sckw-service-platform
+        # 权重 1-100 数值越大权重越大分配的流量就越大，通常结合权重负载均衡策略
+      #        weight: 100
+      config:
+        # 配置中心地址
+#        server-addr: 47.108.162.14:8848
+        server-addr: 10.10.10.178:8848
+        # 配置文件格式
+        file-extension: yaml
+        # 命名空间
+        namespace: sckw-service-platform-dev
+        # 共享配置
+        group: sckw-service-platform
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsEnterpriseDao.java

@@ -105,4 +105,13 @@ public interface KwsEnterpriseDao {
      * @date: 2023/6/29
      */
     FindManagePojo findManageInfoByEntIdBeforeApproval(Long entId);
+
+    /**
+     * @param entName 企业名
+     * @return KwsEnterprise
+     * @desc: 模糊匹配企业名
+     * @author: czh
+     * @date: 2023/7/10
+     */
+    List<KwsEnterprise> queryEntByName(String entName);
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteBaseService.java

@@ -106,4 +106,8 @@ public class RemoteBaseService {
         }
         return BeanUtils.copyToList(list, DeptInfoPojo.class);
     }
+
+    public List<KwsEnterprise> queryEntByName(String entName) {
+        return kwsEnterpriseService.queryEntByName(entName);
+    }
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -9,7 +9,9 @@ import com.sckw.core.utils.StringUtils;
 import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.*;
+import com.sckw.system.api.model.pojo.DeptInfoPojo;
 import com.sckw.system.dao.SysDictDao;
+import com.sckw.system.model.KwsEnterprise;
 import com.sckw.system.model.KwsUser;
 import com.sckw.system.model.SysDict;
 import com.sckw.system.service.KwsUserService;
@@ -71,7 +73,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
      */
     @Override
     public SysDictResDto queryDictByTypeAndValue(String type, String value) {
-        String key = Global.REDIS_SYS_DICT_PREFIX + type + "#" + value;
+        String key = Global.REDIS_SYS_DICT_PREFIX + type + Global.POUND + value;
         String dictCache = RedissonUtils.getString(key);
         //从redis查，查不到从数据库查，并写入redis
         if (StringUtils.isBlank(dictCache)) {
@@ -87,6 +89,37 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         return JSONObject.parseObject(dictCache, SysDictResDto.class);
     }
 
+    /**
+     * @param type 字典类型
+     * @return SysDictResDto
+     * @desc: 根据字典类型和key查字典
+     * @author: czh
+     * @date: 2023/7/7
+     */
+    @Override
+    public List<SysDictGroupResDto> queryDictGroupByType(String type) {
+        List<SysDict> sysDicts = sysDictDao.queryByType(type);
+        if (CollectionUtils.isEmpty(sysDicts)) {
+            return Collections.emptyList();
+        }
+
+        //取最顶层去递归
+        List<SysDictGroupResDto> list = new ArrayList<>();
+        sysDicts = sysDicts.stream().filter(item -> item.getParentId().equals(String.valueOf(Global.NO))).toList();
+        if (CollectionUtils.isEmpty(sysDicts)) {
+            return Collections.emptyList();
+        }
+
+        sysDicts.forEach(item -> {
+            SysDictGroupResDto sysDictGroupResDto = queryDictGroupByTypeAndValue(type, item.getValue());
+            if (!Objects.isNull(sysDictGroupResDto)) {
+                list.add(sysDictGroupResDto);
+            }
+        });
+
+        return list;
+    }
+
     /**
      * @param  type 字典类型，value key
      * @return SysDictGroupResDto
@@ -96,7 +129,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
      */
     @Override
     public SysDictGroupResDto queryDictGroupByTypeAndValue(String type, String value) {
-        String key = Global.REDIS_SYS_DICT_GROUP_PREFIX + type + "#" + value;
+        String key = Global.REDIS_SYS_DICT_GROUP_PREFIX + type + Global.POUND + value;
         String dictCache = RedissonUtils.getString(key);
         //从redis查，查不到从数据库查，并写入redis
         if (StringUtils.isBlank(dictCache)) {
@@ -148,6 +181,45 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         return JSONObject.parseObject(dictCache, EntCacheResDto.class);
     }
 
+    /**
+     * @param entName 企业名
+     * @return EntCacheResDto
+     * @desc: 从缓存查企业信息 模糊匹配
+     * @author: czh
+     * @date: 2023/7/7
+     */
+    @Override
+    public List<EntCacheResDto> queryEntCacheByName(String entName) {
+        List<KwsEnterprise> kwsEnterprises = remoteBaseService.queryEntByName(entName);
+        if (CollectionUtils.isEmpty(kwsEnterprises)) {
+            return Collections.emptyList();
+        }
+
+        List<EntCacheResDto> list = new ArrayList();
+        for (KwsEnterprise kwsEnterprise : kwsEnterprises) {
+            EntCacheResDto entCacheResDto = queryEntCacheById(kwsEnterprise.getId());
+            if (!Objects.isNull(entCacheResDto)) {
+                list.add(entCacheResDto);
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public List<EntCacheResDto> queryEntCacheByIds(List<Long> entIds) {
+        if (CollectionUtils.isEmpty(entIds)) {
+            return Collections.emptyList();
+        }
+        List<EntCacheResDto> list = new ArrayList<>();
+        entIds.forEach(entId -> {
+            EntCacheResDto entCacheResDto = queryEntCacheById(entId);
+            if (Objects.nonNull(entCacheResDto)) {
+                list.add(entCacheResDto);
+            }
+        });
+        return list;
+    }
+
     @Override
     public UserCacheResDto queryUserCacheById(Long userId) {
         String key = Global.REDIS_USER_PREFIX + userId;
@@ -164,12 +236,32 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             userCacheResDto.setRoleInfo(remoteBaseService.queryRoleInfoByUserId(userId));
 
             List<KwsUserDeptResDto> kwsUserDeptResDtos = remoteBaseService.queryUserDeptByUserId(userId);
-            if (!CollectionUtils.isEmpty(kwsUserDeptResDtos)) {
+            if (CollectionUtils.isEmpty(kwsUserDeptResDtos)) {
+                return userCacheResDto;
+            }
+
+            List<Long> deptIds = kwsUserDeptResDtos.stream().map(KwsUserDeptResDto::getDeptId).toList();
+            List<KwsDeptResDto> kwsDeptResDtos = remoteBaseService.queryDeptByIds(deptIds);
+            if (CollectionUtils.isEmpty(kwsDeptResDtos)) {
+                return userCacheResDto;
+            }
+
+            Long entId = kwsDeptResDtos.get(0).getEntId();
+            KwsEnterpriseResDto kwsEnterpriseResDto = remoteBaseService.queryEnterpriseById(entId);
+            if (Objects.isNull(kwsEnterpriseResDto)) {
+                return userCacheResDto;
             }
 
+            EntCacheResDto entCacheResDto = new EntCacheResDto();
+            BeanUtils.copyProperties(kwsEnterpriseResDto, entCacheResDto);
+            entCacheResDto.setDeptInfo(BeanUtils.copyToList(kwsDeptResDtos, DeptInfoPojo.class));
+            entCacheResDto.setCertificateInfo(remoteBaseService.queryCertificateByEntId(entId));
+            userCacheResDto.setEntInfo(entCacheResDto);
+            RedissonUtils.putString(key, JSON.toJSONString(userCacheResDto), Global.COMMON_EXPIRE);
+            return userCacheResDto;
         }
 
-        return null;
+        return JSONObject.parseObject(dictCache, UserCacheResDto.class);
     }
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -545,4 +545,15 @@ public class KwsEnterpriseService {
             kwsEnterpriseDao.update(kwsEnterprise);
         }
     }
+
+    /**
+     * @param entName 企业名
+     * @return KwsEnterprise
+     * @desc: 模糊匹配企业名
+     * @author: czh
+     * @date: 2023/7/10
+     */
+    public List<KwsEnterprise> queryEntByName(String entName) {
+        return kwsEnterpriseDao.queryEntByName(entName);
+    }
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -73,17 +73,17 @@ public class KwsMenuService {
         }
 
         //新增菜单时，如果已经有同级菜单，则序号为最大的序号+1
-        if (params.getType() == MenuTypeEnum.DIRECTORY.getCode()) {
-            KwsMenu kwsMenuParam = new KwsMenu();
-            kwsMenuParam.setType(params.getType());
-            kwsMenuParam.setParentId(params.getParentId());
-            List<KwsMenu> select = kwsMenuDao.select(kwsMenuParam);
-            int sort = 1;
-            if (!CollectionUtils.isEmpty(select)) {
-                sort = select.get(select.size() - 1).getSort() + 1;
-            }
-            params.setSort(sort);
-        }
+//        if (params.getType() == MenuTypeEnum.DIRECTORY.getCode()) {
+//            KwsMenu kwsMenuParam = new KwsMenu();
+//            kwsMenuParam.setType(params.getType());
+//            kwsMenuParam.setParentId(params.getParentId());
+//            List<KwsMenu> select = kwsMenuDao.select(kwsMenuParam);
+//            int sort = 1;
+//            if (!CollectionUtils.isEmpty(select)) {
+//                sort = select.get(select.size() - 1).getSort() + 1;
+//            }
+//            params.setSort(sort);
+//        }
 
         if (kwsMenuDao.insert(params) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
@@ -326,24 +326,24 @@ public class KwsMenuService {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.MENU_NOT_EXISTS);
         }
 
-        //查出要被换位置的按钮
-        KwsMenu targetMenu = getTargetMenu(reqVo.getMoveType(), kwsMenu);
-
-        //修改要换位置的按钮
+//        //查出要被换位置的按钮
+//        KwsMenu targetMenu = getTargetMenu(reqVo.getMoveType(), kwsMenu);
+//
+//        //修改要换位置的按钮
         kwsMenu.setSort(kwsMenu.getSort() + reqVo.getMoveType());
         if (kwsMenuDao.update(kwsMenu) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
-
-        if (Objects.isNull(targetMenu)) {
-            return;
-        }
-
-        //更新被换位置的按钮
-        targetMenu.setSort(targetMenu.getSort() - reqVo.getMoveType());
-        if (kwsMenuDao.update(targetMenu) <= 0) {
-            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
-        }
+//
+//        if (Objects.isNull(targetMenu)) {
+//            return;
+//        }
+//
+//        //更新被换位置的按钮
+//        targetMenu.setSort(targetMenu.getSort() - reqVo.getMoveType());
+//        if (kwsMenuDao.update(targetMenu) <= 0) {
+//            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
+//        }
     }
 
 

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -161,6 +161,10 @@
       and f.name = '系统管理员'
   </select>
 
+  <select id="queryEntByName" resultType="com.sckw.system.model.KwsEnterprise">
+    select * from kws_enterprise where firm_name like concat('%', #{entName}, '%') and del_flag = 0
+  </select>
+
   <insert id="insert" parameterType="com.sckw.system.model.KwsEnterprise">
     insert into kws_enterprise
     <trim prefix="(" suffix=")" suffixOverrides=",">

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/AcceptCarriageOrderController.java

@@ -1,9 +1,14 @@
 package com.sckw.transport.controller;
 
+import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.excel.easyexcel.RequestHolder;
+import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
+import com.sckw.transport.model.vo.ConsignOrderVo;
 import com.sckw.transport.service.AcceptCarriageOrderService;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @author lfdc
  * @description 承运订单controller
@@ -30,7 +37,7 @@ public class AcceptCarriageOrderController {
      * @param query 查询参数
      * @return
      */
-    @RequestMapping(value = "/kwtList", method = RequestMethod.GET)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
     public HttpResult acceptCarriageOrderList(AcceptCarriageOrderQuery query) {
         try {
             return acceptCarriageOrderService.list(query);
@@ -44,7 +51,7 @@ public class AcceptCarriageOrderController {
      * 承运订单首页统计查询
      * @return
      */
-    @RequestMapping(value = "/kwtCount", method = RequestMethod.GET)
+    @RequestMapping(value = "/statistics", method = RequestMethod.GET)
     public HttpResult acceptCarriageOrderCount(AcceptCarriageOrderQuery query) {
         try {
             return acceptCarriageOrderService.count(query);
@@ -55,11 +62,27 @@ public class AcceptCarriageOrderController {
     }
 
     /**
-     * 承运订单-分包托运
+     * 承运订单导出
+     * @param query
+     * @return
+     */
+    @RequestMapping(value = "/export", method = RequestMethod.GET)
+    public HttpResult export(AcceptCarriageOrderQuery query) {
+        HttpServletResponse response = RequestHolder.getResponse();
+        List list = acceptCarriageOrderService.export(query);
+        if (CollectionUtils.isNotEmpty(list)){
+            ExcelUtil.download(response, ConsignOrderVo.class, list);
+            return HttpResult.ok();
+        }
+        return HttpResult.error("没有可导出的数据");
+    }
+
+    /**
+     * 承运订单-分包托运s
      * @param query 查询参数
      * @return
      */
-    @RequestMapping(value = "/kwtSubcontractConsignment", method = RequestMethod.POST)
+    @RequestMapping(value = "/subcontractConsignment", method = RequestMethod.POST)
     public HttpResult subcontractConsignment(AcceptCarriageOrderQuery query) {
         try {
             return acceptCarriageOrderService.subcontractConsignment(query);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -56,4 +56,8 @@ public class AcceptCarriageOrderService {
     public HttpResult subcontractConsignment(AcceptCarriageOrderQuery query) {
         return null;
     }
+
+    public List export(AcceptCarriageOrderQuery query) {
+        return null;
+    }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ConsignOrderService.java

@@ -1,14 +1,9 @@
 package com.sckw.transport.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.sckw.core.common.enums.NumberConstant;
-import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.dao.KwtLogisticsOrderAddressMapper;
 import com.sckw.transport.dao.KwtLogisticsOrderMapper;
 import com.sckw.transport.dao.KwtLogisticsOrderUnitMapper;
-import com.sckw.transport.model.KwtLogisticsOrder;
-import com.sckw.transport.model.KwtLogisticsOrderUnit;
 import com.sckw.transport.model.param.ConsignOrderQuery;
 import com.sckw.transport.model.vo.ConsignOrderVo;
 import lombok.extern.slf4j.Slf4j;
@@ -17,7 +12,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author lfdc
@@ -39,14 +33,14 @@ public class ConsignOrderService {
     public KwtLogisticsOrderUnitMapper kwtLogisticsOrderUnitMapper;
 
     public HttpResult list(ConsignOrderQuery query) {
-        ConsignOrderVo consignOrderVo = new ConsignOrderVo();
-        LambdaQueryWrapper<KwtLogisticsOrder> wrapper = new LambdaQueryWrapper<>();
-//        kwtLogisticsOrderRepository.page(new Page<>(query.getPage(), query.getPageSize()),
-//                wrapper.like(StringUtils.isNotBlank(query.getKeywords()),KwtLogisticsOrder::getLOrderNo,query.getKeywords())
-//                        .like(StringUtils.isNotBlank(query.getKeywords()),KwtLogisticsOrder::getc))
-        List<KwtLogisticsOrder> kwtLogisticsOrders = kwtLogisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>().like(StringUtils.isNotBlank(query.getKeywords()), KwtLogisticsOrder::getLOrderNo, query.getKeywords()));
-        List<Long> ids = kwtLogisticsOrders.stream().map(KwtLogisticsOrder::getId).collect(Collectors.toList());
-        List<KwtLogisticsOrderUnit> list = kwtLogisticsOrderUnitMapper.selectCompanyBylOrderId(ids, NumberConstant.ONE);
+//        ConsignOrderVo consignOrderVo = new ConsignOrderVo();
+//        LambdaQueryWrapper<KwtLogisticsOrder> wrapper = new LambdaQueryWrapper<>();
+////        kwtLogisticsOrderMapper.selectPage(new Page<>(query.getPage(), query.getPageSize()),
+////                wrapper.like(StringUtils.isNotBlank(query.getKeywords()),KwtLogisticsOrder::getLOrderNo,query.getKeywords())
+////                        .like(StringUtils.isNotBlank(query.getKeywords()),KwtLogisticsOrder::getc))
+//        List<KwtLogisticsOrder> kwtLogisticsOrders = kwtLogisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>().like(StringUtils.isNotBlank(query.getKeywords()), KwtLogisticsOrder::getLOrderNo, query.getKeywords()));
+//        List<Long> ids = kwtLogisticsOrders.stream().map(KwtLogisticsOrder::getId).collect(Collectors.toList());
+//        List<KwtLogisticsOrderUnit> list = kwtLogisticsOrderUnitMapper.selectCompanyBylOrderId(ids, NumberConstant.ONE);
         return null;
     }
 

sckw-modules/sckw-transport/src/main/resources/bootstrap-local.yml

@@ -112,36 +112,36 @@ spring:
 #      namespace: ${sfs.nacos.namespace}
 #      group: ${sfs.nacos.group}
 
-seata:
-  # seata 服务分组，要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
-  # 事务分组名称，要和服务端对应
-  tx-service-group: file-seata-service-group
-  service:
-    vgroup-mapping:
-      # key是事务分组名称 value要和服务端的机房名称保持一致
-      file-seata-service-group: default
-  registry:
-    # 指定nacos作为注册中心
-    type: nacos
-    nacos:
-      server-addr: ${spring.cloud.nacos.discovery.server-addr}
-      #server-addr: 47.108.162.14:8848
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-      #      group: SEATA_GROUP
-      group: ${spring.cloud.nacos.discovery.group}
-  config:
-    # 指定nacos作为配置中心
-    type: nacos
-    nacos:
-      server-addr: ${spring.cloud.nacos.discovery.server-addr}
-      #server-addr: 47.108.162.14:8848
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-      group: ${spring.cloud.nacos.discovery.group}
-  application-id: ${spring.application.name}
-  #  当前不生效，使用驼峰
-  enabled: true
-  #  enable-auto-data-source-proxy: false
-  enableAutoDataSourceProxy: false
+#seata:
+#  # seata 服务分组，要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
+#  # 事务分组名称，要和服务端对应
+#  tx-service-group: sckw-transport-seata-service-group
+#  service:
+#    vgroup-mapping:
+#      # key是事务分组名称 value要和服务端的机房名称保持一致
+#      sckw-transport-seata-service-group: default
+#  registry:
+#    # 指定nacos作为注册中心
+#    type: nacos
+#    nacos:
+#      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+#      #server-addr: 47.108.162.14:8848
+#      namespace: ${spring.cloud.nacos.discovery.namespace}
+#      #      group: SEATA_GROUP
+#      group: ${spring.cloud.nacos.discovery.group}
+#  config:
+#    # 指定nacos作为配置中心
+#    type: nacos
+#    nacos:
+#      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+#      #server-addr: 47.108.162.14:8848
+#      namespace: ${spring.cloud.nacos.discovery.namespace}
+#      group: ${spring.cloud.nacos.discovery.group}
+#  application-id: ${spring.application.name}
+#  #  当前不生效，使用驼峰
+#  enabled: true
+#  #  enable-auto-data-source-proxy: false
+#  enableAutoDataSourceProxy: false
 #  application-id: sckw-seata-file
 # 支持feign对sentinel支持
 #feign:
@@ -151,7 +151,7 @@ seata:
 dubbo:
   application:
     # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中，如果dubbo也延用相同的名称，在nacos服务里会看到注册的producer-server服务数为2
-    name: file-dubbo-server
+    name: transport-dubbo-server
   protocol:
     name: dubbo
     port: -1
@@ -170,4 +170,8 @@ aliyun:
     secret: 7mQLWMaBJeZPRV1SRGogctYGXwppjQ
     bucket: kaiwu-saas
 links:
-isBindManyRole:
+isBindManyRole:
+mybatis-plus:
+  configuration:
+    # 是否将sql打印到控制面板(该配置会将sql语句和查询的结果都打印到控制台)
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

sckw-modules/sckw-transport/src/main/resources/mapper/KwoTradeOrderMapper.xml

@@ -1,6 +1,6 @@
 <?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.sckw.transport.dao.KwoTradeOrderDao">
+<mapper namespace="com.sckw.transport.dao.KwoTradeOrderMapper">
     <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwoTradeOrder">
         <id column="id" jdbcType="BIGINT" property="id" />
         <result column="t_order_no" jdbcType="BIGINT" property="tOrderNo" />