From 639edf8ee06b67e68b2cf242b4c95c036b139e08 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 24 八月 2024 16:49:23 +0800
Subject: [PATCH] 计费修改,支付修改
---
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml | 7 +++++--
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java | 2 +-
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/PaymentResp.java | 2 +-
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/PaymentReq.java | 2 +-
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/RefundReq.java | 2 +-
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/RefundResp.java | 2 +-
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java | 6 +++---
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/QueryResp.java | 2 +-
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/QueryRefundReq.java | 2 +-
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/QueryRefundResp.java | 2 +-
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java | 2 +-
11 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/PaymentReq.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/PaymentReq.java
similarity index 96%
rename from ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/PaymentReq.java
rename to ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/PaymentReq.java
index 422f4b1..9d067aa 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/PaymentReq.java
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/PaymentReq.java
@@ -1,4 +1,4 @@
-package com.ruoyi.payment.ali.v2.model;
+package com.ruoyi.payment.api.model;
import lombok.Data;
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/PaymentResp.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/PaymentResp.java
similarity index 92%
rename from ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/PaymentResp.java
rename to ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/PaymentResp.java
index de77d29..5d5adf4 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/PaymentResp.java
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/PaymentResp.java
@@ -1,4 +1,4 @@
-package com.ruoyi.payment.ali.v2.model;
+package com.ruoyi.payment.api.model;
import lombok.Data;
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/QueryRefundReq.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/QueryRefundReq.java
similarity index 85%
rename from ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/QueryRefundReq.java
rename to ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/QueryRefundReq.java
index bb74d63..bc9f510 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/QueryRefundReq.java
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/QueryRefundReq.java
@@ -1,4 +1,4 @@
-package com.ruoyi.payment.ali.v2.model;
+package com.ruoyi.payment.api.model;
import lombok.Data;
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/QueryRefundResp.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/QueryRefundResp.java
similarity index 95%
rename from ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/QueryRefundResp.java
rename to ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/QueryRefundResp.java
index ad4263f..5293c35 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/QueryRefundResp.java
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/QueryRefundResp.java
@@ -1,4 +1,4 @@
-package com.ruoyi.payment.ali.v2.model;
+package com.ruoyi.payment.api.model;
import com.fasterxml.jackson.annotation.JsonSetter;
import lombok.Data;
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/QueryResp.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/QueryResp.java
similarity index 95%
rename from ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/QueryResp.java
rename to ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/QueryResp.java
index c09e509..5a81353 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/QueryResp.java
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/QueryResp.java
@@ -1,4 +1,4 @@
-package com.ruoyi.payment.ali.v2.model;
+package com.ruoyi.payment.api.model;
import com.fasterxml.jackson.annotation.JsonSetter;
import lombok.Data;
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/RefundReq.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/RefundReq.java
similarity index 89%
rename from ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/RefundReq.java
rename to ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/RefundReq.java
index a887e52..bee762f 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/RefundReq.java
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/RefundReq.java
@@ -1,4 +1,4 @@
-package com.ruoyi.payment.ali.v2.model;
+package com.ruoyi.payment.api.model;
import lombok.Data;
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/RefundResp.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/RefundResp.java
similarity index 90%
rename from ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/RefundResp.java
rename to ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/RefundResp.java
index ed4697c..e6e4670 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/RefundResp.java
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/RefundResp.java
@@ -1,4 +1,4 @@
-package com.ruoyi.payment.ali.v2.model;
+package com.ruoyi.payment.api.model;
import com.fasterxml.jackson.annotation.JsonSetter;
import lombok.Data;
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
index 7f1536b..770aeb7 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
@@ -65,7 +65,7 @@
Long userId = tokenService.getLoginUserApplet().getUserId();
// 根据id查询用户信息
TAppUser appUser = appUserClient.getUserById(userId).getData();
- if(Objects.nonNull(appUser) && Objects.nonNull(appUser.getVipId())){
+ if(Objects.nonNull(appUser)){
// 查询会员信息
TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
TAccountingStrategyDetailVO accountingStrategyDetailVO;
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
index 8bf52f8..d36aaf4 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
@@ -109,7 +109,7 @@
ts.id, ts.partner_id, ts.code, ts.`name`, ts.site_type, ts.business_category, ts.status, ts.construction_site, ts.img_url,
ts.lon, ts.lat, ts.address, ts.country_code, ts.phone,ts.guide, ts.service_description, ts.vehicle_description,
ts.parking_space, ts.rate_description, ts.space_charge_explain, ts.accounting_strategy_id,ts.del_flag,tcg.fastCount,
- tcg.slowCount,tcg.superCount,tasd.electrovalence,tasd.vipElectrovalence,
+ tcg.slowCount,tcg.superCount,tasd.electrovalence,tasd.vipElectrovalence,tcg.superFreeCount,tcg.fastFreeCount,tcg.slowFreeCount,
ROUND(
6378.138 * 2 * ASIN(
SQRT(
@@ -136,7 +136,10 @@
select site_id,
SUM(CASE WHEN charge_mode = 1 THEN 1 ELSE 0 END) AS superCount,
SUM(CASE WHEN charge_mode = 2 THEN 1 ELSE 0 END) AS fastCount,
- SUM(CASE WHEN charge_mode = 3 THEN 1 ELSE 0 END) AS slowCount
+ SUM(CASE WHEN charge_mode = 3 THEN 1 ELSE 0 END) AS slowCount,
+ SUM(CASE WHEN charge_mode = 1 and `status` = 2 THEN 1 ELSE 0 END) AS superFreeCount,
+ SUM(CASE WHEN charge_mode = 2 and `status` = 2 THEN 1 ELSE 0 END) AS fastFreeCount,
+ SUM(CASE WHEN charge_mode = 3 and `status` = 2 THEN 1 ELSE 0 END) AS slowFreeCount
from
t_charging_gun
where
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
index c116fdc..5fcab95 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
@@ -9,7 +9,7 @@
import com.alipay.api.response.*;
import com.ruoyi.payment.ali.config.AliProperties;
import com.ruoyi.payment.ali.config.SignType;
-import com.ruoyi.payment.ali.v2.model.*;
+import com.ruoyi.payment.api.model.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java
index 4bd7ea5..38bf74f 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java
@@ -3,9 +3,9 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.payment.ali.config.AliProperties;
import com.ruoyi.payment.ali.v2.AppletPayUtil;
-import com.ruoyi.payment.ali.v2.model.PaymentReq;
-import com.ruoyi.payment.ali.v2.model.PaymentResp;
-import com.ruoyi.payment.ali.v2.model.QueryResp;
+import com.ruoyi.payment.api.model.PaymentReq;
+import com.ruoyi.payment.api.model.PaymentResp;
+import com.ruoyi.payment.api.model.QueryResp;
import com.ruoyi.payment.api.vo.AliPaymentReq;
import com.ruoyi.payment.api.vo.AliPaymentResp;
import com.ruoyi.payment.api.vo.AliQueryOrder;
--
Gitblit v1.7.1