对账查询bugfix

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

@@ -141,6 +141,11 @@ public class LogisticsOrderDTO implements Serializable {
      */
     private BigDecimal price;
 
+    /**
+     * 运价
+     */
+    private String priceType;
+
     /**
      * 运价方式
      */
@@ -239,13 +244,13 @@ public class LogisticsOrderDTO implements Serializable {
     /**
      * 计划发货时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate startTime;
 
     /**
      * 计划收货时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate endTime;
 
     /**
@@ -271,6 +276,6 @@ public class LogisticsOrderDTO implements Serializable {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
     private Date createTime;
 }

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

@@ -141,6 +141,8 @@ public class LogisticsOrderVO implements Serializable {
      */
     private BigDecimal price;
 
+    private String priceType;
+
     /**
      * 运价方式
      */
@@ -239,13 +241,13 @@ public class LogisticsOrderVO implements Serializable {
     /**
      * 计划发货时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate startTime;
 
     /**
      * 计划收货时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate endTime;
 
     /**
@@ -271,6 +273,6 @@ public class LogisticsOrderVO implements Serializable {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
     private Date createTime;
 }

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

@@ -51,7 +51,7 @@ import java.util.stream.Collectors;
 @Service
 public class TransportCommonService {
 
-    @DubboReference(version = "2.0.0", group = "design", check = false,timeout = 10000)
+    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 10000)
     RemoteSystemService remoteSystemService;
 
     @DubboReference(version = "2.0.0", group = "design", check = false)
@@ -320,7 +320,7 @@ public class TransportCommonService {
      */
     public HttpResult getAcceptCarriageOrder(LogisticsOrderParam logisticsOrderParam) {
         SysDictResDto sysDictResDto = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.TRADE_TYPE.getType(), logisticsOrderParam.getPayment());
-        String dictValue = sysDictResDto.getValue();
+        String dictValue = sysDictResDto == null ? null : sysDictResDto.getValue();
         if (StringUtils.isNotBlank(logisticsOrderParam.getStartTime())) {
             logisticsOrderParam.setStartTime(logisticsOrderParam.getStartTime() + " 00:00:00");
         }
@@ -329,7 +329,7 @@ public class TransportCommonService {
         }
         Integer page = logisticsOrderParam.getPage();
         logisticsOrderParam.setPage((logisticsOrderParam.getPage() - 1) * logisticsOrderParam.getPageSize());
-        List<LogisticsOrderVO> list = logisticsOrderMapper.selectLogisticOrderData(logisticsOrderParam, dictValue,LoginUserHolder.getEntId());
+        List<LogisticsOrderVO> list = logisticsOrderMapper.selectLogisticOrderData(logisticsOrderParam, dictValue, LoginUserHolder.getEntId());
         Long count = logisticsOrderMapper.selectLogisticOrderCount(logisticsOrderParam, dictValue);
         /**计量单位*/
         Map<String, String> unitTypeDictData = getDictData(DictTypeEnum.UNIT_TYPE.getType());
@@ -375,7 +375,7 @@ public class TransportCommonService {
                 logisticsOrderDTO.setConsignContacts(consignOrderUnit == null ? null : consignOrderUnit.getContacts());
                 logisticsOrderDTO.setSettlementCycleLabel(settlementDictData.get(logisticsOrderDTO.getSettlementCycle().toString()));
                 logisticsOrderDTO.setBillingModeLabel(chargingDictData.get(logisticsOrderDTO.getBillingMode()));
-                logisticsOrderDTO.setPriceLabel(priceDictData.get(logisticsOrderDTO.getPayment()));
+                logisticsOrderDTO.setPriceLabel(priceDictData.get(logisticsOrderDTO.getPriceType()));
                 logisticsOrderDTO.setLossUnitLabel(taxRateTypeDictData.get(logisticsOrderDTO.getLossUnit()));
                 logisticsOrderDTO.setAmountLabel(unitTypeDictData.get(logisticsOrderDTO.getUnit()));
                 logisticsOrderDTO.setIgnoreAmountLabel(unitTypeDictData.get(logisticsOrderDTO.getUnit()));
@@ -386,7 +386,7 @@ public class TransportCommonService {
         return HttpResult.ok(build);
     }
 
-    public Map<String, String> getDictData (String type) {
+    public Map<String, String> getDictData(String type) {
         Map<String, String> maps = new HashMap<>(NumberConstant.SIXTEEN);
         List<SysDictResDto> list = remoteSystemService.queryDictByType(type);
         if (CollectionUtils.isNotEmpty(list)) {

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

@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
-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;
 import com.sckw.core.web.response.HttpResult;
@@ -21,12 +19,12 @@ import com.sckw.transport.api.model.dto.AddressResDTO;
 import com.sckw.transport.api.model.dto.LogisticsOrderDTO;
 import com.sckw.transport.api.model.param.LogisticsOrderParam;
 import com.sckw.transport.api.model.vo.KwtLogisticsOrderVO;
-import com.sckw.transport.api.model.vo.LogisticsOrderVO;
-import com.sckw.transport.dao.*;
+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.KwtLogisticsOrderAddress;
 import com.sckw.transport.model.KwtLogisticsOrderUnit;
-import com.sckw.transport.model.KwtWaybillOrder;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -134,7 +132,7 @@ public class TransportDubboServiceImpl implements TransportDubboService {
                 logisticsOrderDTO.setConsignContacts(consignOrderUnit == null ? null : consignOrderUnit.getContacts());
                 logisticsOrderDTO.setSettlementCycleLabel(settlementDictData.get(logisticsOrderDTO.getSettlementCycle().toString()));
                 logisticsOrderDTO.setBillingModeLabel(chargingDictData.get(logisticsOrderDTO.getBillingMode()));
-                logisticsOrderDTO.setPriceLabel(priceDictData.get(logisticsOrderDTO.getPayment()));
+                logisticsOrderDTO.setPriceLabel(priceDictData.get(logisticsOrderDTO.getPriceType()));
                 logisticsOrderDTO.setLossUnitLabel(taxRateTypeDictData.get(logisticsOrderDTO.getLossUnit()));
                 logisticsOrderDTO.setAmountLabel(unitTypeDictData.get(logisticsOrderDTO.getUnit()));
                 logisticsOrderDTO.setIgnoreAmountLabel(unitTypeDictData.get(logisticsOrderDTO.getUnit()));

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

@@ -122,7 +122,7 @@
         a.unit ,
         a.ignore_amount AS ignoreAmount,
         a.price,
-        a.price_type,
+        a.price_type as priceType,
         a.goods_price AS goodsPrice,
         a.loss,
         a.loss_unit AS lossUnit,
@@ -425,7 +425,7 @@
         a.unit ,
         a.ignore_amount AS ignoreAmount,
         a.price,
-        a.price_type,
+        a.price_type as priceType,
         a.goods_price AS goodsPrice,
         a.loss,
         a.loss_unit AS lossUnit,