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

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementLogisticsController.java

@@ -52,8 +52,8 @@ public class KwpSettlementLogisticsController {
      */
     @PostMapping(name = "运费收款-根据条件导出物流订单表数据", path = "exportCollection")
     public HttpResult exportCollection(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
-        settlementReq.setUnitType(LogisticsUnitType.CARRIER);
-        settlementReq.setUnitTypeTwo(LogisticsUnitType.SHIPPER);
+        settlementReq.setUnitType(LogisticsUnitType.SHIPPER);
+        settlementReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
         List<SettlementLogisticsDto> list;
         list = kwpSettlementLogisticsService.selectList(settlementReq);
         return this.export(response, list);
@@ -85,8 +85,8 @@ public class KwpSettlementLogisticsController {
      */
     @PostMapping(name = "运费付款-根据条件导出物流订单表数据", path = "exportPayment")
     public HttpResult exportPayment(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
-        settlementReq.setUnitType(LogisticsUnitType.SHIPPER);
-        settlementReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
+        settlementReq.setUnitType(LogisticsUnitType.CARRIER);
+        settlementReq.setUnitTypeTwo(LogisticsUnitType.SHIPPER);
         List<SettlementLogisticsDto> list;
         list = kwpSettlementLogisticsService.selectList(settlementReq);
         return this.export(response, list);

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementTradeController.java

@@ -4,14 +4,12 @@ import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.constant.TradeUnitType;
-import com.sckw.payment.model.dto.SettlementTradeDto;
 import com.sckw.payment.model.vo.req.SettlementTradeReq;
 import com.sckw.payment.model.vo.res.SettlementTradeVo;
 import com.sckw.payment.service.KwpSettlementTradeService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 结算-交易订单
@@ -91,7 +88,8 @@ public class KwpSettlementTradeController {
         settlementReq.check();
         settlementReq.setUnitType(TradeUnitType.PURCHASE);
         settlementReq.setUnitTypeTwo(TradeUnitType.SELL);
-        List<SettlementTradeDto> list = kwpSettlementTradeService.exportList(settlementReq, settlementReq.getIdList());
+        settlementReq.setEntId(LoginUserHolder.getEntId());
+        List<SettlementTradeVo> list = kwpSettlementTradeService.exportList(settlementReq, settlementReq.getIdList());
         return this.export(response, list);
     }
 
@@ -155,7 +153,7 @@ public class KwpSettlementTradeController {
         settlementReq.setUnitType(TradeUnitType.SELL);
         settlementReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
         settlementReq.setEntId(LoginUserHolder.getEntId());
-        List<SettlementTradeDto> list = kwpSettlementTradeService.exportList(settlementReq, settlementReq.getIdList());
+        List<SettlementTradeVo> list = kwpSettlementTradeService.exportList(settlementReq, settlementReq.getIdList());
         return this.export(response, list);
     }
 
@@ -165,16 +163,11 @@ public class KwpSettlementTradeController {
      * @author Aick Spt
      * @date 2023-07-24 15:49
      */
-    private HttpResult export(HttpServletResponse response, List<SettlementTradeDto> list) {
+    private HttpResult export(HttpServletResponse response, List<SettlementTradeVo> list) {
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("暂无数据，请确认");
         }
-        List<SettlementTradeVo> collect = list.stream().map(a -> {
-            SettlementTradeVo settlementTradeVo = new SettlementTradeVo();
-            BeanUtils.copyProperties(a, settlementTradeVo);
-            return settlementTradeVo;
-        }).collect(Collectors.toList());
-        ExcelUtil.downData(response, SettlementTradeVo.class, collect);
+        ExcelUtil.downData(response, SettlementTradeVo.class, list);
         return null;
     }
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpSettlementTradeMapper.java

@@ -37,6 +37,7 @@ public interface KwpSettlementTradeMapper extends BaseMapper<KwpSettlementTrade>
 
     /**
      * 运营端统计
+     *
      * @param settlementReq
      * @return
      */
@@ -46,6 +47,7 @@ public interface KwpSettlementTradeMapper extends BaseMapper<KwpSettlementTrade>
 
     /**
      * 运营端统计结算单数量
+     *
      * @param settlementReq
      * @return
      */
@@ -78,6 +80,21 @@ public interface KwpSettlementTradeMapper extends BaseMapper<KwpSettlementTrade>
 
     List<KwpSettlementRecord> queryRecord();
 
-    List<SettlementTradeDto> exportList(@Param("settlementReq")SettlementTradeReq settlementReq, @Param("idList")List<Long> idList);
-    List<SettlementTrade> operateExportList(@Param("settlementReq")SettlementTradeReq settlementReq, @Param("idList")List<Long> idList);
+    /**
+     * 导出数据查询
+     *
+     * @param settlementReq
+     * @param idList
+     * @return
+     */
+    List<SettlementTradeDto> exportList(@Param("settlementReq") SettlementTradeReq settlementReq, @Param("idList") List<Long> idList);
+
+    /**
+     * 运营端导出数据
+     *
+     * @param settlementReq
+     * @param idList
+     * @return
+     */
+    List<SettlementTrade> operateExportList(@Param("settlementReq") SettlementTradeReq settlementReq, @Param("idList") List<Long> idList);
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/SettlementTradeDto.java

@@ -103,6 +103,8 @@ public class SettlementTradeDto implements ISettlement {
     private String statusLabel;
     //客户企业名称
     private String firmName;
+    private String sellFirmName;
+    private String purchaseFirmName;
 
     /**
      * 创建人
@@ -134,6 +136,22 @@ public class SettlementTradeDto implements ISettlement {
     //百分比
     private String percentage;
 
+    public String getSellFirmName() {
+        return sellFirmName;
+    }
+
+    public void setSellFirmName(String sellFirmName) {
+        this.sellFirmName = sellFirmName;
+    }
+
+    public String getPurchaseFirmName() {
+        return purchaseFirmName;
+    }
+
+    public void setPurchaseFirmName(String purchaseFirmName) {
+        this.purchaseFirmName = purchaseFirmName;
+    }
+
     public String getContacts() {
         return contacts;
     }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/SettlementLogisticsVo.java

@@ -19,35 +19,43 @@ import java.util.Date;
 @ExcelContext(fileName = "物流结算订单列表", sheetName = "物流结算订单列表")
 public class SettlementLogisticsVo {
 
+    @ExcelProperty(value = "状态")
+    private String statusLabel;
     /**
-     * 主键
+     * 结算单编号
      */
-    @ExcelProperty(value = "主键")
-    private Long id;
+    @ExcelProperty(value = "结算单编号")
+    private String slOrderNo;
 
-    @ExcelProperty(value = "状态")
-    private String statusLabel;
     /**
-     * 对账单编号
+     * 生成时间
      */
-    @ExcelProperty(value = "对账单编号")
-    private String lLedgerNo;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "生成时间")
+    private Date createTime;
+
+    /**
+     * 客户单位
+     */
+    @ExcelProperty(value = "客户单位")
+    private String firmName;
+
     /**
      * 对账表名称
      */
     @ExcelProperty(value = "对账表名称")
     private String name;
     /**
-     * 结算单编号
+     * 对账单编号
      */
-    @ExcelProperty(value = "结算单编号")
-    private String slOrderNo;
-
+    @ExcelProperty(value = "对账单编号")
+    private String lLedgerNo;
     /**
-     * 剩余待还款
+     * 支付方式
      */
-    @ExcelProperty(value = "剩余待还款")
-    private BigDecimal waitPrice;
+    @ExcelProperty(value = "支付方式")
+    private String tradingLabel;
+
 
     /**
      * 实际应收/元
@@ -60,6 +68,11 @@ public class SettlementLogisticsVo {
      */
     @ExcelProperty(value = "当前收款/元")
     private BigDecimal actualPrice;
+    /**
+     * 剩余待还款
+     */
+    @ExcelProperty(value = "剩余待还款")
+    private BigDecimal waitPrice;
 
     /**
      * 预计收款日期
@@ -74,11 +87,6 @@ public class SettlementLogisticsVo {
 
     @ExcelProperty(value = "联系电话")
     private String phone;
-    /**
-     * 备注
-     */
-    @ExcelProperty(value = "备注")
-    private String remark;
 
     /**
      * 变更人
@@ -86,26 +94,9 @@ public class SettlementLogisticsVo {
     @ExcelProperty(value = "变更人")
     private String updateByLabel;
 
-    /**
-     * 生成时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ExcelProperty(value = "生成时间")
-    private Date createTime;
 
 
-    /**
-     * 交易方式
-     */
-    @ExcelProperty(value = "交易方式")
-    private String tradingLabel;
 
 
-    /**
-     * 客户单位
-     */
-    @ExcelProperty(value = "客户单位")
-    private String firmName;
-
 
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/SettlementTradeVo.java

@@ -19,35 +19,44 @@ import java.util.Date;
 @Setter
 @ExcelContext(fileName = "贸易结算订单列表", sheetName = "贸易结算订单列表")
 public class SettlementTradeVo {
-    /**
-     * 主键
-     */
-    @ExcelProperty(value = "主键")
-    private Long id;
 
+
+    @ExcelProperty(value = "状态")
+    private String statusLabel;
     /**
      * 结算单编号
      */
     @ExcelProperty(value = "结算单编号")
     private String stOrderNo;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "生成时间")
+    private Date createTime;
+    /**
+     * 客户名称
+     */
+    @ExcelProperty(value = "客户名称")
+    private String firmName;
 
     /**
      * 名称
      */
-    @ExcelProperty(value = "名称")
+    @ExcelProperty(value = "对账表名称")
     private String name;
-
     /**
-     * 对账金额
+     * 对账单编号
      */
-    @ExcelProperty(value = "对账金额")
-    private BigDecimal totalPrice;
+    @ExcelProperty(value = "对账单编号")
+    private String tLedgerNo;
 
     /**
-     * 已收账款
+     * 支付方式
      */
-    @ExcelProperty(value = "已收账款")
-    private BigDecimal actualPrice;
+    @ExcelProperty(value = "支付方式")
+    private String tradingLabel;
+
 
     /**
      * 预计收款日期
@@ -57,105 +66,38 @@ public class SettlementTradeVo {
     private Date receiptTime;
 
     /**
-     * 备注
+     * 联系人
      */
-    @ExcelProperty(value = "备注")
-    private String remark;
+    @ExcelProperty(value = "联系人")
+    private String contacts;
 
     /**
-     * 对账托运方财务联系人
+     * 联系电话
      */
-    @ExcelProperty(value = "对账托运方财务联系人")
-    private String auditUser;
+    @ExcelProperty(value = "联系电话")
+    private String phone;
 
-    /**
-     * 对账托运方财务联系人电话
-     */
-    @ExcelProperty(value = "对账托运方财务联系人电话")
-    private String auditPhone;
 
     /**
-     * 对账承运方财务联系人
+     * 实际应收/元
      */
-    @ExcelProperty(value = "对账承运方财务联系人")
-    private String successUser;
-
-    /**
-     * 对账承运方财务联系人电话
-     */
-    @ExcelProperty(value = "对账承运方财务联系人电话")
-    private String successPhone;
-
-
-    @ExcelProperty(value = "状态")
-    private String statusLabel;
+    @ExcelProperty(value = "实际应收/元")
+    private BigDecimal totalPrice;
 
     /**
-     * 创建人名称
+     * 当前收款/元
      */
-    @ExcelProperty(value = "创建人名称")
-    private String createByLabel;
-
+    @ExcelProperty(value = "当前收款/元")
+    private BigDecimal actualPrice;
     /**
-     * 创建时间
+     * 剩余待还款
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ExcelProperty(value = "创建时间")
-    private Date createTime;
-
+    @ExcelProperty(value = "剩余待还款")
+    private BigDecimal waitPrice;
 
     /**
-     * 更新人名称
+     * 变更人
      */
-    @ExcelProperty(value = "更新人名称")
+    @ExcelProperty(value = "变更人")
     private String updateByLabel;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ExcelProperty(value = "更新时间")
-    private Date updateTime;
-
-
-    /**
-     * 对账单名称
-     */
-    @ExcelProperty(value = "对账单名称")
-    private String ledgerName;
-
-
-    /**
-     * 交易方式
-     */
-    @ExcelProperty(value = "交易方式")
-    private String trading;
-
-    /**
-     * 对账单编号
-     */
-    @ExcelProperty(value = "对账单编号")
-    private String lLedgerNo;
-
-
-    /**
-     * 客户名称
-     */
-    @ExcelProperty(value = "客户名称")
-    private String firmName;
-
-
-    /**
-     * 实际应收还款
-     */
-    @ExcelProperty(value = "实际应收还款")
-    private BigDecimal ledgerSettlePrice;
-
-    /**
-     * 剩余待还款
-     */
-    @ExcelProperty(value = "剩余待还款")
-    private BigDecimal residuePrice;
-
-
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementTradeService.java

@@ -19,6 +19,7 @@ import com.sckw.payment.model.dto.*;
 import com.sckw.payment.model.vo.SettlementVo;
 import com.sckw.payment.model.vo.req.SettlementTradeReq;
 import com.sckw.payment.model.vo.res.SettlementSumVo;
+import com.sckw.payment.model.vo.res.SettlementTradeVo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
@@ -87,7 +88,7 @@ public class KwpSettlementTradeService {
      *
      * @param list 结算单列表数据
      */
-    private void changeDict(List<ISettlement> list) {
+    private void changeDict(List<? extends ISettlement> list) {
         //字典等数据转换
         Map<String, SysDictResDto> dictResDtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.TRADE_TYPE.getType());
         for (ISettlement iSettlement : list) {
@@ -265,10 +266,10 @@ public class KwpSettlementTradeService {
         Integer payType = TradingEnum.getPrefix(trading);
         List<SettlementVo> settlementVoList = new ArrayList<>();
         if (Objects.nonNull(payType)) {
-            if(payType==TradingEnum.OFFLINE_PAY.getStatus()){
+            if (payType == TradingEnum.OFFLINE_PAY.getStatus()) {
                 settlementVoList = kwpSettlementOfflineService.queryList(id, SettlementOrderTypeEnum.TRADE.getStatus(), payType);
 
-            }else {
+            } else {
                 settlementVoList = kwpSettlementWalletService.queryList(id, SettlementOrderTypeEnum.TRADE.getStatus(), payType);
             }
         }
@@ -285,7 +286,30 @@ public class KwpSettlementTradeService {
         return settlementTradeMapper.sumMoneyType(entId, cur, pre, unitType);
     }
 
-    public List<SettlementTradeDto> exportList(SettlementTradeReq settlementReq, List<Long> idList) {
-        return settlementTradeMapper.exportList(settlementReq,idList);
+    /**
+     * 管理端导出数据
+     *
+     * @param settlementReq
+     * @param idList
+     * @return
+     */
+    public List<SettlementTradeVo> exportList(SettlementTradeReq settlementReq, List<Long> idList) {
+        List<SettlementTradeDto> settlementTradeDtos = settlementTradeMapper.exportList(settlementReq, idList);
+        if (CollectionUtils.isEmpty(settlementTradeDtos)) {
+            return null;
+        }
+        changeDict(settlementTradeDtos);
+        List<SettlementTradeVo> res = new ArrayList<>();
+        SettlementTradeVo settlementTradeVo;
+        for (SettlementTradeDto settlementTradeDto : settlementTradeDtos) {
+            settlementTradeVo = new SettlementTradeVo();
+            BeanUtils.copyProperties(settlementTradeDto, settlementTradeVo);
+            UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(settlementTradeDto.getUpdateBy());
+            if (Objects.nonNull(userCacheResDto)) {
+                settlementTradeVo.setUpdateByLabel(userCacheResDto.getName());
+            }
+            res.add(settlementTradeVo);
+        }
+        return res;
     }
 }

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

@@ -505,7 +505,6 @@
                kst.status,
                kst.st_order_no,
                klt.t_ledger_no                                    tLedgerNo,
-               kst.create_time,
                kst.receipt_time,
                cast(kst.actual_price as char)                     actualPrice,
                cast(kst.total_price as char)                      totalPrice,
@@ -516,13 +515,13 @@
                (case
                     when #{settlementReq.unitType,jdbcType=INTEGER} = 1 then klt.audit_phone
                     else klt.success_phone end) as                phone,
-               kst.create_time,
-               kst.t_ledger_id,
-               klt.id                                             ledgerId,
+               kst.create_by                                      createBy,
+               kst.update_by                                      updateBy,
+               kst.create_time                                    createTime,
+               kst.update_time                                    updateTime,
                klt.name,
                klt.trading,
-               kltu.firm_name                                     firmName,
-               kst.update_by
+               kltu.firm_name                                     firmName
         from kwp_settlement_trade kst
                  inner join kwp_ledger_trade klt on kst.t_ledger_id = klt.id and klt.del_flag = 0
                  inner join kwp_ledger_trade_unit kltu on klt.id = kltu.t_ledger_id and kltu.del_flag = 0 and

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

@@ -14,10 +14,7 @@ import com.sckw.core.model.page.PageResult;
 import com.sckw.core.model.vo.TableBottom;
 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.NumberUtils;
-import com.sckw.core.utils.StringUtils;
+import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.excel.utils.DateUtil;
@@ -105,7 +102,8 @@ public class KwpGoodsService {
         if (Objects.nonNull(address)) {
             goods.setAreaCode(address.getCityCode()).setAddressName(address.getName());
         }
-        goods.setEntId(LoginUserHolder.getEntId()).setStatus(GoodsStatusEnum.SAVED.getCode());
+        goods.setEntId(LoginUserHolder.getEntId()).setThumb(FileUtils.replaceAll(goods.getThumb()))
+                .setStatus(GoodsStatusEnum.SAVED.getCode());
         kwpGoodsMapper.insert(goods);
         //添加商品其他信息
         addGoodsOtherInfo(goods.getId(), BeanUtils.copyProperties(param, AddGoodsParam.class));
@@ -130,7 +128,8 @@ public class KwpGoodsService {
         KwpGoods goods = BeanUtils.copyProperties(param, KwpGoods.class);
         AddressInfo address = param.getAddressInfo();
         goods.setCode(NumberUtils.createRandomVcode()).setAreaCode(address.getCityCode()).setAddressName(address.getName())
-                .setEntId(LoginUserHolder.getEntId()).setAddedTime(new Date()).setStatus(GoodsStatusEnum.PUT_ON_SHELVES.getCode());
+                .setThumb(FileUtils.replaceAll(goods.getThumb())).setEntId(LoginUserHolder.getEntId())
+                .setAddedTime(new Date()).setStatus(GoodsStatusEnum.PUT_ON_SHELVES.getCode());
         kwpGoodsMapper.insert(goods);
         //添加商品其他信息
         addGoodsOtherInfo(goods.getId(), param);
@@ -168,6 +167,7 @@ public class KwpGoodsService {
             List<KwpGoodsImage> list = new ArrayList<>(images.size());
             images.forEach(e -> {
                 KwpGoodsImage image = BeanUtils.copyProperties(e, KwpGoodsImage.class);
+                image.setImage(FileUtils.replaceAll(e.getImage()));
                 image.setGoodsId(goodsId);
                 list.add(image);
             });
@@ -217,7 +217,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(FileUtils.splice(e.getThumb()));
             recommendGoodsList.add(recommendGoods);
         });
         detail.setRecommendGoodsList(recommendGoodsList);
@@ -271,7 +272,13 @@ 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(FileUtils.splice(goods.getThumb()));
+        }
         List<KwpGoodsImage> goodsImages = kwpGoodsImageService.getByGoodsId(id);
+        goodsImages.forEach(e -> {
+            e.setImage(FileUtils.splice(e.getImage()));
+        });
         List<GoodsImagesDetail> images = BeanUtils.copyToList(goodsImages, GoodsImagesDetail.class);
         //商品价格段信息
         List<KwpGoodsPriceRange> priceRanges = kwpGoodsPriceRangeService.getByGoodsId(id);
@@ -337,7 +344,7 @@ public class KwpGoodsService {
                 .set(KwpGoods::getSupplyEntId, param.getSupplyEntId())
                 .set(KwpGoods::getManager, param.getManager())
                 .set(KwpGoods::getRemark, param.getRemark())
-                .set(KwpGoods::getThumb, param.getThumb())
+                .set(KwpGoods::getThumb, FileUtils.replaceAll(param.getThumb()))
                 .set(KwpGoods::getAreaCode, areaCode)
                 .set(KwpGoods::getAddressName, addressName)
                 .eq(KwpGoods::getId, param.getId());
@@ -380,7 +387,7 @@ public class KwpGoodsService {
             List<KwpGoodsImage> list = new ArrayList<>(param.getImages().size());
             param.getImages().forEach(e -> {
                 KwpGoodsImage image = BeanUtils.copyProperties(e, KwpGoodsImage.class);
-                image.setGoodsId(goodsId);
+                image.setGoodsId(goodsId).setImage(FileUtils.replaceAll(image.getImage()));
                 list.add(image);
             });
             kwpGoodsImageService.insertBatch(list);
@@ -705,6 +712,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(FileUtils.splice(e.getThumb()))
                     .setCreateByName(Objects.nonNull(createUser) ? createUser.getName() : null);
             List<KwpGoodsPriceRange> priceRanges = priceRangeMap.get(id);
             if (CollectionUtils.isNotEmpty(priceRanges)) {
@@ -912,6 +920,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(FileUtils.splice(e.getThumb()))
                     .setSupplyEnt(entMap.get(e.getSupplyEntId()));
             result.add(materials);
         });
@@ -989,7 +998,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)) {
+            goods.setThumb(FileUtils.splice(goods.getThumb()));
+        }
+        return goods;
     }
 
 
@@ -1002,6 +1015,11 @@ public class KwpGoodsService {
      */
     public List<KwpGoods> selectByIds(List<Long> ids) {
         List<KwpGoods> list = kwpGoodsMapper.selectBatchIds(ids);
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.forEach(e -> {
+                e.setThumb(FileUtils.splice(e.getThumb()));
+            });
+        }
         return CollectionUtils.emptyIfNull(list);
     }
 

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

@@ -39,6 +39,7 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.ParseException;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -485,6 +486,8 @@ public class KwTransportService {
                     null : waybillOrder.getWOrderNo());
             vo.setWOrderId(waybillOrder.getWOrderId() == null ?
                     String.valueOf(waybillOrder.get_id()) : String.valueOf(waybillOrder.getWOrderId()));
+            vo.setLOrderNo(waybillOrder.getLOrderNo() == null ?
+                    null : waybillOrder.getLOrderNo());
             vo.setTruckNo(waybillOrder.getTruckNo());
             vo.setDriverName(waybillOrder.getDriverName() == null ?
                     null : String.valueOf(waybillOrder.getDriverName()));
@@ -568,7 +571,7 @@ public class KwTransportService {
                 }
             }
             // 实际扣亏量
-            vo.setDeficitRealAmount(lossAmount.setScale(2).toString());
+            vo.setDeficitRealAmount(lossAmount.setScale(2, RoundingMode.HALF_UP).toString());
             vo.setGoodsPriceUnit(waybillOrder.getGoodsPriceUnit() == null ?
                     null : String.valueOf(waybillOrder.getGoodsPriceUnit()));
             returnList.add(vo);

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/CarWaybillVo.java

@@ -21,17 +21,23 @@ public class CarWaybillVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 4526063761808958350L;
     /**
-     * 物流订单id
+     * 运单id
      */
     @JsonProperty(value="wOrderId")
     private String wOrderId;
 
     /**
-     * 物流订单号
+     * 运单号
      */
     @JsonProperty(value="wOrderNo")
     private String wOrderNo;
 
+    /**
+     * 物流订单号
+     */
+    @JsonProperty(value="lOrderNo")
+    private String lOrderNo;
+
     /**
      * 车辆牌照
      */

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

@@ -722,7 +722,7 @@ public class TransportCommonService {
         /**运价方式*/
 //        Map<String, String> priceDictData = getDictData(DictTypeEnum.PRICE_TYPE.getType());
         /**计费方式*/
-//        Map<String, String> chargingDictData = getDictData(DictTypeEnum.CHARGING_TYPE.getType());
+        Map<String, String> chargingDictData = getDictData(DictTypeEnum.CHARGING_TYPE.getType());
         /**结算周期*/
         Map<String, String> settlementDictData = getDictData(DictTypeEnum.SETTLEMENT_CYCLE.getType());
         /**签约方式*/
@@ -731,6 +731,7 @@ public class TransportCommonService {
         Map<String, String> taxRateTypeDictData = getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
         if (CollectionUtils.isNotEmpty(list)) {
             for (SckwLogisticsOrderVO vo : list) {
+                vo.setBillingModeLabel(chargingDictData==null?null:chargingDictData.get(vo.getBillingMode()));
                 vo.setPaymentLabel(vo.getPayment() == null ? null : tradeTypeDictData.get(vo.getPayment().toString()));
                 vo.setStatusLabel(LogisticsOrderEnum.getDestination(vo.getStatus()));
                 vo.setLossUnitLabel(vo.getLossUnit() == null ? null : taxRateTypeDictData.get(vo.getLossUnit()));

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

@@ -222,7 +222,8 @@
         a.create_time AS createTime,
         f.contract_id AS contractId,
         a.amount AS amount,
-        c.detail_address as unloadDetailAddress
+        c.detail_address as unloadDetailAddress,
+        a.billing_mode as billingMode
         FROM
         kwt_logistics_order a
         LEFT JOIN kwt_logistics_order_address b ON a.id = b.l_order_id