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

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DictEnum.java

@@ -22,6 +22,9 @@ public enum DictEnum {
     UNIT_TYPE_2("unit_type","2", "箱"),
     UNIT_TYPE_3("unit_type","3", "件"),
     UNIT_TYPE_4("unit_type","4", "其他"),
+    TAX_RATE_0("tax_rate","13.00", "13%"),
+    TAX_RATE_1("tax_rate","11.00", "11%"),
+    TAX_RATE_2("tax_rate","10.00", "10%"),
     TRADE_TYPE_0("trade_type", "0", "预付款"),
     TRADE_TYPE_1("trade_type", "1", "货到付款"),
     TRADE_TYPE_2("trade_type", "2", "线下付款"),

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DictTypeEnum.java

@@ -13,6 +13,7 @@ import lombok.Getter;
 public enum DictTypeEnum {
     INTEGRAL_TYPE("integral_type", "积分类型"),
     UNIT_TYPE("unit_type", "商品单位类型"),
+    TAX_RATE("tax_rate", "商品税率"),
     PRICE_TYPE("price_type", "运价方式"),
     TRADE_TYPE("trade_type", "交易方式"),
     PICKUP_TYPE("pickup_type", "提货方式"),

sckw-modules-api/pom.xml

@@ -25,6 +25,7 @@
         <module>sckw-transport-api</module>
         <module>sckw-product-api</module>
         <module>sckw-order-api</module>
+        <module>sckw-fleet-api</module>
     </modules>
 
     <properties>

sckw-modules-api/sckw-fleet-api/pom.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>sckw-modules-api</artifactId>
+        <groupId>com.sckw</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>sckw-fleet-api</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+    </dependencies>
+</project>

sckw-modules-api/sckw-fleet-api/src/main/java/com/sckw/fleet/api/RemoteFleetService.java

@@ -0,0 +1,29 @@
+package com.sckw.fleet.api;
+
+import com.sckw.fleet.api.model.vo.RDriverVo;
+import com.sckw.fleet.api.model.vo.RTruckVo;
+import java.util.Map;
+
+/**
+ * @author zk
+ * @desc 车队服务
+ * @date 2023/7/18 0018
+ */
+public interface RemoteFleetService {
+
+    /**
+     * @param driverIds 司机档案主键id，多个已逗号隔开
+     * @desc 查询司机信息
+     * @author zk
+     * @date 2023/7/18
+     **/
+    Map<Long, RDriverVo> findDriver(String driverIds);
+
+    /**
+     * @param truckNos 车牌号，多个已逗号隔开
+     * @desc 查询车辆信息
+     * @author zk
+     * @date 2023/7/18
+     **/
+    Map<Long, RTruckVo> findTruck(String truckNos);
+}

sckw-modules-api/sckw-fleet-api/src/main/java/com/sckw/fleet/api/model/vo/RDriverVo.java

@@ -0,0 +1,49 @@
+package com.sckw.fleet.api.model.vo;
+
+import lombok.Data;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author zk
+ * @desc 司机
+ * @date 2023/7/17 0017
+ */
+@Data
+public class RDriverVo implements Serializable {
+
+    /**
+     * 司机档案主键id
+     */
+    private Long id;
+
+    /**
+     * 司机姓名
+     */
+    private String name;
+
+    /**
+     * 司机手机号
+     */
+    private String phone;
+
+    /**
+     * 身份证号
+     */
+    private String idcard;
+
+    /**
+     * 总运单完成量
+     */
+    private Integer totalComplete;
+
+    /**
+     * 总运单接单量
+     */
+    private Integer totalTake;
+
+    /**
+     * 总运量（净重）
+     */
+    private BigDecimal totalWeight;
+}

sckw-modules-api/sckw-fleet-api/src/main/java/com/sckw/fleet/api/model/vo/RTruckVo.java

@@ -0,0 +1,54 @@
+package com.sckw.fleet.api.model.vo;
+
+import lombok.Data;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author zk
+ * @desc 车辆档案
+ * @date 2023/7/17 0017
+ */
+@Data
+public class RTruckVo implements Serializable {
+
+    /**
+     * 车辆档案主键id
+     */
+    private Long id;
+
+    /**
+     * 车牌号
+     */
+    private String truckNo;
+
+    /**
+     * 核定载质量/吨
+     */
+    private Double actualWeight;
+
+    /**
+     * 挂车号
+     */
+    private String trailerNo;
+
+    /**
+     * 总运单完成量
+     */
+    private Integer totalComplete;
+
+    /**
+     * 总运单接单量
+     */
+    private Integer totalTake;
+
+    /**
+     * 总运量（净重）
+     */
+    private BigDecimal totalWeight;
+
+    /**
+     * 车辆业务状态
+     */
+    private Integer businessStatus;
+}

sckw-modules-api/sckw-modules-bom/pom.xml

@@ -34,6 +34,12 @@
                 <artifactId>sckw-message-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.sckw</groupId>
+                <artifactId>sckw-fleet-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

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

@@ -76,6 +76,11 @@ public class GoodsDetail {
      */
     private String unit;
 
+    /**
+     * 单位lab
+     */
+    private String unitLabel;
+
     /**
      * 尺寸大小
      */
@@ -86,6 +91,11 @@ public class GoodsDetail {
      */
     private BigDecimal taxRate;
 
+    /**
+     * 发票税率label
+     */
+    private String taxRateLabel;
+
     /**
      * 交易方式(value）(合同采购、直接采购、预付款、货到付款、到款发货）
      */

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/dubbo/TransportDubboService.java

@@ -1,8 +1,6 @@
 package com.sckw.transport.api.dubbo;
 
-import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.api.model.dto.vo.KwtLogisticsOrderVO;
-import com.sckw.transport.api.model.param.LogisticsOrderParam;
 
 import java.util.List;
 
@@ -15,13 +13,6 @@ import java.util.List;
  * @date 2023-07-17 10:06:27
  */
 public interface TransportDubboService {
-    /**
-     * 查询物流订单数据
-     *
-     * @param logisticsOrderParam
-     * @return
-     */
-    HttpResult getLogisticsOrderData(LogisticsOrderParam logisticsOrderParam);
 
     /**
      * 根据id 获取详情

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/dto/vo/LogisticsOrderDTO.java

@@ -36,7 +36,7 @@ public class LogisticsOrderDTO {
     /**
      * 运输趟次
      */
-    private Integer count;
+    private Long count;
     /**
      * 计费方式
      */
@@ -82,9 +82,4 @@ public class LogisticsOrderDTO {
     private BigDecimal unloadAmount;
     private BigDecimal loadAmount;
 
-    /**
-     * 销售单价
-     */
-    private BigDecimal salesPrice;
-
 }

sckw-modules/sckw-fleet/pom.xml

@@ -64,6 +64,11 @@
             <artifactId>sckw-system-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-fleet-api</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -17,7 +17,6 @@ import com.sckw.fleet.model.vo.KwfTruckVo;
 import com.sckw.fleet.service.KwfTruckService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-import org.checkerframework.checker.units.qual.K;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dubbo/RemoteFleetServiceImpl.java

@@ -0,0 +1,93 @@
+package com.sckw.fleet.dubbo;
+
+import com.sckw.core.utils.CollectionUtils;
+import com.sckw.fleet.api.RemoteFleetService;
+import com.sckw.fleet.api.model.vo.RDriverVo;
+import com.sckw.fleet.api.model.vo.RTruckVo;
+import com.sckw.fleet.dao.KwfDriverMapper;
+import com.sckw.fleet.dao.KwfTruckMapper;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zk
+ * @desc 车队服务
+ * @date 2023/7/18 0018
+ */
+@DubboService(group = "design", version = "1.0.0")
+@Service
+public class RemoteFleetServiceImpl implements RemoteFleetService {
+
+    @Autowired
+    KwfTruckMapper truckDao;
+    @Autowired
+    KwfDriverMapper driverDao;
+
+    /**
+     * @param driverIds 司机档案主键id，多个已逗号隔开
+     * @desc 查询司机信息
+     * @author zk
+     * @date 2023/7/18
+     **/
+    @Override
+    public Map<Long, RDriverVo> findDriver(String driverIds) {
+        /**获取数据**/
+        Map<Long, RDriverVo> driverMap = new HashMap();
+        List<Map<String, Object>> drivers = driverDao.findList(new HashMap(){{put("ids", driverIds);}});
+        if (CollectionUtils.isEmpty(drivers)) {
+            return driverMap;
+        }
+
+        /**数据处理**/
+        for (Map<String, Object> driver:drivers) {
+            RDriverVo driverVo = new RDriverVo();
+            driverVo.setId(driver.get("id") != null ? Long.parseLong(String.valueOf(driver.get("id"))) : null);
+            driverVo.setName(driver.get("name") != null ? String.valueOf(driver.get("name")) : null);
+            driverVo.setPhone(driver.get("phone") != null ? String.valueOf(driver.get("phone")) : null);
+            driverVo.setIdcard(driver.get("idcard") != null ? String.valueOf(driver.get("idcard")) : null);
+            driverVo.setTotalComplete(driver.get("totalComplete") != null ? Integer.parseInt(String.valueOf(driver.get("totalComplete"))) : null);
+            driverVo.setTotalTake(driver.get("totalTake") != null ? Integer.parseInt(String.valueOf(driver.get("totalTake"))) : null);
+            driverVo.setTotalWeight(driver.get("totalWeight") != null ? new BigDecimal(Double.parseDouble(String.valueOf(driver.get("totalWeight")))) : null);
+            driverMap.put(driverVo.getId(), driverVo);
+        }
+
+        return driverMap;
+    }
+
+    /**
+     * @param truckNos 车牌号，多个已逗号隔开
+     * @desc 查询车辆信息
+     * @author zk
+     * @date 2023/7/18
+     **/
+    @Override
+    public Map<Long, RTruckVo> findTruck(String truckNos) {
+        /**获取数据**/
+        Map<Long, RTruckVo> truckMap = new HashMap();
+        List<Map<String, Object>> trucks = truckDao.findList(new HashMap(){{put("truckNos", truckNos);}});
+        if (CollectionUtils.isEmpty(trucks)) {
+            return truckMap;
+        }
+
+        /**数据处理**/
+        for (Map<String, Object> truck:trucks) {
+            RTruckVo truckVo = new RTruckVo();
+            truckVo.setId(truck.get("id") != null ? Long.parseLong(String.valueOf(truck.get("id"))) : null);
+            truckVo.setTruckNo(truck.get("truckNo") != null ? String.valueOf(truck.get("truckNo")) : null);
+            truckVo.setActualWeight(truck.get("actualWeight") != null ? Double.parseDouble(String.valueOf(truck.get("actualWeight"))) : null);
+            truckVo.setTrailerNo(truck.get("trailerNo") != null ? String.valueOf(truck.get("trailerNo")) : null);
+            truckVo.setTotalComplete(truck.get("totalComplete") != null ? Integer.parseInt(String.valueOf(truck.get("totalComplete"))) : null);
+            truckVo.setTotalTake(truck.get("totalTake") != null ? Integer.parseInt(String.valueOf(truck.get("totalTake"))) : null);
+            truckVo.setTotalWeight(truck.get("totalWeight") != null ? new BigDecimal(Double.parseDouble(String.valueOf(truck.get("totalWeight")))) : null);
+            truckVo.setBusinessStatus(truck.get("businessStatus") != null ? Integer.parseInt(String.valueOf(truck.get("businessStatus"))) : null);
+            truckMap.put(truckVo.getId(), truckVo);
+        }
+
+        return truckMap;
+    }
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -441,7 +441,10 @@ public class KwfDriverService {
         KwfDriverEnt driverEnt = new KwfDriverEnt();
         driverEnt.setDriverId(params.getId());
         driverEnt.setEntId(params.getEntId());
-        driverEntDao.insert(driverEnt);
+        KwfDriverEnt ent = driverEntDao.findByDriverEnt(driverEnt);
+        if (ent == null) {
+            driverEntDao.insert(driverEnt);
+        }
     }
 
     /**

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -399,7 +399,10 @@ public class KwfTruckService {
         KwfTruckEnt truckEnt = new KwfTruckEnt();
         truckEnt.setTruckId(params.getId());
         truckEnt.setEntId(params.getEntId());
-        truckEntDao.insert(truckEnt);
+        KwfTruckEnt ent = truckEntDao.findByTruckEnt(truckEnt);
+        if (ent == null) {
+            truckEntDao.insert(truckEnt);
+        }
     }
 
     /**

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverMapper.xml

@@ -54,7 +54,7 @@
         SELECT
         dr.id, dr.name, dr.phone, dr.idcard, dr.status, drc.expire_time idcardExpireTime, drc.address, drl.driver_no driverNo,
         drl.type licenseType, drl.expire_time licenseExpireTime, drl.grant_unit licenseGrantUnit,
-        drq.quali_no qualiNo, dre.ent_id entId, dr.create_by createBy, dr.create_time crateTime,
+        drq.quali_no qualiNo, dr.ent_id entId, dr.create_by createBy, dr.create_time crateTime,
         dr.update_time updateTime, dr.remark, trr.truck_no truckNo, fl.name fleetName
         from kwf_driver dr
         left join kwf_driver_ent dre on dre.driver_id = dr.id
@@ -111,6 +111,9 @@
         from kwf_driver dr
         left join kwf_driver_ent dre on dre.driver_id = dr.id
         where dr.del_flag = 0 and dre.del_flag = 0
+        <if test="ids != null and ids != ''">
+            and FIND_IN_SET(dr.id, #{ids, jdbcType=VARCHAR})
+        </if>
         <if test="entId != null and entId != ''">
             and dre.ent_id = #{entId, jdbcType=VARCHAR}
         </if>
@@ -146,4 +149,5 @@
         and dre.ent_id = #{entId, jdbcType=VARCHAR}
         and dr.id = #{id, jdbcType=VARCHAR}
     </select>
+
 </mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckMapper.xml

@@ -115,6 +115,9 @@
         from kwf_truck tr
         left join kwf_truck_ent tre on tre.truck_id = tr.id
         where tr.del_flag = 0 and tre.del_flag = 0
+        <if test="truckNos != null and truckNos != ''">
+            and FIND_IN_SET(tr.truck_no, #{truckNos, jdbcType=VARCHAR})
+        </if>
         <if test="entId != null and entId != ''">
             and tre.ent_id = #{entId, jdbcType=VARCHAR}
         </if>
@@ -161,6 +164,4 @@
         and tr.id = #{id, jdbcType=VARCHAR}
     </select>
 
-
-
 </mapper>

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

@@ -33,7 +33,7 @@ public class GoodsListExport implements Serializable {
     private String spec;
 
     @ExcelProperty(value = "增值税", index = 5)
-    private String taxRate;
+    private String taxRateLabel;
 
     @ExcelProperty(value = "库存数量", index = 6)
     private String amount;

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

@@ -91,6 +91,11 @@ public class GoodsDetail {
      */
     private BigDecimal taxRate;
 
+    /**
+     * 发票税率label
+     */
+    private String taxRateLabel;
+
     /**
      * 交易方式(value）(合同采购、直接采购、预付款、货到付款、到款发货）
      */

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

@@ -70,6 +70,11 @@ public class GoodsList {
      */
     private BigDecimal taxRate;
 
+    /**
+     * 发票税率label
+     */
+    private String taxRateLabel;
+
     /**
      * 库存数量
      */

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

@@ -30,6 +30,7 @@ import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -182,6 +183,7 @@ public class KwpGoodsService {
         detail.setGoodsTypeLabel(DictEnum.getLabel(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), detail.getGoodsType()))
                 .setTradingLabel(DictEnum.getLabel(DictTypeEnum.TRADE_TYPE.getType(), detail.getTrading()))
                 .setUnitLabel(DictEnum.getLabel(DictTypeEnum.UNIT_TYPE.getType(), detail.getUnit()))
+                .setTaxRateLabel(DictEnum.getLabel(DictTypeEnum.TAX_RATE.getType(), String.valueOf(detail.getTaxRate())))
                 .setStatusLabel(DictEnum.getLabel(DictTypeEnum.GOODS_STATUS.getType(), String.valueOf(detail.getStatus())));
         //商品图片信息
         List<KwpGoodsImage> goodsImages = kwpGoodsImageService.getByGoodsId(id);
@@ -290,7 +292,7 @@ public class KwpGoodsService {
      * @Param param:
      * @return: void
      */
-    private void judgeParameters(UpdateGoodsParam param) {
+    private void judgeParameters(@NotNull UpdateGoodsParam param) {
         if (StringUtils.isBlank(param.getName())) {
             throw new BusinessException("商品名称不能为空！");
         }
@@ -377,6 +379,7 @@ public class KwpGoodsService {
                     .setGoodsTypeLabel(DictEnum.getLabel(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), goodsList.getGoodsType()))
                     .setUnitLabel(DictEnum.getLabel(DictTypeEnum.UNIT_TYPE.getType(), goodsList.getUnit()))
                     .setTradingLabel(DictEnum.getLabel(DictTypeEnum.TRADE_TYPE.getType(), goodsList.getTrading()))
+                    .setTaxRateLabel(DictEnum.getLabel(DictTypeEnum.TAX_RATE.getType(), String.valueOf(goodsList.getTaxRate())))
                     .setManageName(Objects.nonNull(manager) ? manager.getName() : null)
                     .setPhone(Objects.nonNull(manager) ? manager.getPhone() : null)
                     .setSupplyEnt(Objects.nonNull(entMap.get(e.getSupplyEntId())) ? entMap.get(e.getSupplyEntId()) : null)
@@ -471,8 +474,7 @@ public class KwpGoodsService {
         List<GoodsListExport> list = new ArrayList<>();
         goodsLists.forEach(e -> {
             GoodsListExport export = BeanUtils.copyProperties(e, GoodsListExport.class);
-            export.setTaxRate(String.valueOf(e.getTaxRate())).setAmount(String.valueOf(e.getAmount()))
-                    .setHighestPrice(String.valueOf(e.getHighestPrice())).setLowestPrice(String.valueOf(e.getLowestPrice()))
+            export.setHighestPrice(String.valueOf(e.getHighestPrice())).setLowestPrice(String.valueOf(e.getLowestPrice()))
                     .setAddedTime(Objects.isNull(e.getAddedTime()) ? null : DateUtil.getDateTime(e.getAddedTime()))
                     .setAddedTime(Objects.isNull(e.getShelfTime()) ? null : DateUtil.getDateTime(e.getShelfTime()));
             list.add(export);

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

@@ -60,6 +60,7 @@ public class SckwBusSumConsumer {
      * @date 2023/7/8
      **/
     public void addMongodb(SckwBusSum busSum) {
+        log.info("busSum:{}", JSONObject.toJSONString(busSum));
         /**初级校验**/
         if (busSum.getObject() == null || StringUtils.isBlank(busSum.getBusSumType()) || busSum.getMethod() == 0) {
             return;

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

@@ -3,9 +3,9 @@ package com.sckw.transport.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.transport.api.model.param.LogisticsOrderParam;
 import com.sckw.transport.model.dto.DocumentParamDTO;
 import com.sckw.transport.model.dto.OrderDTO;
+import com.sckw.transport.model.param.LogisticsOrderParam;
 import com.sckw.transport.service.TransportCommonService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderMapper.java

@@ -2,8 +2,8 @@ package com.sckw.transport.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.transport.api.model.dto.vo.LogisticsOrderDTO;
-import com.sckw.transport.api.model.param.LogisticsOrderParam;
 import com.sckw.transport.model.KwtLogisticsOrder;
+import com.sckw.transport.model.param.LogisticsOrderParam;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -53,4 +53,11 @@ public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
      * @return
      */
     Long selectOrderCount(@Param("id") String id);
+
+    /**
+     * @param logisticsOrderParam
+     * @param dictId
+     * @return
+     */
+    Long selectLogisticOrderCount(@Param("logisticsOrderParam") LogisticsOrderParam logisticsOrderParam, @Param("dictId") Long dictId);
 }

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/param/LogisticsOrderParam.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/LogisticsOrderParam.java

@@ -1,4 +1,4 @@
-package com.sckw.transport.api.model.param;
+package com.sckw.transport.model.param;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;

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

@@ -216,7 +216,6 @@ public class AcceptCarriageOrderService {
                 SckwBusSum busSum = new SckwBusSum();
                 //业务汇总类型
                 busSum.setBusSumType(BusinessTypeEnum.WAYBILL_ORDER_TYPE.getName());
-//            busSum.setBusSumType("waybillOrderCar");
                 //操作对象（1新增/2修改）
                 busSum.setMethod(1);
                 //业务汇总数据对象

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

@@ -3,11 +3,9 @@ package com.sckw.transport.service;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.sckw.core.common.enums.NumberConstant;
-import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
+import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
@@ -16,12 +14,12 @@ import com.sckw.excel.utils.DateUtil;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.transport.api.model.dto.vo.LogisticsOrderDTO;
-import com.sckw.transport.api.model.param.LogisticsOrderParam;
 import com.sckw.transport.common.enums.LogisticsOrderEnum;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.dto.DocumentParamDTO;
 import com.sckw.transport.model.dto.OrderDTO;
+import com.sckw.transport.model.param.LogisticsOrderParam;
 import com.sckw.transport.model.vo.OrderDetailVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -70,6 +68,9 @@ public class TransportCommonService {
     @Autowired
     public KwtLogisticsOrderUnitMapper logisticsOrderUnitMapper;
 
+    @Autowired
+    public KwtWaybillOrderMapper waybillOrderMapper;
+
     /**
      * 获取托运企业名称
      *
@@ -112,6 +113,7 @@ public class TransportCommonService {
 
     /**
      * 查看订单详情
+     *
      * @param dto
      * @return
      */
@@ -201,6 +203,7 @@ public class TransportCommonService {
 
     /**
      * 撤销托运
+     *
      * @param orderDto
      * @return
      */
@@ -252,7 +255,7 @@ public class TransportCommonService {
             logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
                     .eq(KwtLogisticsOrder::getId, order.getId())
                     .set(KwtLogisticsOrder::getDelFlag, NumberConstant.ONE)
-                    .set(KwtLogisticsOrder::getSubcontractAmount,add)
+                    .set(KwtLogisticsOrder::getSubcontractAmount, add)
                     .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId())
                     .set(KwtLogisticsOrder::getUpdateTime, new Date()));
 
@@ -269,14 +272,29 @@ public class TransportCommonService {
         SysDictResDto sysDictResDto = remoteSystemService.queryDictByTypeAndValue(logisticsOrderParam.getPaymentType(), logisticsOrderParam.getPayment());
         Long dictId = sysDictResDto.getId();
         if (StringUtils.isNotBlank(logisticsOrderParam.getStartTime())) {
-            logisticsOrderParam.setStartTime(logisticsOrderParam.getEndTime() + " 00:00:00");
+            logisticsOrderParam.setStartTime(logisticsOrderParam.getStartTime() + " 00:00:00");
         }
         if (StringUtils.isNotBlank(logisticsOrderParam.getEndTime())) {
             logisticsOrderParam.setEndTime(logisticsOrderParam.getEndTime() + " 23:59:59");
         }
+        Integer page = logisticsOrderParam.getPage();
+        logisticsOrderParam.setPage(logisticsOrderParam.getPage()-1);
         List<LogisticsOrderDTO> list = logisticsOrderMapper.selectLogisticOrderData(logisticsOrderParam, dictId);
-        PageHelper.startPage(logisticsOrderParam.getPage(),logisticsOrderParam.getPageSize());
-        PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
-        return HttpResult.ok(pageResult);
+        Long count = logisticsOrderMapper.selectLogisticOrderCount(logisticsOrderParam, dictId);
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (LogisticsOrderDTO logisticsOrderDTO : list) {
+                KwtLogisticsOrderUnit orderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
+                        .eq(KwtLogisticsOrderUnit::getLOrderId, logisticsOrderDTO.getLOrderId())
+                        .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
+                KwtLogisticsOrderUnit orderUnit1 = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
+                        .eq(KwtLogisticsOrderUnit::getLOrderId, logisticsOrderDTO.getLOrderId())
+                        .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
+                logisticsOrderDTO.setCarrierCompany(orderUnit1 == null ? null : orderUnit1.getFirmName());
+                logisticsOrderDTO.setConsignCompany(orderUnit == null ? null : orderUnit.getFirmName());
+                logisticsOrderDTO.setCount(waybillOrderMapper.selectCount(new LambdaQueryWrapper<KwtWaybillOrder>().eq(KwtWaybillOrder::getLOrderId, logisticsOrderDTO.getLOrderId())));
+            }
+        }
+        PageResult build = PageResult.build(page, logisticsOrderParam.getPageSize(), count, list);
+        return HttpResult.ok(build);
     }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/dubbo/TransportDubboServiceImpl.java

@@ -1,19 +1,10 @@
 package com.sckw.transport.service.dubbo;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.sckw.core.model.page.PageHelperUtil;
-import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.utils.StringUtils;
-import com.sckw.core.web.response.HttpResult;
 import com.sckw.system.api.RemoteSystemService;
-import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.transport.api.dubbo.TransportDubboService;
 import com.sckw.transport.api.model.dto.vo.KwtLogisticsOrderVO;
-import com.sckw.transport.api.model.dto.vo.LogisticsOrderDTO;
-import com.sckw.transport.api.model.param.LogisticsOrderParam;
 import com.sckw.transport.dao.KwtLogisticsOrderGoodsMapper;
 import com.sckw.transport.dao.KwtLogisticsOrderMapper;
 import com.sckw.transport.dao.KwtLogisticsOrderUnitMapper;
@@ -48,29 +39,6 @@ public class TransportDubboServiceImpl implements TransportDubboService {
     @Autowired
     private KwtLogisticsOrderGoodsMapper logisticsOrderGoodsMapper;
 
-
-    /**
-     * 获取承运订单数据
-     *
-     * @param logisticsOrderParam
-     * @return
-     */
-    @Override
-    public HttpResult getLogisticsOrderData(LogisticsOrderParam logisticsOrderParam) {
-        SysDictResDto sysDictResDto = remoteSystemService.queryDictByTypeAndValue(logisticsOrderParam.getPaymentType(), logisticsOrderParam.getPayment());
-        Long dictId = sysDictResDto.getId();
-        if (StringUtils.isNotBlank(logisticsOrderParam.getStartTime())) {
-            logisticsOrderParam.setStartTime(logisticsOrderParam.getEndTime() + " 00:00:00");
-        }
-        if (StringUtils.isNotBlank(logisticsOrderParam.getEndTime())) {
-            logisticsOrderParam.setEndTime(logisticsOrderParam.getEndTime() + " 23:59:59");
-        }
-        List<LogisticsOrderDTO> list = logisticsOrderMapper.selectLogisticOrderData(logisticsOrderParam, dictId);
-        PageHelper.startPage(logisticsOrderParam.getPage(), logisticsOrderParam.getPageSize());
-        PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
-        return HttpResult.ok(pageResult);
-    }
-
     /**
      * 对账管理-ids查询
      *

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

@@ -129,11 +129,16 @@
         a.goods_price as goodsPrice,
         a.loss ,
         a.load_amount as loadAmount,
-        a.unload_amount as unloadAmount
+        a.unload_amount as unloadAmount,
+        a.start_time as startTime,
+        a.ent_time AS entTime,
+        a.create_time AS  createTime,
+        a.create_by AS createBy,
+        a.update_by AS updateBy,
+        a.update_time AS updateTime
         FROM
         kwt_logistics_order a
         LEFT JOIN kwt_logistics_order_goods b ON a.id = b.l_order_id
-        LEFT JOIN kwt_logistics_order_goods d ON a.id = d.l_order_id
         LEFT JOIN kwt_logistics_order_contract c ON a.id=c.l_order_id
         <where>
             a.del_flag = 0
@@ -156,6 +161,39 @@
                 AND a.ent_time &lt;= #{logisticsOrderParam.endTime}
             </if>
         </where>
-        limit #{logisticsOrderParam.page,jdbcType=INTEGER},#{logisticsOrderParam.pageSize,jdbcType=INTEGER}
+        ORDER BY a.create_time DESC
+        <if test="logisticsOrderParam.page != null and logisticsOrderParam.pageSize != null ">
+            limit #{logisticsOrderParam.page,jdbcType=INTEGER},#{logisticsOrderParam.pageSize,jdbcType=INTEGER}
+        </if>
+    </select>
+    <select id="selectLogisticOrderCount" resultType="java.lang.Long">
+        SELECT
+        count(a.id)
+        FROM
+        kwt_logistics_order a
+        LEFT JOIN kwt_logistics_order_goods b ON a.id = b.l_order_id
+        LEFT JOIN kwt_logistics_order_contract c ON a.id=c.l_order_id
+        <where>
+            a.del_flag = 0
+            <if test="dictId != null and dictId != ''">
+                AND a.payment = #{dictId}
+            </if>
+            <if test="logisticsOrderParam.companyId !=null and logisticsOrderParam.companyId != ''">
+                AND d.ent_id = #{logisticsOrderParam.companyId}
+            </if>
+            <if test="logisticsOrderParam.taxRate != null and logisticsOrderParam.taxRate != ''">
+                AND a.tax_rate = #{logisticsOrderParam.taxRate}
+            </if>
+            <if test="logisticsOrderParam.goodsName != null and logisticsOrderParam.goodsName != ''">
+                AND b.goods_name LIKE concat('%',#{logisticsOrderParam.goodsName},'%')
+            </if>
+            <if test="logisticsOrderParam.startTime != null and logisticsOrderParam.startTime !=''">
+                AND a.start_time &gt;= #{logisticsOrderParam.startTime}
+            </if>
+            <if test="logisticsOrderParam.endTime != null and logisticsOrderParam.endTime !=''">
+                AND a.ent_time &lt;= #{logisticsOrderParam.endTime}
+            </if>
+        </where>
+        ORDER BY a.create_time DESC
     </select>
 </mapper>