donglang 10 часов назад
Родитель
Сommit
f47cb7fe4d

+ 2 - 2
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/ParkingWalletFeeResp.java

@@ -32,7 +32,7 @@ public class ParkingWalletFeeResp implements Serializable {
     /**
     /**
      * 采购商企业名称
      * 采购商企业名称
      */
      */
-    private Long proEntName;
+    private String proEntName;
 
 
     /**
     /**
      * 平台企业id
      * 平台企业id
@@ -42,7 +42,7 @@ public class ParkingWalletFeeResp implements Serializable {
     /**
     /**
      * 平台企业名称
      * 平台企业名称
      */
      */
-    private Long supEntName;
+    private String supEntName;
 
 
     /**
     /**
      * 服务费余额
      * 服务费余额

+ 2 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ParkingWalletFeeService.java

@@ -116,6 +116,7 @@ public class ParkingWalletFeeService {
         ParkingWalletFeeResp resp = new ParkingWalletFeeResp();
         ParkingWalletFeeResp resp = new ParkingWalletFeeResp();
         resp.setServiceFeeBalance(fee.getServiceFeeBalance() != null ? fee.getServiceFeeBalance() : BigDecimal.ZERO);
         resp.setServiceFeeBalance(fee.getServiceFeeBalance() != null ? fee.getServiceFeeBalance() : BigDecimal.ZERO);
         resp.setTradingAmount(fee.getTradingAmount() != null ? fee.getTradingAmount() : BigDecimal.ZERO);
         resp.setTradingAmount(fee.getTradingAmount() != null ? fee.getTradingAmount() : BigDecimal.ZERO);
+        resp.setProEntName(getEntName(fee.getProEntId()));
         log.info("汇总采购商服务费结束,总余额:{}, 总履约中金额:{}", fee.getServiceFeeBalance(), fee.getTradingAmount());
         log.info("汇总采购商服务费结束,总余额:{}, 总履约中金额:{}", fee.getServiceFeeBalance(), fee.getTradingAmount());
         return resp;
         return resp;
 
 
@@ -138,6 +139,7 @@ public class ParkingWalletFeeService {
         ParkingWalletFeeResp resp = new ParkingWalletFeeResp();
         ParkingWalletFeeResp resp = new ParkingWalletFeeResp();
         resp.setServiceFeeBalance(totalServiceFee);
         resp.setServiceFeeBalance(totalServiceFee);
         resp.setTradingAmount(totalTradingAmount);
         resp.setTradingAmount(totalTradingAmount);
+        resp.setSupEntName(getEntName(feeList.get(0).getSupEntId()));
         log.info("汇总平台服务费结束,总余额:{}, 总履约中金额:{}", totalServiceFee, totalTradingAmount);
         log.info("汇总平台服务费结束,总余额:{}, 总履约中金额:{}", totalServiceFee, totalTradingAmount);
         return resp;
         return resp;
     }
     }