yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改终端名称，支付宝、微信回调配置

Browse Source
This commit is contained in:
yuyang 2021-10-11 14:45:07 +08:00
parent 3be03ebded
commit ce309e5feb
11 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xhpc-modules/xhpc-charging-station/pom.xml
View File

@ -139,15 +139,22 @@
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.4.0</version>
<!--指定Maven打包目录位置-->
<configuration>
<outputDirectory>/project/jar/Cloud_jar</outputDirectory>
</configuration>
<executions>
<execution>
<goals>

2
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java
View File

@ -109,7 +109,7 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService {
XhpcTerminal xhpcTerminal = new XhpcTerminal();
xhpcTerminal.setChargingStationId(chargingStationId);
xhpcTerminal.setChargingPileId(chargingPileId);
xhpcTerminal.setName(name + "-" + (i));
xhpcTerminal.setName(name +"号桩"+ "-" + letterMap.get(i)+"枪");
if(i>9){
xhpcTerminal.setSerialNumber(serialNumber + i);
}else{

5
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java
View File

@ -626,6 +626,11 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi
map.put("status", 0);
}else if("故障".equals(cacheMap.get("status"))){
map.put("status", 1);
if(cacheMap.get("hf")!=null){
map.put("cause", cacheMap.get("hf").toString());
}else{
map.put("cause", "--");
}
}else{
//充电桩
map.put("status", 3);

2
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/utils/img/ImageUtil.java
View File

@ -273,7 +273,7 @@ public class ImageUtil {
g2.setFont(new Font("黑体",Font.BOLD,130));
g2.drawString(letter,250,180);
g2.setFont(new Font("楷体",Font.BOLD,60));
g2.drawString("枪",320,174);
//g2.drawString("枪",320,174);
File dest = fullImgdestPath;

2
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/utils/img/QrImgUtils.java
View File

@ -25,7 +25,7 @@ public class QrImgUtils {
//生成桩的二维码图片
//1.生成二维码链接内容：
StringBuilder prefix = new StringBuilder("https://xhpc.scxhua.cn?pNum=");
StringBuilder prefix = new StringBuilder("https://www.scxhua.cn?pNum=");
String QrContent = prefix.append(xhpcTerminal.getSerialNumber()).toString();
try {

2
xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml
View File

@ -333,6 +333,8 @@
left join xhpc_charging_station as ct on ct.charging_station_id = ter.charging_station_id
where ter.serial_number = #{pNum}
and ter.del_flag = 0
order by ter.number desc
limit 1
</select>
<select id="getImageList" resultType="map">

2
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java
View File

@ -151,7 +151,7 @@ public class XhpcChargeOrderController extends BaseController {
data.put("chargingTimeNumber",0);
data.put("serialNumber","0");
data.put("type","-1");
data.put("parkingInstructions","在非充电情况下占用车位按照0.30元/分钟收费");
data.put("parkingInstructions","充电完成请尽快离场,超时车位占用费10元/小时");
map.put("data", data);
}else{
map.put("data",orderMessage);

2
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
View File

@ -632,7 +632,7 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
data.put("chargingDegree", chargingDegree);
data.put("remainingTime",xhpcRealTimeOrder.getRemainingTime());
data.put("serialNumber",orderNo.substring(0,16));
data.put("parkingInstructions","在非充电情况下占用车位按照0.30元/分钟收费");
data.put("parkingInstructions","充电完成请尽快离场,超时车位占用费10元/小时");
//获取桩直流还是交流
Map<String, Object> xhpcChargingPile = xhpcChargeOrderService.getXhpcChargingPile(xhpcChargeOrder.getTerminalId());
if(xhpcChargingPile !=null){

6
xhpc-modules/xhpc-payment/src/main/resources/bootstrap.yml
View File

@ -38,15 +38,15 @@ KEY: "sichuanxianghuakejiyouxiangongsi"
#微信小程序支付地址
WXPAYUNIFIEDORDER: "https://api.mch.weixin.qq.com/pay/unifiedorder"
#微信支付回调地址
SERVERDOMAIN: "http://xhpc.scxhua.com/prod-api/xhpc-payment/wx/paymentCallback"
SERVERDOMAIN: "http://www.scxhua.cn/prod-api/xhpc-payment/wx/paymentCallback"
#微信小程序支付地址
WXTRANSFERS: "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers"
#支付宝支付回调地址
ALIPAYPSERVERDOMAIN: "https://xhpc.scxhua.com/prod-api/xhpc-payment/alipay/notifyUrl"
ALIPAYPSERVERDOMAIN: "https://www.scxhua.cn/prod-api/xhpc-payment/alipay/notifyUrl"
#支付宝公钥
ALIPAYPUBLICKEY: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjHDksTgZTpf0wh7oeTVRp0h3SqzTM2smjEJnx9jF1+q3WSXLRB4OzSzq7VsJ/szcyK10ZGO5PxeQ4u9GAG/U+7xhs7ei1cJB/Er55Sg9SbjfkTpwlDv181UJCRJJ/IAcqyqezwTpB8e2trYmHKovUdt0KR9/tVkGa7hsNd5GfxTOUaAFc3zADqRVM+wGimtG0NYfOF2f8tkmBEAiMMLKq5pbAnHU723a1cm/nfVp7gvXfsnO0k2GvRuHzb8mxIhWLiAnwdK9gEu5za/jWxo/xIvf2sdJPYdWj+yfyzA2e1fJkx4uRUzX31CXxZvP2/tfEcnTdI0gxN+OH2eAMiPVswIDAQAB"
#应用私钥
ALIPAYPRIVATEKEY: "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCG0ynEzKW/LwXLgtcOQ9BQCWN1ILdK8/X8DIiKy2XiebirTkU2LF9u6NpNKju3TIZTq02GBpjz/5kuCdXoFTqZXB6W/6vDbRskIT42ctT6nzZtkBaYt4BaC/HSPWAQJ+9z+JtKr8bDYUgN/9YwdwV/J3sEg/HYPlsXRczrnJdfhR/d5zno1V6avK2p052/IWKV5daZg3aQpDDi7QdZp8W88hbrItb0aoaDwhsq90ZBDA8ZjUUUAiqnSFPl0OxBAvwbS1U1Y7SYQd6AeD3M9MugrDjPNng+TeZgZ0zXaB2uh3u+i1PsDvQAEq72MM+1z097de2t01u6jmvsqFPj9ANrAgMBAAECggEAZln344bYbQLti0mQqSuiAKCf+FMV0rjRjL6XCYbPmdZ98s5AjJey+yeaUeo12zkk4G+zMoPfqZvoVaLx2HYFPldIgakmY/14FT2HVR5nwLsNPq+b9+OWdMWMluYw/xLSHWAlw9UdN0WqxbXqjHBOo/D82riv6FGuJUTABD2kTMZQngzOaoMcgrfIb4y5f2oTzXXvOidOA5u2UW9vbPaV/G+eqvsBTMNgJUY3uYO0fMvGVrQ6u5lHPiZzYjdIhyYXBa0L7MUs6oi4YcJwSHt0OXrxVPjJFR6Kpl2hkzOptgrhn8Jun0DYCd0s02NxIaVLkF6pNhqZaovLWTcCoal+wQKBgQDEfVQoOZ5eZYtL6XEnJBH7alVT87RywgDc4Jz4AYIKijt4KWZCWqu6GoR3Ku/u+/PWAak3j9pHv0HoKVAmDANJOU0W6pyUXNXLoeYlc/2kOmlRHbNReAnaUwHauIRiUOfqZ8+qWS5Ly6TmuF0GJRrbXr1gah75Ow0T02af618IlwKBgQCvqLUWwEpFSt1EZ6Y20jOm75RQgl+0wckwdTaoPyE6qwHkuPXG0nILD0OqgWPY2iYUR6DIfBuv6CkSvGgvY7ouj876hsofSW4d7gitt5+ybTjtyUDOCQk5g3QkRmFW9SAAbWTF7VvyiIqlICWEIuMQ1hJdKQK4/6nm1IqgSoTCTQKBgEk7lOQxJW91VUeDyCKYdQNJjGfvyu+CkyO/q4FbvoYDI0sT0wMkHCEOxRRNMoPV7/lxQQpuWSKoi/3ld/PWQltGOg8yfg1l1GFDBC4tXvmYs6wB79WLcdCnY2eLofuqv+VDr8iD2JdzXRCI4lLp/WqJkveeVdD6S1N6VSOBbDgdAoGAJF54x/IeLoSWlXAkYNtaqGiYO6cSq7knr6nFHEad2ajIZpPJB1ZRGGsbpnTNuHtKQQ6ngnr3vI8D2gY6R/2M8dECmKpJtPqeGwJKt7T6EpY8oDb3/PCwAUFvTYdo5fkwnAYKRFSloeyVUCT8v4P9oWHBQZqZHraIdetxnEhxfk0CgYAaqweBwOdAiRk/ivbgtf9fhSSnM3p40KZ9MF66wsnb4oc/+qH/Nq/SxeQBIIwx0ouW7Ho7xr0yYcmnnrk+xEHfDsGSxNYEd0NClGRBpPCy0ynEpsXeaj2yjr0zWzcDYI/wRaDpzCcUQf8BJ4l++klXvwhGvJiRDOFaLPiZ9zscBA=="
ALIPAYPRIVATEKEY: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC6goPD1M6MqF31hS9+hnzXDvILjaw2AFLhgbXUp4UD+8N1pvx7PkzMzPj9OWLBl0GZyDOwSJnboan4Gw/DGwekHVcgnGJWmlojquqE9ZB0Nu69AkhIs9KnHsYe5QnjLSwa7e+InoRKqB4/XscQ4GnKG8Wpq8UH9O9lqgKdnY9+ShcsEJkY88AzmlMIQtluXlweXfEUnfPVxOCZwX0yEaLYdoJMLgcp6QD+IBpJ049vpPFzzsCzp4j7agInzPlNkG+euOEkC+EWMmLd6P0hXN4OJ4dNSo8IwUcV1cbXHL8FmtnavWnk0pykNZYqeKQdCh+JdhU50t/dmXhuM1ejEe5RAgMBAAECggEAZRo230NOrETgmiUWd9njdpjtcIHd5nAKfZ/Yt2wP2PbzH6Xjm9NLwoEiP/KJrDOYJgq2qkrQzJQ4FPxmcPcID1iwUEc1r4iAcHFIK8cKBVV52Q+Rq4d/G4S9FSZHU9S64eY1QLPdNrMnomZ4NpfQAPVJEw7AAe4uj8e3H0W38Va+4QBVYgov1UAJxbsE9jue8NeBMoLRCol/lu/lXH2ndYK4EpCgiK7xNdg8SuIt5hIoYqmQ3Pbd6Fn64AL8cZqiLiFjVoMTBfYbuv99UwyYrm12WAqJ4fAnzwJvozYbBvZPqZYeor8L0Qv1RJUy0KDnWciRgSJQ+Vo3kXlLH7DK2QKBgQDrqUNZnAL0V+RttCkwF2m0GXgplZXVfC1dIXxNsrJaEQ/4/Q3mYI52cMFOd7T09PCGXw4MU9b90srzPTbxSzUCXUfGeNimr+Ivhz5sDiVkJEv5DdowJaos0/yH4kSBFGPN8DOiDoGBBfAUBojZl0gS3eHMGmjwkXGkWZ3O3WE43wKBgQDKm0sa5LIP1/bfP5JmanNuGBOjTsBhApGEavjBtEzSqhIkj2IrlglQ6b2ckfubAsDhoMtYE32gDBnPiFOAlwmrTuB72XWoAnzdkJupklEH1dafBuT20JIRQXjeTD2kl1Ffa3+IN2miDXJ4slaNiEDYo1YPUYLaL7Kfoy84JP9OzwKBgEjWaBqqPb+H6vJ9XL2gfutLc/hmY4k4eEzwrJrXQIjV/TnX/RPXhDDXaOf319ZeXnkpqA3nW+vX2yKTKQgrVpcEfcq6Tzw14JMQGhsLxELPdSvlPCrleVOhscvOA55hzvc35r2P/jcCvtFxs5qNR5mNOtz6zLSOP7GsgToO8p3BAoGBAKzk9KSQgHsQurUsVMxdDv/mP+veakDepjsv5fO23s/vHehhC09Si8Smko4n7WQMZ3ijdKNGjq+jY+s71LYpLbEocFx/5+1lohSZMJz2JXvgOXQfuAf/WIatLm3U9c2c623YGE6vqs8FVqg017OTkHLOf8Q2tMloZq/f24231L71AoGALwpnQdJG11G/IVb5D8YA1LbASOztW1M5RX9YeVkqISIOFzM+872PUgUq04Qa0QB+P+BOo3TS58o+Q8R6ErTiYF84X2z6nX0dgDzIB3pV6t+VQFCBO5PtsYaSgJQ4H3i5y9i2e5Zt34s9dZ5rdm2BD/RoGijVM9U+ccrNId4wWRE="
#支付宝appid
ALIPAYAPPID: "2021002156615717"

2
xhpc-modules/xhpc-user/src/main/resources/bootstrap.yml
View File

@ -28,6 +28,6 @@ WXGETJSCODE: "https://api.weixin.qq.com/sns/jscode2session?appid=wxd0a48e00319ef
#支付宝公钥
ALIPAYPUBLICKEY: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjHDksTgZTpf0wh7oeTVRp0h3SqzTM2smjEJnx9jF1+q3WSXLRB4OzSzq7VsJ/szcyK10ZGO5PxeQ4u9GAG/U+7xhs7ei1cJB/Er55Sg9SbjfkTpwlDv181UJCRJJ/IAcqyqezwTpB8e2trYmHKovUdt0KR9/tVkGa7hsNd5GfxTOUaAFc3zADqRVM+wGimtG0NYfOF2f8tkmBEAiMMLKq5pbAnHU723a1cm/nfVp7gvXfsnO0k2GvRuHzb8mxIhWLiAnwdK9gEu5za/jWxo/xIvf2sdJPYdWj+yfyzA2e1fJkx4uRUzX31CXxZvP2/tfEcnTdI0gxN+OH2eAMiPVswIDAQAB"
#应用私钥
ALIPAYPRIVATEKEY: "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCG0ynEzKW/LwXLgtcOQ9BQCWN1ILdK8/X8DIiKy2XiebirTkU2LF9u6NpNKju3TIZTq02GBpjz/5kuCdXoFTqZXB6W/6vDbRskIT42ctT6nzZtkBaYt4BaC/HSPWAQJ+9z+JtKr8bDYUgN/9YwdwV/J3sEg/HYPlsXRczrnJdfhR/d5zno1V6avK2p052/IWKV5daZg3aQpDDi7QdZp8W88hbrItb0aoaDwhsq90ZBDA8ZjUUUAiqnSFPl0OxBAvwbS1U1Y7SYQd6AeD3M9MugrDjPNng+TeZgZ0zXaB2uh3u+i1PsDvQAEq72MM+1z097de2t01u6jmvsqFPj9ANrAgMBAAECggEAZln344bYbQLti0mQqSuiAKCf+FMV0rjRjL6XCYbPmdZ98s5AjJey+yeaUeo12zkk4G+zMoPfqZvoVaLx2HYFPldIgakmY/14FT2HVR5nwLsNPq+b9+OWdMWMluYw/xLSHWAlw9UdN0WqxbXqjHBOo/D82riv6FGuJUTABD2kTMZQngzOaoMcgrfIb4y5f2oTzXXvOidOA5u2UW9vbPaV/G+eqvsBTMNgJUY3uYO0fMvGVrQ6u5lHPiZzYjdIhyYXBa0L7MUs6oi4YcJwSHt0OXrxVPjJFR6Kpl2hkzOptgrhn8Jun0DYCd0s02NxIaVLkF6pNhqZaovLWTcCoal+wQKBgQDEfVQoOZ5eZYtL6XEnJBH7alVT87RywgDc4Jz4AYIKijt4KWZCWqu6GoR3Ku/u+/PWAak3j9pHv0HoKVAmDANJOU0W6pyUXNXLoeYlc/2kOmlRHbNReAnaUwHauIRiUOfqZ8+qWS5Ly6TmuF0GJRrbXr1gah75Ow0T02af618IlwKBgQCvqLUWwEpFSt1EZ6Y20jOm75RQgl+0wckwdTaoPyE6qwHkuPXG0nILD0OqgWPY2iYUR6DIfBuv6CkSvGgvY7ouj876hsofSW4d7gitt5+ybTjtyUDOCQk5g3QkRmFW9SAAbWTF7VvyiIqlICWEIuMQ1hJdKQK4/6nm1IqgSoTCTQKBgEk7lOQxJW91VUeDyCKYdQNJjGfvyu+CkyO/q4FbvoYDI0sT0wMkHCEOxRRNMoPV7/lxQQpuWSKoi/3ld/PWQltGOg8yfg1l1GFDBC4tXvmYs6wB79WLcdCnY2eLofuqv+VDr8iD2JdzXRCI4lLp/WqJkveeVdD6S1N6VSOBbDgdAoGAJF54x/IeLoSWlXAkYNtaqGiYO6cSq7knr6nFHEad2ajIZpPJB1ZRGGsbpnTNuHtKQQ6ngnr3vI8D2gY6R/2M8dECmKpJtPqeGwJKt7T6EpY8oDb3/PCwAUFvTYdo5fkwnAYKRFSloeyVUCT8v4P9oWHBQZqZHraIdetxnEhxfk0CgYAaqweBwOdAiRk/ivbgtf9fhSSnM3p40KZ9MF66wsnb4oc/+qH/Nq/SxeQBIIwx0ouW7Ho7xr0yYcmnnrk+xEHfDsGSxNYEd0NClGRBpPCy0ynEpsXeaj2yjr0zWzcDYI/wRaDpzCcUQf8BJ4l++klXvwhGvJiRDOFaLPiZ9zscBA=="
ALIPAYPRIVATEKEY: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC6goPD1M6MqF31hS9+hnzXDvILjaw2AFLhgbXUp4UD+8N1pvx7PkzMzPj9OWLBl0GZyDOwSJnboan4Gw/DGwekHVcgnGJWmlojquqE9ZB0Nu69AkhIs9KnHsYe5QnjLSwa7e+InoRKqB4/XscQ4GnKG8Wpq8UH9O9lqgKdnY9+ShcsEJkY88AzmlMIQtluXlweXfEUnfPVxOCZwX0yEaLYdoJMLgcp6QD+IBpJ049vpPFzzsCzp4j7agInzPlNkG+euOEkC+EWMmLd6P0hXN4OJ4dNSo8IwUcV1cbXHL8FmtnavWnk0pykNZYqeKQdCh+JdhU50t/dmXhuM1ejEe5RAgMBAAECggEAZRo230NOrETgmiUWd9njdpjtcIHd5nAKfZ/Yt2wP2PbzH6Xjm9NLwoEiP/KJrDOYJgq2qkrQzJQ4FPxmcPcID1iwUEc1r4iAcHFIK8cKBVV52Q+Rq4d/G4S9FSZHU9S64eY1QLPdNrMnomZ4NpfQAPVJEw7AAe4uj8e3H0W38Va+4QBVYgov1UAJxbsE9jue8NeBMoLRCol/lu/lXH2ndYK4EpCgiK7xNdg8SuIt5hIoYqmQ3Pbd6Fn64AL8cZqiLiFjVoMTBfYbuv99UwyYrm12WAqJ4fAnzwJvozYbBvZPqZYeor8L0Qv1RJUy0KDnWciRgSJQ+Vo3kXlLH7DK2QKBgQDrqUNZnAL0V+RttCkwF2m0GXgplZXVfC1dIXxNsrJaEQ/4/Q3mYI52cMFOd7T09PCGXw4MU9b90srzPTbxSzUCXUfGeNimr+Ivhz5sDiVkJEv5DdowJaos0/yH4kSBFGPN8DOiDoGBBfAUBojZl0gS3eHMGmjwkXGkWZ3O3WE43wKBgQDKm0sa5LIP1/bfP5JmanNuGBOjTsBhApGEavjBtEzSqhIkj2IrlglQ6b2ckfubAsDhoMtYE32gDBnPiFOAlwmrTuB72XWoAnzdkJupklEH1dafBuT20JIRQXjeTD2kl1Ffa3+IN2miDXJ4slaNiEDYo1YPUYLaL7Kfoy84JP9OzwKBgEjWaBqqPb+H6vJ9XL2gfutLc/hmY4k4eEzwrJrXQIjV/TnX/RPXhDDXaOf319ZeXnkpqA3nW+vX2yKTKQgrVpcEfcq6Tzw14JMQGhsLxELPdSvlPCrleVOhscvOA55hzvc35r2P/jcCvtFxs5qNR5mNOtz6zLSOP7GsgToO8p3BAoGBAKzk9KSQgHsQurUsVMxdDv/mP+veakDepjsv5fO23s/vHehhC09Si8Smko4n7WQMZ3ijdKNGjq+jY+s71LYpLbEocFx/5+1lohSZMJz2JXvgOXQfuAf/WIatLm3U9c2c623YGE6vqs8FVqg017OTkHLOf8Q2tMloZq/f24231L71AoGALwpnQdJG11G/IVb5D8YA1LbASOztW1M5RX9YeVkqISIOFzM+872PUgUq04Qa0QB+P+BOo3TS58o+Q8R6ErTiYF84X2z6nX0dgDzIB3pV6t+VQFCBO5PtsYaSgJQ4H3i5y9i2e5Zt34s9dZ5rdm2BD/RoGijVM9U+ccrNId4wWRE="
#支付宝appid
ALIPAYAPPID: "2021002156615717"

2
xhpc-modules/xhpc-wxma/src/main/java/com/xhpc/wxma/socket/OrderNotificationWebSocket.java
View File

@ -113,7 +113,7 @@ public class OrderNotificationWebSocket {
data.put("chargingDegree", decimal);
data.put("remainingTime","0");
data.put("serialNumber","0");
data.put("parkingInstructions","在非充电情况下占用车位按照0.30元/分钟收费");
data.put("parkingInstructions","充电完成请尽快离场,超时车位占用费10元/小时");
data.put("type", "-1");
map.put("data", data);
JSONObject json = new JSONObject(map);