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

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/DateUtils.java

@@ -689,6 +689,9 @@ public class DateUtils extends DateUtil {
      * @return: java.util.Date
      */
     public static Date formatDate(LocalDateTime time) {
+        if (Objects.isNull(time)) {
+            return null;
+        }
         return Date.from(time.atZone(ZoneId.systemDefault()).toInstant());
     }
 
@@ -700,6 +703,9 @@ public class DateUtils extends DateUtil {
      * @return: java.time.LocalDate
      */
     public static LocalDate dateToLocalDate(Date date) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
         return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
     }
 
@@ -712,6 +718,9 @@ public class DateUtils extends DateUtil {
      * @return: java.lang.String
      */
     public static String localDateToString(LocalDate date, String pattern) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
         DateTimeFormatter fmt = DateTimeFormatter.ofPattern(pattern);
         return date.format(fmt);
     }
@@ -724,6 +733,9 @@ public class DateUtils extends DateUtil {
      * @return: java.util.Date
      */
     public static Date localDateToDateStart(LocalDate localDate) {
+        if (Objects.isNull(localDate)) {
+            return null;
+        }
         LocalDateTime time = LocalDateTime.of(localDate, LocalTime.MIN);
         return formatDate(time);
     }
@@ -744,6 +756,9 @@ public class DateUtils extends DateUtil {
      * @date: 2023-09-27 9:52
      */
     public static Date getStartOfDay(Date date, String format) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
         String dateStr = format(date, format);
         return parse(dateStr, format);
     }
@@ -754,6 +769,9 @@ public class DateUtils extends DateUtil {
      * @date: 2023-09-27 9:52
      */
     public static Date getEndOfDay(Date date) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
         String dateStr = format(date, DATE_PATTERN);
         return parse(dateStr + " 23:59:59", DATE_TIME_PATTERN);
     }
@@ -768,7 +786,10 @@ public class DateUtils extends DateUtil {
      * @return: java.util.Date
      */
     public static Date localDateToDateEnd(LocalDate localDate) {
-        LocalDateTime time = LocalDateTime.of(localDate, LocalTime.MAX);
+        if (Objects.isNull(localDate)) {
+            return null;
+        }
+        LocalDateTime time = LocalDateTime.of(localDate, LocalTime.MAX).withNano(0);
         return formatDate(time);
     }
 }

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

@@ -9,7 +9,6 @@ import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -80,14 +79,14 @@ public class SckwTradeOrder {
     /**
      * 订单开始日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate startTime;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startTime;
 
     /**
      * 订单结束日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate endTime;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endTime;
 
     /**
      * 订单已委托量

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

@@ -262,26 +262,8 @@ public class KwfTruckController {
      **/
     @PostMapping("/findGpsByTruckNo")
     public HttpResult findGpsByTruckNo(@RequestBody @Valid GpsByTruckNoDto params) {
-        Long hours = (params.getEndTime().getTime() - params.getStartTime().getTime()) /1000/60;
+        /*Long hours = (params.getEndTime().getTime() - params.getStartTime().getTime()) /1000/60;
         List data = new ArrayList();
-        /*data.add(new HashMap(){{put("truckNo", params.getTruckNo()); put("speed", 95.0);
-            put("lng", "103.53"); put("lat", "29.48");
-            put("gpsTime", DateUtils.format(params.getStartTime(), DateUtils.DATE_TIME_PATTERN));}});
-        for (long i=0; i<hours; i++) {
-            int aaa = new Random().nextInt(10) / 3;
-            int bbb = new Random().nextInt(10) / 4;
-            data.add(new HashMap(){{
-                put("truckNo", params.getTruckNo());
-                put("speed", new Random().nextInt(100));
-                put("lat", "29.48"+new Random().nextInt(10000));
-                put("lng", "103.53"+new Random().nextInt(10000));
-                put("businessStatus", aaa == 0 ? 0 : 1);
-                put("runStatus", bbb == 0 ? 0 : bbb == 1 ? 1 : 2);
-                put("gpsTime", DateUtils.getCurrentTime());}});
-        }
-        data.add(new HashMap(){{put("truckNo", params.getTruckNo()); put("speed", 95.0);
-            put("lat", "29.48"); put("lng", "103.53");
-            put("gpsTime", DateUtils.format(params.getEndTime(), DateUtils.DATE_TIME_PATTERN));}});*/
         String str = new KwfTruckController().ReadFile();
         JSONArray array = JSON.parseArray(str);
         for (int i=0; i<array.size(); i++) {
@@ -292,8 +274,8 @@ public class KwfTruckController {
             obj.put("businessStatus", aaa == 0 ? 0 : 1);
             obj.put("runStatus", bbb == 0 ? 0 : bbb == 1 ? 1 : 2);
             data.add(obj);
-        }
-        return HttpResult.ok(data);
+        }*/
+        return HttpResult.ok(truckService.queryLocateTrack(params));
     }
 
     /**

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

@@ -971,6 +971,8 @@ public class KwfTruckService {
 
     @Value("${external.openapi.queryLocate}")
     private String queryLocate;
+    @Value("${external.openapi.queryLocateTrack}")
+    private String queryLocateTrack;
 
     /**
      * @param truckNos 车牌号
@@ -991,17 +993,14 @@ public class KwfTruckService {
 
             long begTime = System.currentTimeMillis();
             String httpResult = HttpClientUtil.post(queryLocate, JSON.toJSONString(params));
-            System.out.println(httpResult);
             long entTime = System.currentTimeMillis();
             if (StringUtils.isNotBlank(httpResult)) {
                 JSONObject result = JSONObject.parseObject(httpResult);
                 if (result.getInteger("code") != null && result.getInteger("code") != 200) {
                     return truckGpsMap;
-                } else {
-
                 }
                 JSONArray trucks = result.getJSONArray("data");
-                log.info("车牌号数量="+ truckNos.size() + " GPS数量=" + (trucks != null ? trucks.size() : 0) + " 响应时间="+(entTime - begTime));
+                //log.info("车牌号数量="+ truckNos.size() + " GPS数量=" + (trucks != null ? trucks.size() : 0) + " 响应时间="+(entTime - begTime));
                 for (int i=0; trucks != null && i < trucks.size(); i++) {
                     JSONObject truck = trucks.getJSONObject(i);
                     JSONObject locateInfo = truck.getJSONObject("locateInfo");
@@ -1021,6 +1020,83 @@ public class KwfTruckService {
         return truckGpsMap;
     }
 
+    /**
+     * @param params {truckNos 車牌號集, startTime 開始實際, endTime 結束時間}
+     * @desc 车辆查询GPS(通过车牌号查询)
+     * @author zk
+     * @date 2023/9/27
+     **/
+    public List<KwfTruckGpsVo> queryLocateTrack(GpsByTruckNoDto params) {
+        List<KwfTruckGpsVo>  truckGpsList = new ArrayList<>();
+        long page = 1, pageSize = 1000, size = 0, pages = 0;
+        Map queryParams = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
+            put("vehicleNo", params.getTruckNo());
+            put("startTime", params.getStartTime());
+            put("endTime", params.getEndTime());
+            put("page", page);
+            put("pageSize", pageSize);
+        }};
+
+        String httpResult = HttpClientUtil.post(queryLocateTrack, JSON.toJSONString(queryParams));
+        if (StringUtils.isNotBlank(httpResult)) {
+            JSONObject result = JSONObject.parseObject(httpResult);
+            if (result.getInteger("code") != null && result.getInteger("code") != 200) {
+                return truckGpsList;
+            }
+            JSONObject data = result.getJSONObject("data");
+            if (data == null) {
+                return truckGpsList;
+            }
+            size = data.getLong("size");
+            pages = size/pageSize + (size%pageSize > 0 ? 1 : 0);
+            JSONArray trucks = data.getJSONArray("list");
+            for (int i=0; trucks != null && i < trucks.size(); i++) {
+                JSONObject truck = trucks.getJSONObject(i);
+                KwfTruckGpsVo truckGps = new KwfTruckGpsVo();
+                truckGps.setLat(truck.getString("lat"));
+                truckGps.setLng(truck.getString("lng"));
+                truckGps.setSpeed(truck.getDouble("speed"));
+                truckGps.setGpsTime(truck.getString("createTime"));
+                truckGps.setRunStatus(runStatus(truckGps.getGpsTime(), truckGps.getSpeed()));
+                truckGpsList.add(truckGps);
+            }
+
+            if (pages <= 1) {
+                return truckGpsList;
+            }
+
+            for (long i=2; i <= pages; i++) {
+                queryParams.put("page", i);
+                httpResult = HttpClientUtil.post(queryLocate, JSON.toJSONString(queryParams));
+                if (StringUtils.isNotBlank(httpResult)) {
+                    result = JSONObject.parseObject(httpResult);
+                    if (result.getInteger("code") != null && result.getInteger("code") != 200) {
+                        continue;
+                    }
+                    data = result.getJSONObject("data");
+                    if (data == null) {
+                        continue;
+                    }
+                    trucks = data.getJSONArray("list");
+                    for (int j=0; trucks != null && j < trucks.size(); j++) {
+                        JSONObject truck = trucks.getJSONObject(j);
+                        KwfTruckGpsVo truckGps = new KwfTruckGpsVo();
+                        truckGps.setTruckNo(truck.getString("vehicleNo"));
+                        truckGps.setLat(truck.getString("lat"));
+                        truckGps.setLng(truck.getString("lng"));
+                        truckGps.setSpeed(truck.getDouble("speed"));
+                        truckGps.setGpsTime(truck.getString("createTime"));
+                        truckGps.setRunStatus(runStatus(truckGps.getGpsTime(), truckGps.getSpeed()));
+                        truckGpsList.add(truckGps);
+                    }
+                }
+            }
+
+        }
+        return truckGpsList;
+    }
+
+
     /**
      * @param truckNos 车牌号
      * @desc 查询车辆定位数据-单车牌号

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoProject.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * @desc: 项目管理
@@ -34,11 +34,11 @@ public class KwoProject extends BaseModel {
     /**
      * 开始日期
      */
-    private LocalDate startTime;
+    private Date startTime;
 
     /**
      * 结束日期
      */
-    private LocalDate entTime;
+    private Date entTime;
 
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrder.java

@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * @desc: 交易订单（采购订单/销售订单）
@@ -77,12 +77,12 @@ public class KwoTradeOrder extends BaseModel implements Serializable {
     /**
      * 开始日期
      */
-    private LocalDate startTime;
+    private Date startTime;
 
     /**
      * 结束日期
      */
-    private LocalDate endTime;
+    private Date endTime;
 
     /**
      * 已委托量

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTransportDemand.java

@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * @desc: 运需
@@ -62,9 +62,9 @@ public class KwoTransportDemand extends BaseModel implements Serializable {
     private String amount;
 
     /**
-     * 截止时间(yyyy-MM-dd)
+     * 截止时间
      */
-    private LocalDate deadline;
+    private Date deadline;
 
     /**
      * 联系人姓名

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

@@ -122,7 +122,10 @@ public class KwoTradeOrderService {
      */
     public void addPurchaseOrderDraft(PurchaseOrderDraftParam param) {
         KwoTradeOrder order = BeanUtils.copyProperties(param, KwoTradeOrder.class);
-        order.setEntId(LoginUserHolder.getEntId()).setTOrderNo(getOrderNo())
+        order.setEntId(LoginUserHolder.getEntId())
+                .setTOrderNo(getOrderNo())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setUnit(Objects.nonNull(param.getGoodsInfo()) ? param.getGoodsInfo().getUnit() : null)
                 .setSource(OrderSourceEnum.PURCHASE.getType()).setStatus(OrderStatusEnum.SAVED.getCode());
         kwoTradeOrderMapper.insert(order);
@@ -264,7 +267,10 @@ public class KwoTradeOrderService {
      */
     public void addValetOrderDraft(ValetOrderDraftParam param) {
         KwoTradeOrder order = BeanUtils.copyProperties(param, KwoTradeOrder.class);
-        order.setEntId(LoginUserHolder.getEntId()).setTOrderNo(getOrderNo())
+        order.setEntId(LoginUserHolder.getEntId())
+                .setTOrderNo(getOrderNo())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setUnit(Objects.nonNull(param.getGoodsInfo()) ? param.getGoodsInfo().getUnit() : null)
                 .setSource(OrderSourceEnum.SALE.getType()).setStatus(OrderStatusEnum.SAVED.getCode());
         kwoTradeOrderMapper.insert(order);
@@ -289,7 +295,10 @@ public class KwoTradeOrderService {
                 .setOrderSource(OrderSourceEnum.PURCHASE.getType());
         orderCheck(orderCheck, false);
         KwoTradeOrder order = BeanUtils.copyProperties(param, KwoTradeOrder.class);
-        order.setEntId(LoginUserHolder.getEntId()).setTOrderNo(getOrderNo())
+        order.setEntId(LoginUserHolder.getEntId())
+                .setTOrderNo(getOrderNo())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setUnit(param.getGoodsInfo().getUnit())
                 .setSource(OrderSourceEnum.PURCHASE.getType())
                 .setStatus(OrderStatusEnum.WAIT_ACCEPTED.getCode());
@@ -486,8 +495,12 @@ public class KwoTradeOrderService {
         contractCheck(contract);
         param.setContractInfo(contract);
         KwoTradeOrder order = BeanUtils.copyProperties(param, KwoTradeOrder.class);
-        order.setEntId(LoginUserHolder.getEntId()).setTOrderNo(getOrderNo())
-                .setUnit(param.getGoodsInfo().getUnit()).setSource(OrderSourceEnum.SALE.getType());
+        order.setEntId(LoginUserHolder.getEntId())
+                .setTOrderNo(getOrderNo())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
+                .setUnit(param.getGoodsInfo().getUnit())
+                .setSource(OrderSourceEnum.SALE.getType());
         String contractStatus = contract.getContractStatus();
         if (Objects.equals(contractStatus, ContractStatusEnum.WAIT_SIGNED.getCode())) {
             order.setStatus(OrderStatusEnum.WAIT_SIGNED.getCode());
@@ -769,7 +782,9 @@ public class KwoTradeOrderService {
         }
         order.setAmount(param.getAmount()).setUnit(Objects.isNull(param.getGoodsInfo()) ? null : param.getGoodsInfo().getUnit())
                 .setPrice(param.getPrice()).setTrading(param.getTrading()).setPickupType(param.getPickupType())
-                .setDeliveryType(param.getDeliveryType()).setStartTime(param.getStartTime()).setEndTime(param.getEndTime())
+                .setDeliveryType(param.getDeliveryType())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setRemark(param.getRemark());
         LambdaUpdateWrapper<KwoTradeOrder> wrapper = new LambdaUpdateWrapper<>();
         wrapper.set(KwoTradeOrder::getAmount, order.getAmount())
@@ -961,6 +976,8 @@ public class KwoTradeOrderService {
         } else {
             throw new BusinessException("Invalid contract status");
         }
+        order.setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()));
         kwoTradeOrderMapper.updateById(order);
         //更新商品价格
         kwoTradeOrderGoodsService.updateUnitPrice(param.getId(), param.getUnitPrice());
@@ -983,6 +1000,8 @@ public class KwoTradeOrderService {
         SckwTradeOrder updateParam = BeanUtils.copyProperties(param, SckwTradeOrder.class);
         updateParam.setTOrderId(param.getId())
                 .setStatus(order.getStatus())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setPrice(order.getPrice().doubleValue())
                 .setAmount(order.getAmount().doubleValue())
                 .setUnitPrice(param.getUnitPrice().doubleValue())

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

@@ -65,6 +65,7 @@ public class KwoTransportDemandService {
      */
     public void addDraft(AddTransportDemandDraftParam param) {
         KwoTransportDemand transportDemand = BeanUtils.copyProperties(param, KwoTransportDemand.class);
+        transportDemand.setDeadline(DateUtils.localDateToDateEnd(param.getDeadline()));
         transportDemand.setEntId(LoginUserHolder.getEntId()).setStatus(TransportDemandStatusEnum.SAVED.getCode());
         kwoTransportDemandMapper.insert(transportDemand);
     }
@@ -78,6 +79,7 @@ public class KwoTransportDemandService {
      */
     public void addShelves(AddTransportDemandParam param) {
         KwoTransportDemand transportDemand = BeanUtils.copyProperties(param, KwoTransportDemand.class);
+        transportDemand.setDeadline(DateUtils.localDateToDateEnd(param.getDeadline()));
         transportDemand.setEntId(LoginUserHolder.getEntId()).setStatus(TransportDemandStatusEnum.PUT_ON_SHELVES.getCode());
         kwoTransportDemandMapper.insert(transportDemand);
     }
@@ -152,7 +154,7 @@ public class KwoTransportDemandService {
                 .set(KwoTransportDemand::getTrading, param.getTrading())
                 .set(KwoTransportDemand::getPrice, param.getPrice())
                 .set(KwoTransportDemand::getAmount, param.getAmount())
-                .set(KwoTransportDemand::getDeadline, param.getDeadline())
+                .set(KwoTransportDemand::getDeadline, DateUtils.localDateToDateEnd(param.getDeadline()))
                 .set(KwoTransportDemand::getContacts, param.getContacts())
                 .set(KwoTransportDemand::getPhone, param.getPhone())
                 .set(KwoTransportDemand::getLoadAreaCode, param.getLoadAreaCode())
@@ -386,9 +388,9 @@ public class KwoTransportDemandService {
                     .setStatusLabel(statusMap.get(String.valueOf(e.getStatus())))
                     .setLoadAddress(e.getLoadAreaName() + e.getLoadDetailAddress()).setSerialNumber(String.valueOf(i.getAndIncrement()))
                     .setUnloadAddress(e.getUnloadAreaName() + e.getUnloadDetailAddress())
-                    .setDeadline(Objects.isNull(e.getDeadline()) ? null : DateUtil.dateToStr(e.getDeadline()))
-                    .setCreateTime(Objects.isNull(e.getCreateTime()) ? null : DateUtil.getDateTime(e.getCreateTime()))
-                    .setUpdateTime(Objects.isNull(e.getUpdateTime()) ? null : DateUtil.getDateTime(e.getUpdateTime()))
+                    .setDeadline(Objects.isNull(e.getDeadline()) ? null : DateUtils.format(e.getDeadline(), DateUtils.DATE_PATTERN))
+                    .setCreateTime(DateUtil.getDateTime(e.getCreateTime()))
+                    .setUpdateTime(DateUtil.getDateTime(e.getUpdateTime()))
                     .setEntName(entMap.get(e.getEntId()));
             result.add(export);
         });

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementLogisticsMapper.xml

@@ -127,6 +127,9 @@
         <if test="settlementReq.keywords != null and settlementReq.keywords != ''">
             and ( l.name like concat('%'
             , #{settlementReq.keywords,jdbcType=VARCHAR}
+            , '%')
+            or l.l_ledger_no like concat('%'
+            , #{settlementReq.keywords,jdbcType=VARCHAR}
             , '%')
                 or lu2.firm_name like concat('%'
             , #{settlementReq.keywords,jdbcType=VARCHAR}

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementTradeMapper.xml

@@ -104,6 +104,7 @@
             <if test="settlementReq.keywords != null and settlementReq.keywords != ''">
                 and (
                             klt.name like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
+                        or klt.t_ledger_no like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
                         or kltu.firm_name like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
                         or kst.st_order_no like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
                     )

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

@@ -3,6 +3,7 @@ package com.sckw.product.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.utils.CollectionUtils;
 import com.sckw.product.dao.KwpGoodsImageMapper;
 import com.sckw.product.model.KwpGoodsImage;
 import lombok.RequiredArgsConstructor;
@@ -45,7 +46,8 @@ public class KwpGoodsImageService {
         LambdaQueryWrapper<KwpGoodsImage> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwpGoodsImage::getGoodsId, goodsId).eq(KwpGoodsImage::getDelFlag, Global.NO)
                 .orderByAsc(KwpGoodsImage::getSort);
-        return kwpGoodsImageMapper.selectList(wrapper);
+        List<KwpGoodsImage> list = kwpGoodsImageMapper.selectList(wrapper);
+        return CollectionUtils.emptyIfNull(list);
     }
 
     /**

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

@@ -86,6 +86,8 @@ public class KwpGoodsService {
     private String pcGoodsListUrl;
     @Value("${goods.url.list.app}")
     private String appGoodsListUrl;
+    @Value("${filePathPrefix}")
+    private String pathPrefix;
 
 
     /**
@@ -218,7 +220,8 @@ public class KwpGoodsService {
             RecommendGoods recommendGoods = BeanUtils.copyProperties(e, RecommendGoods.class);
             List<KwpGoodsPriceRange> prices = map.get(recommendGoods.getId());
             recommendGoods.setUnitLabel(CollectionUtils.isNotEmpty(unitMap) ? unitMap.get(recommendGoods.getUnit()) : null)
-                    .setPrice(CollectionUtils.isNotEmpty(prices) ? prices.get(0).getPrice() : null);
+                    .setPrice(CollectionUtils.isNotEmpty(prices) ? prices.get(0).getPrice() : null)
+                    .setThumb(StringUtils.isNotEmpty(e.getThumb()) ? pathPrefix + e.getThumb() : null);
             recommendGoodsList.add(recommendGoods);
         });
         detail.setRecommendGoodsList(recommendGoodsList);
@@ -272,7 +275,16 @@ public class KwpGoodsService {
                 .setStatusLabel(CollectionUtils.isNotEmpty(goodsStatusMap) ? goodsStatusMap.get(String.valueOf(detail.getStatus())) : null)
                 .setPrepaidLimitLabel(Objects.equals(detail.getPrepaidLimit(), 1) ? "是" : "否");
         //商品图片信息
+        if (Objects.nonNull(goods.getThumb())) {
+            detail.setThumb(pathPrefix + goods.getThumb());
+        }
         List<KwpGoodsImage> goodsImages = kwpGoodsImageService.getByGoodsId(id);
+        goodsImages.forEach(e -> {
+            String image = e.getImage();
+            if (StringUtils.isNotEmpty(image)) {
+                e.setImage(pathPrefix + image);
+            }
+        });
         List<GoodsImagesDetail> images = BeanUtils.copyToList(goodsImages, GoodsImagesDetail.class);
         //商品价格段信息
         List<KwpGoodsPriceRange> priceRanges = kwpGoodsPriceRangeService.getByGoodsId(id);
@@ -708,6 +720,7 @@ public class KwpGoodsService {
                     .setAddress(addressMap.get(id)).setSupplyEnt(entMap.get(e.getSupplyEntId()))
                     .setManageName(Objects.nonNull(manager) ? manager.getName() : null)
                     .setPhone(Objects.nonNull(manager) ? manager.getPhone() : null)
+                    .setThumb(Objects.nonNull(e.getThumb()) ? pathPrefix + e.getThumb() : null)
                     .setCreateByName(Objects.nonNull(createUser) ? createUser.getName() : null);
             List<KwpGoodsPriceRange> priceRanges = priceRangeMap.get(id);
             if (CollectionUtils.isNotEmpty(priceRanges)) {
@@ -915,6 +928,7 @@ public class KwpGoodsService {
                     .setAddressName(Objects.isNull(address) ? null : address.getCityName())
                     .setDetailAddress(Objects.isNull(address) ? null : address.getDetailAddress())
                     .setPrice(CollectionUtils.isEmpty(priceRanges) ? null : priceRanges.get(0).getPrice())
+                    .setThumb(StringUtils.isNotEmpty(e.getThumb()) ? pathPrefix + e.getThumb() : null)
                     .setSupplyEnt(entMap.get(e.getSupplyEntId()));
             result.add(materials);
         });
@@ -992,7 +1006,11 @@ public class KwpGoodsService {
      * @return: java.util.List<com.sckw.product.model.KwpGoods>
      */
     public KwpGoods selectById(Long id) {
-        return kwpGoodsMapper.selectById(id);
+        KwpGoods goods = kwpGoodsMapper.selectById(id);
+        if (Objects.nonNull(goods) && StringUtils.isNotBlank(goods.getThumb())) {
+            goods.setThumb(pathPrefix + goods.getThumb());
+        }
+        return goods;
     }
 
 
@@ -1005,6 +1023,13 @@ public class KwpGoodsService {
      */
     public List<KwpGoods> selectByIds(List<Long> ids) {
         List<KwpGoods> list = kwpGoodsMapper.selectBatchIds(ids);
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.forEach(e -> {
+                if (StringUtils.isNotBlank(e.getThumb())) {
+                    e.setThumb(pathPrefix + e.getThumb());
+                }
+            });
+        }
         return CollectionUtils.emptyIfNull(list);
     }
 

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

@@ -7,6 +7,7 @@ import com.sckw.core.model.vo.TableStatisticRes;
 import com.sckw.core.model.vo.TableTop;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.DateUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.excel.utils.DateUtil;
@@ -470,8 +471,8 @@ public class KwOrderService {
                     .setTrading(tradeMap.get(e.getTrading()))
                     .setLoadDetailAddressInfo(loadCityName + loadDetailAddress)
                     .setUnloadDetailAddressInfo(unloadCityName + unloadDetailAddress)
-                    .setStartTime(Objects.isNull(e.getStartTime()) ? null : DateUtil.dateToStr(e.getStartTime()))
-                    .setEndTime(Objects.isNull(e.getEndTime()) ? null : DateUtil.dateToStr(e.getEndTime()))
+                    .setStartTime(Objects.isNull(e.getStartTime()) ? null : DateUtils.format(e.getStartTime(), DateUtils.DATE_PATTERN))
+                    .setEndTime(Objects.isNull(e.getEndTime()) ? null : DateUtils.format(e.getEndTime(), DateUtils.DATE_PATTERN))
                     .setCreateTime(DateUtil.getDateTime(e.getCreateTime()));
             list.add(export);
         });