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

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwWaybillOrder.java

@@ -92,6 +92,11 @@ public class SckwWaybillOrder{
      */
     private String truckTrailerNo;
 
+    /**
+     * 车队班组
+     */
+    private String truckFleetName;
+
     /**
      * 司机主键ID
      */
@@ -112,6 +117,7 @@ public class SckwWaybillOrder{
      */
     private String driverIdcard;
 
+
     /**
      * 装货日期
      */

sckw-common/sckw-common-stream/src/main/java/com/sckw/stream/model/SckwBusSum.java

@@ -0,0 +1,31 @@
+package com.sckw.stream.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author zk
+ * @desc rabbitMq业务汇总数据发送/消费对象
+ * @date 2023/7/10 0010
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SckwBusSum {
+
+    /**
+     * 业务汇总类型（tradeOrder交易订单、logisticsOrder物流订单、waybillOrder车辆运单等）
+     */
+    private String busSumType;
+
+    /**
+     * 操作对象（1新增/2修改）
+     */
+    private int method;
+
+    /**
+     * 业务汇总数据对象
+     */
+    private Object object;
+}

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

@@ -59,6 +59,15 @@ 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

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

@@ -1,18 +1,10 @@
 spring:
-  application:
-    name: sckw-transport
-  rabbitmq:
-    username: admin
-    password: admin
-    host: 10.10.10.138
-    port: 5672
-    virtual-host: /
   cloud:
     nacos:
       discovery:
         # 服务注册地址
 #        server-addr: 47.108.162.14:8848
-        server-addr: 127.0.0.1:8848
+        server-addr: 10.10.10.178:8848
         # 命名空间
         namespace: sckw-service-platform-dev
         # nacos用户名
@@ -26,154 +18,15 @@ spring:
       config:
         # 配置中心地址
 #        server-addr: 47.108.162.14:8848
-        server-addr: 127.0.0.1:8848
+        server-addr: 10.10.10.178:8848
         # 配置文件格式
         file-extension: yaml
         # 命名空间
         namespace: sckw-service-platform-dev
         # 共享配置
         group: sckw-service-platform
-        enabled: true
-    stream:
-      bindings:
-        sckwSms-out-0:
-          destination: sckw-sms
-          content-type: application/json
-          default-binder: defaultRabbit
-          group: sckw
-        sckwMessage-out-0:
-          destination: sckw-message
-          content-type: application/json
-          default-binder: defaultRabbit
-          group: sckw
-      binders:
-        defaultRabbit:
-          type: rabbit
-          environment:
-            spring:
-              rabbitmq:
-                virtual-host: /
-                host: 39.104.134.114
-                port: 5672
-                username: wph
-                password: Yy123...
-    # sentinel降级配置
-    sentinel:
-      transport:
-        client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
-        port: 8719  #默认8719端口,如果被占用会向上扫描。
-        #控制台地址
-        #dashboard: 47.108.162.14:19527
-        dashboard: 127.0.0.1:19527
-      log:
-        #日志路径
-        dir: logs/sentinel
-        # 默认将调用链路收敛，导致链路流控效果无效
-        web-context-unify: false
-        #持久化nacos配置中
-      datasource:
-        #sentinel-rule: # 唯一名称可自定义
-        #限流
-        flow:
-          nacos:
-            # 设置Nacos的连接地址、命名空间和Group ID
-            namespace:  sckw-service-platform-dev
-            server-addr:  ${spring.cloud.nacos.discovery.server-addr}
-            # username: ${spring.cloud.nacos.discovery.username}
-            # password: ${spring.cloud.nacos.discovery.password}
-            # 设置Nacos中配置文件的命名规则
-            #            data-id:  ${spring.application.name}-sentinel-flow-rules
-            data-id:  sckw-file-sentinel-flow-rules
-            group-id: SENTINEL_GROUP
-            data-type: json
-            # 必填的重要字段，指定当前规则类型是"限流"
-            rule-type: flow
-        #熔断
-        degrade:
-          nacos:
-            namespace:  sckw-service-platform-dev
-            server-addr: ${spring.cloud.nacos.discovery.server-addr}
-            #data-id: ${spring.application.name}-sentinel-degrade-rules
-            data-id: sckw-file-sentinel-degrade-rules
-            group-id: SENTINEL_GROUP
-            #熔断
-            rule-type: degrade
-      #取消慢加载
-      eager: true
-  datasource:
-    dynamic:
-      seata: true
-#sfs:
-#  nacos:
-#    server-addr: 127.0.0.1:8848
-#    namespace: 967df0d8-156b-441a-a5ab-615b4a865168
-#    group: MY_GROUP
-#
-#    nacos:
-#      server-addr: ${sfs.nacos.server-addr}
-#      namespace: ${sfs.nacos.namespace}
-#      group: ${sfs.nacos.group}
-
-#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:
-#  sentinel:
-#    enabled: true
-
-dubbo:
-  application:
-    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中，如果dubbo也延用相同的名称，在nacos服务里会看到注册的producer-server服务数为2
-    name: transport-dubbo-server
-  protocol:
-    name: dubbo
-    port: -1
-    prefer-serialization: java
-  registry:
-    # 配置dubbo的注册中心为nacos
-    address: nacos://${spring.cloud.nacos.discovery.server-addr}
-    group: ${spring.cloud.nacos.config.group}
-    protocol: nacos
-    #use-as-config-center: false
-    #use-as-metadata-center: false
-aliyun:
-  oss:
-    endpoint: oss-cn-chengdu.aliyuncs.com
-    accessKeyId: LTAI5tPEbubCGq5Rdwygbz4Q
-    secret: 7mQLWMaBJeZPRV1SRGogctYGXwppjQ
-    bucket: kaiwu-saas
-links:
-isBindManyRole:
-mybatis-plus:
-  configuration:
-    # 是否将sql打印到控制面板(该配置会将sql语句和查询的结果都打印到控制台)
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

sckw-modules/sckw-report/src/main/java/com/sckw/report/consumer/SckwBusSumConsumer.java

@@ -1,16 +1,20 @@
 package com.sckw.report.consumer;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.sckw.core.utils.StringUtils;
+import com.sckw.mongo.model.SckwLogisticsOrder;
 import com.sckw.mongo.model.SckwTradeOrder;
+import com.sckw.mongo.model.SckwWaybillOrder;
+import com.sckw.report.dao.SckwLogisticsOrderRepository;
 import com.sckw.report.dao.SckwTradeOrderRepository;
+import com.sckw.report.dao.SckwWaybillOrderRepository;
+import com.sckw.stream.model.SckwBusSum;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import java.util.Date;
-import java.util.Map;
 import java.util.function.Consumer;
 
 /**
@@ -24,12 +28,20 @@ import java.util.function.Consumer;
 public class SckwBusSumConsumer {
     @Autowired
     SckwTradeOrderRepository tradeOrderRepository;
+    @Autowired
+    SckwLogisticsOrderRepository logisticsOrderRepository;
+    @Autowired
+    SckwWaybillOrderRepository waybillOrderRepository;
 
+    /**
+     * @desc 消息订阅
+     * @author zk
+     * @date 2023/7/8
+     **/
     @Bean
-    public Consumer<Map> sckwBusSum() {
+    public Consumer<SckwBusSum> sckwBusSum() {
         return sckwBusSum -> {
             try {
-                System.out.println(new Date()+"---------"+JSON.toJSONString(sckwBusSum));
                 addMongodb(sckwBusSum);
             } catch (Exception e) {
                 log.error("处理业务数据汇总消息:{}异常", JSON.toJSONString(sckwBusSum), e);
@@ -37,8 +49,45 @@ public class SckwBusSumConsumer {
         };
     }
 
-    public void addMongodb(Map<String, Object> sckwBusSum) {
-        SckwTradeOrder order = JSONObject.parseObject(JSON.toJSONString(sckwBusSum), SckwTradeOrder.class);
-        tradeOrderRepository.insert(order);
+    /**
+     * @param busSum rabbitMq业务汇总数据发送/消费对象
+     * @desc 业务存储处理
+     * @author zk
+     * @date 2023/7/8
+     **/
+    public void addMongodb(SckwBusSum busSum) {
+        /**初级校验**/
+        if (busSum.getObject() == null || StringUtils.isBlank(busSum.getBusSumType()) || busSum.getMethod() == 0) {
+            return;
+        }
+
+        /**业务存储**/
+        if (busSum.getBusSumType().equals("tradeOrder")) {
+            SckwTradeOrder order = JSONObject.parseObject(JSON.toJSONString(busSum.getObject()), SckwTradeOrder.class);
+            if (busSum.getMethod() == 1) {
+                tradeOrderRepository.insert(order);
+            } else {
+                tradeOrderRepository.save(order);
+            }
+        }
+
+        if (busSum.getBusSumType().equals("logisticsOrder")) {
+            SckwLogisticsOrder order = JSONObject.parseObject(JSON.toJSONString(busSum.getObject()), SckwLogisticsOrder.class);
+            if (busSum.getMethod() == 1) {
+                logisticsOrderRepository.insert(order);
+            } else {
+                logisticsOrderRepository.save(order);
+            }
+        }
+
+        if (busSum.getBusSumType().equals("waybillOrder")) {
+            SckwWaybillOrder order = JSONObject.parseObject(JSON.toJSONString(busSum.getObject()), SckwWaybillOrder.class);
+            if (busSum.getMethod() == 1) {
+                waybillOrderRepository.insert(order);
+            } else {
+                waybillOrderRepository.save(order);
+            }
+        }
     }
+
 }

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwFleetController.java

@@ -5,6 +5,7 @@ import com.sckw.core.exception.SystemException;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.mongo.model.SckwTradeOrder;
 import com.sckw.report.dao.SckwTradeOrderRepository;
+import com.sckw.stream.model.SckwBusSum;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.stream.function.StreamBridge;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -32,46 +34,18 @@ public class KwFleetController {
     @Resource
     StreamBridge streamBridge;
 
-    /**
-     * @param
-     * @desc 根据主键查询
-     * @author zk
-     * @date 2023/7/6
-     **/
-    @GetMapping("/detail")
-    public HttpResult selectByKey() throws SystemException {
-        List<SckwTradeOrder> list = new ArrayList<SckwTradeOrder>();
-        Long begtime = System.currentTimeMillis();
-        for (int i=0; i<10000; i++) {
-            SckwTradeOrder order = new SckwTradeOrder();
-            order.setTOrderId(System.currentTimeMillis() + i);
-            order.setTOrderNo("O" + order.getTOrderId());
-            order.setContractName("xxxx");
-            list.add(order);
-        }
-        tradeOrderRepository.insert(list);
-        Long enttime = System.currentTimeMillis();
-        System.out.println("------------------"+(enttime - begtime));
-        return HttpResult.ok();
-    }
+    @GetMapping("/detailV2")
+    public HttpResult selectByKey2(Long id, int method) throws SystemException {
+        SckwTradeOrder order = new SckwTradeOrder();
+        order.setTOrderId(id);
+        order.setTOrderNo("D" + id);
+        order.setContractName(new Date()+"");
 
-    /**
-     * @param
-     * @desc 根据主键查询
-     * @author zk
-     * @date 2023/7/6
-     **/
-    @GetMapping("/detailV1")
-    public HttpResult selectByKey1() throws SystemException {
-        for (int i=0; i<1000; i++) {
-            Long id = System.currentTimeMillis()+i;
-            HashMap map = new HashMap();
-            map.put("tOrderId", id);
-            map.put("tOrderNo", "D" + id);
-            map.put("contractName", "xxxx");
-            streamBridge.send("sckw-busSum", JSON.toJSONString(map));
-            System.out.println("------------------"+i);
-        }
+        SckwBusSum busSum = new SckwBusSum();
+        busSum.setBusSumType("tradeOrder");
+        busSum.setMethod(method);
+        busSum.setObject(order);
+        streamBridge.send("sckw-busSum", JSON.toJSONString(busSum));
         return HttpResult.ok();
     }
 }

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwOrderController.java

@@ -0,0 +1,22 @@
+package com.sckw.report.controller;
+
+import com.sckw.report.service.KwOrderService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zk
+ * @desc 订单服务
+ * @date 2023/7/10 0010
+ */
+@AllArgsConstructor
+@RestController
+@RequestMapping("/kwOrder")
+public class KwOrderController {
+
+    @Autowired
+    KwOrderService orderService;
+
+}

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwTransportController.java

@@ -0,0 +1,21 @@
+package com.sckw.report.controller;
+
+import com.sckw.report.service.KwTransportService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zk
+ * @desc 运输服务
+ * @date 2023/7/10 0010
+ */
+@AllArgsConstructor
+@RestController
+@RequestMapping("/kwTransport")
+public class KwTransportController {
+
+    @Autowired
+    KwTransportService transportService;
+}

sckw-modules/sckw-report/src/main/java/com/sckw/report/dao/SckwLogisticsOrderRepository.java

@@ -0,0 +1,12 @@
+package com.sckw.report.dao;
+
+import com.sckw.mongo.model.SckwLogisticsOrder;
+import org.springframework.data.mongodb.repository.MongoRepository;
+
+/**
+ * @author zk
+ * @desc MongoDB-物流订单信息
+ * @date 2023/7/8 0008
+ */
+public interface SckwLogisticsOrderRepository extends MongoRepository<SckwLogisticsOrder, Long> {
+}

sckw-modules/sckw-report/src/main/java/com/sckw/report/dao/SckwWaybillOrderRepository.java

@@ -0,0 +1,12 @@
+package com.sckw.report.dao;
+
+import com.sckw.mongo.model.SckwWaybillOrder;
+import org.springframework.data.mongodb.repository.MongoRepository;
+
+/**
+ * @author zk
+ * @desc MongoDB-车辆订单信息
+ * @date 2023/7/8 0008
+ */
+public interface SckwWaybillOrderRepository extends MongoRepository<SckwWaybillOrder, Long> {
+}

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwFleetService.java

@@ -0,0 +1,12 @@
+package com.sckw.report.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zk
+ * @desc 车队服务
+ * @date 2023/7/10 0010
+ */
+@Service
+public class KwFleetService {
+}

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwOrderService.java

@@ -0,0 +1,9 @@
+package com.sckw.report.service;
+
+/**
+ * @author zk
+ * @desc 订单服务
+ * @date 2023/7/10 0010
+ */
+public class KwOrderService {
+}

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -0,0 +1,12 @@
+package com.sckw.report.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zk
+ * @desc 运输服务
+ * @date 2023/7/10 0010
+ */
+@Service
+public class KwTransportService {
+}

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

@@ -205,6 +205,21 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         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;