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

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

@@ -136,6 +136,10 @@ public class Global {
 
     /**逗号-中文*/
     public static final String COMMA1 = "，";
+    /**
+     * 右斜杠
+     */
+    public static final String RIGHT_SLASH = "/";
 
     /**点*/
     public static final String DOT = ".";

sckw-modules-api/sckw-product-api/src/main/java/com/sckw/product/api/model/GoodsDetail.java

@@ -75,6 +75,11 @@ public class GoodsDetail implements Serializable {
      */
     private String goodsTypeLabel;
 
+    /**
+     * 商品类型labs
+     */
+    private String goodsTypeLabels;
+
     /**
      * 库存数量
      */

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

@@ -67,6 +67,12 @@ public class PurchaseOrderDraftParam {
      * 交易方式(预付款、货到付款）
      */
     private String trading;
+
+    /**
+     * 交付类型
+     */
+    private String deliveryType;
+
     /**
      * 备注
      */

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

@@ -79,6 +79,10 @@ public class PurchaseOrderParam {
      */
     @NotBlank(message = "交易方式不能为空")
     private String trading;
+
+    @NotBlank(message = "交付类型不能为空")
+    private String deliveryType;
+
     /**
      * 备注
      */

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

@@ -14,8 +14,6 @@ import lombok.ToString;
 @ToString
 public class ValetOrderDraftParam extends PurchaseOrderDraftParam {
 
-    private String deliveryType;
-
     private ContractInfo contractInfo;
 
 }

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

@@ -1,7 +1,6 @@
 package com.sckw.order.model.vo.req;
 
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
@@ -17,9 +16,6 @@ import lombok.ToString;
 @ToString
 public class ValetOrderParam extends PurchaseOrderParam {
 
-    @NotBlank(message = "交付类型不能为空")
-    private String deliveryType;
-
     @NotNull(message = "合同信息不能为空")
     @Valid
     private ContractInfo contractInfo;

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

@@ -48,6 +48,11 @@ public class TransportDemandDetailRes implements Serializable {
      */
     private String goodsTypeLabel;
 
+    /**
+     * 商品类型labs
+     */
+    private String goodsTypeLabels;
+
     /**
      * 商品规格
      */

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

@@ -50,6 +50,12 @@ public class WantBuyDetailRes implements Serializable {
      * 商品类型label
      */
     private String goodsTypeLabel;
+
+    /**
+     * 商品类型labs
+     */
+    private String goodsTypeLabels;
+
     /**
      * 商品规格
      */

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

@@ -828,11 +828,11 @@ public class KwoTradeOrderService {
         if (Objects.isNull(param.getEndTime())) {
             throw new BusinessException("结束时间不能为空！");
         }
+        if (StringUtils.isBlank(param.getDeliveryType())) {
+            throw new BusinessException("交付类型不能为空!");
+        }
         ContractInfo contractInfo = param.getContractInfo();
         if (Objects.equals(source, OrderSourceEnum.SALE.getType())) {
-            if (StringUtils.isBlank(param.getDeliveryType())) {
-                throw new BusinessException("交付类型不能为空!");
-            }
             if (Objects.isNull(contractInfo)) {
                 throw new BusinessException("代客下单合同信息不能为空");
             }

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

@@ -113,7 +113,8 @@ public class KwoTransportDemandService {
         TransportDemandDetailRes res = BeanUtils.copyProperties(transportDemand, TransportDemandDetailRes.class);
         List<SysDictResDto> types = remoteSystemService.queryDictFrontAll(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), res.getGoodsType());
         if (CollectionUtils.isNotEmpty(types)) {
-            res.setGoodsTypes(types.stream().map(SysDictResDto::getValue).toList());
+            res.setGoodsTypes(types.stream().map(SysDictResDto::getValue).toList())
+                    .setGoodsTypeLabels(String.join(Global.RIGHT_SLASH, types.stream().map(SysDictResDto::getLabel).toList()));
         }
         res.setGoodsTypeLabel(productNameMap.get(res.getGoodsType()))
                 .setTradingLabel(tradeMap.get(res.getTrading()))

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

@@ -378,7 +378,8 @@ public class KwpWantBuyService {
         }
         List<SysDictResDto> types = remoteSystemService.queryDictFrontAll(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), responseData.getGoodsType());
         if (CollectionUtils.isNotEmpty(types)) {
-            responseData.setGoodsTypes(types.stream().map(SysDictResDto::getValue).toList());
+            responseData.setGoodsTypes(types.stream().map(SysDictResDto::getValue).toList())
+                    .setGoodsTypeLabels(String.join(Global.RIGHT_SLASH, types.stream().map(SysDictResDto::getLabel).toList()));
         }
         responseData.setGoodsTypeLabel(productNameMap.get(responseData.getGoodsType()))
                 .setStatusLabel(wantBuyStatusMap.get(String.valueOf(responseData.getStatus())));

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/res/GoodsDetail.java

@@ -86,6 +86,11 @@ public class GoodsDetail {
      */
     private String goodsTypeLabel;
 
+    /**
+     * 商品类型labs
+     */
+    private String goodsTypeLabels;
+
     /**
      * 库存数量
      */

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/res/OperationGoodsDetail.java

@@ -91,6 +91,11 @@ public class OperationGoodsDetail implements Serializable {
      */
     private String goodsTypeLabel;
 
+    /**
+     * 商品类型labs
+     */
+    private String goodsTypeLabels;
+
     /**
      * 库存数量
      */

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

@@ -268,7 +268,8 @@ public class KwpGoodsService {
         }
         List<SysDictResDto> types = remoteSystemService.queryDictFrontAll(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), detail.getGoodsType());
         if (CollectionUtils.isNotEmpty(types)) {
-            detail.setGoodsTypes(types.stream().map(SysDictResDto::getValue).toList());
+            detail.setGoodsTypes(types.stream().map(SysDictResDto::getValue).toList())
+                    .setGoodsTypeLabels(String.join(Global.RIGHT_SLASH, types.stream().map(SysDictResDto::getLabel).toList()));
         }
         detail.setGoodsTypeLabel(CollectionUtils.isNotEmpty(productNameMap) ? productNameMap.get(detail.getGoodsType()) : null)
                 .setUnitLabel(CollectionUtils.isNotEmpty(unitMap) ? unitMap.get(detail.getUnit()) : null)

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/CarWaybillVO.java

@@ -63,6 +63,12 @@ public class CarWaybillVO {
      * 司机
      */
     private String driverName;
+
+    /**
+     * 司机电话
+     */
+    private String driverPhone;
+
     /**
      * 承运车队
      */

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

@@ -1036,7 +1036,7 @@ public class AcceptCarriageOrderService {
                 subcontractConsignmentVO.setLoadAddressDetail(subcontractConsignmentVO.getLoadCityName() + subcontractConsignmentVO.getLoadAddress());
                 subcontractConsignmentVO.setUnloadAddressDetail(subcontractConsignmentVO.getUnloadCityName() + subcontractConsignmentVO.getUnloadAddress());
                 subcontractConsignmentVO.setOrderSourceLabel(orderSource == null ? null : orderSource.get(subcontractConsignmentVO.getOrderSource()));
-                subcontractConsignmentVO.setTaxRateLabel(subcontractConsignmentVO.getTaxRate()+"%");
+                subcontractConsignmentVO.setTaxRateLabel(subcontractConsignmentVO.getTaxRate() + "%");
             }
             allList.addAll(voList);
         }
@@ -1832,6 +1832,8 @@ public class AcceptCarriageOrderService {
         KwtLogisticsOrderGoods orderGoods = kwtLogisticsOrderGoodsMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderGoods>()
                 .eq(StringUtils.isNotBlank(logisticsOrder.getId()), KwtLogisticsOrderGoods::getLOrderId, logisticsOrder.getId()));
         OrderDetailVO orderDetailVO = new OrderDetailVO();
+        orderDetailVO.setLoadName(loadOrderAddress.getName());
+        orderDetailVO.setUnloadName(unloadOrderAddress.getName());
         orderDetailVO.setId(String.valueOf(logisticsOrder.getId()));
         if (contract != null) {
             orderDetailVO.setContractId(contract.getContractId() == null ? null : String.valueOf(contract.getContractId()));
@@ -1865,11 +1867,11 @@ public class AcceptCarriageOrderService {
         orderDetailVO.setLoadAddress(loadOrderAddress.getName());
         orderDetailVO.setLoadContacts(loadOrderAddress.getContacts());
         orderDetailVO.setLoadPhone(loadOrderAddress.getPhone());
-        orderDetailVO.setLoadAddressDetail(loadOrderAddress.getDetailAddress());
+        orderDetailVO.setLoadAddressDetail(loadOrderAddress.getCityName() + loadOrderAddress.getDetailAddress());
         orderDetailVO.setUnloadAddress(unloadOrderAddress.getName());
         orderDetailVO.setUnloadContacts(unloadOrderAddress.getContacts());
         orderDetailVO.setUnloadPhone(unloadOrderAddress.getPhone());
-        orderDetailVO.setUnloadAddressDetail(unloadOrderAddress.getDetailAddress());
+        orderDetailVO.setUnloadAddressDetail(unloadOrderAddress.getCityName() + unloadOrderAddress.getDetailAddress());
         orderDetailVO.setSettlementCycle(logisticsOrder.getSettlementCycle() == null ? null : String.valueOf(logisticsOrder.getSettlementCycle()));
         orderDetailVO.setBillingMode(logisticsOrder.getBillingMode());
         orderDetailVO.setScheduleStartTime(logisticsOrder.getStartTime() == null ? null : logisticsOrder.getStartTime());

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

@@ -390,6 +390,7 @@ public class ConsignOrderService {
                     carWaybillVo.setStatusLabel(CarWaybillEnum.getName(kwtWaybillOrder.getStatus()));
                     carWaybillVo.setWaybillType(kwtWaybillOrder.getType());
                     carWaybillVo.setDriverName(kwtWaybillOrder.getDriverName());
+                    carWaybillVo.setDriverPhone(kwtWaybillOrder.getDriverPhone());
                     //todo 取mongo
 //                SckwWaybillOrder sckwWaybillOrder = mongoTemplate.findById(kwtWaybillOrder.getId(), SckwWaybillOrder.class);
                     /** 2023-07-24 原值为承运车队-去除后更换展示为承运公司*/
@@ -665,6 +666,7 @@ public class ConsignOrderService {
                     carWaybillVo.setStatusLabel(CarWaybillEnum.getName(kwtWaybillOrder.getStatus()));
                     carWaybillVo.setWaybillType(kwtWaybillOrder.getType());
                     carWaybillVo.setDriverName(kwtWaybillOrder.getDriverName());
+                    carWaybillVo.setDriverPhone(kwtWaybillOrder.getDriverPhone());
                     //todo 取mongo
 //                SckwWaybillOrder sckwWaybillOrder = mongoTemplate.findById(kwtWaybillOrder.getId(), SckwWaybillOrder.class);
                     /** 2023-07-24 原值为承运车队-去除后更换展示为承运公司*/