添加汇付的退款

.idea/libraries/Maven__com_huifu_adapay_adapay_java_sdk_1_2_10.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.huifu.adapay:adapay-java-sdk:1.2.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/adapay/adapay-java-sdk/1.2.10/adapay-java-sdk-1.2.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/adapay/adapay-java-sdk/1.2.10/adapay-java-sdk-1.2.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/adapay/adapay-java-sdk/1.2.10/adapay-java-sdk-1.2.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_huifu_adapay_core_adapay_core_sdk_1_2_10.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.huifu.adapay.core:adapay-core-sdk:1.2.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/adapay/core/adapay-core-sdk/1.2.10/adapay-core-sdk-1.2.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/adapay/core/adapay-core-sdk/1.2.10/adapay-core-sdk-1.2.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/adapay/core/adapay-core-sdk/1.2.10/adapay-core-sdk-1.2.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_huifu_dg_demo_3_0_1_sources_3_0_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.huifu:dg-demo-3.0.1-sources:3.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/dg-demo-3.0.1-sources/3.0.1/dg-demo-3.0.1-sources-3.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/dg-demo-3.0.1-sources/3.0.1/dg-demo-3.0.1-sources-3.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/dg-demo-3.0.1-sources/3.0.1/dg-demo-3.0.1-sources-3.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_huifu_dg_java_sdk_3_0_1_3_0_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.huifu:dg-java-sdk-3.0.1:3.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/dg-java-sdk-3.0.1/3.0.1/dg-java-sdk-3.0.1-3.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/dg-java-sdk-3.0.1/3.0.1/dg-java-sdk-3.0.1-3.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/dg-java-sdk-3.0.1/3.0.1/dg-java-sdk-3.0.1-3.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_huifu_dg_java_sdk_3_0_1_sources_3_0_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.huifu:dg-java-sdk-3.0.1-sources:3.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/dg-java-sdk-3.0.1-sources/3.0.1/dg-java-sdk-3.0.1-sources-3.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/dg-java-sdk-3.0.1-sources/3.0.1/dg-java-sdk-3.0.1-sources-3.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/dg-java-sdk-3.0.1-sources/3.0.1/dg-java-sdk-3.0.1-sources-3.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__junit_junit_4_12.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_12.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpmime:4.5.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.12/httpmime-4.5.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.12/httpmime-4.5.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.12/httpmime-4.5.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.0/org.eclipse.paho.client.mqttv3-1.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.0/org.eclipse.paho.client.mqttv3-1.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.0/org.eclipse.paho.client.mqttv3-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/workspace.xml

@@ -26,30 +26,33 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d95263d0-9dff-44b4-8deb-343711f78d5d" name="Default Changelist" comment="针对退款时将所有的订单信息进行退款2021-10-15">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/SAAS_AFTEREND2_jar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_saobei_saobeiopen_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/yijia_station_1_0_1.xml" beforeDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_huifu_adapay_adapay_java_sdk_1_2_10.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_huifu_adapay_core_adapay_core_sdk_1_2_10.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_huifu_dg_demo_3_0_1_sources_3_0_1.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_huifu_dg_java_sdk_3_0_1_3_0_1.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_huifu_dg_java_sdk_3_0_1_sources_3_0_1.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_12.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_0.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/utils/ConsumeType.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/utils/HFparam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/utils/HuiFuUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/utils/Request.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/utils/SignUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/utils/Tlparam.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/src/main/resources/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/src/main/resources/application-druid.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-admin/src/main/resources/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/src/main/resources/logback.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/application-druid.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/logback.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar.original" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/yijia-admin.iml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/yijia-admin.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-common/src/main/java/com/yijia/common/core/domain/entity/SysDept.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/src/main/java/com/yijia/common/core/domain/entity/SysDept.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/entity/SysDept.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/entity/SysDept.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-common/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-common/target/yijia-common-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/yijia-common-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponIssueController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponIssueController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponUserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-coupon/src/main/resources/mapper/coupon/CouponUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/src/main/resources/mapper/coupon/CouponUserMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-coupon/target/classes/com/yijia/coupon/controller/CouponIssueController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/classes/com/yijia/coupon/controller/CouponIssueController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-coupon/target/classes/com/yijia/coupon/controller/CouponUserController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/classes/com/yijia/coupon/controller/CouponUserController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-coupon/target/classes/mapper/coupon/CouponUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/classes/mapper/coupon/CouponUserMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-coupon/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-coupon/target/yijia-coupon-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/yijia-coupon-1.0.1.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-customer/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/maven-archiver/pom.properties" afterDir="false" />
@@ -60,8 +63,6 @@
       <change beforePath="$PROJECT_DIR$/yijia-generator/target/yijia-generator-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-generator/target/yijia-generator-1.0.1.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-integral/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-integral/target/yijia-integral-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/yijia-integral-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-label/src/main/resources/mapper/label/CustomerLabelDemoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-label/src/main/resources/mapper/label/CustomerLabelDemoMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-label/target/classes/mapper/label/CustomerLabelDemoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-label/target/classes/mapper/label/CustomerLabelDemoMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-label/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-label/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-label/target/yijia-label-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-label/target/yijia-label-1.0.1.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-market/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-market/target/maven-archiver/pom.properties" afterDir="false" />
@@ -69,46 +70,34 @@
       <change beforePath="$PROJECT_DIR$/yijia-quartz/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-quartz/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-quartz/target/yijia-quartz-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-quartz/target/yijia-quartz-1.0.1.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/HttpUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/utils/HttpUtils.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/SysAppUserInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/SysAppUserInfoController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/PayOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/PayOrder.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/SysAppUserInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/java/com/yijia/system/domain/SysAppUserInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/mapper/PayOrderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/mapper/PayOrderMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/mapper/SysAppUserInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/java/com/yijia/system/mapper/SysAppUserInfoMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/IPayOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/IPayOrderService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/ISysAppUserInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/java/com/yijia/system/service/ISysAppUserInfoService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationSettlementPriceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationSettlementPriceController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/StationSettlementPrice.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/StationSettlementPrice.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/StationSettlementPriceAdjust.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/StationSettlementPriceAdjust.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/SysAppUserInfoImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/java/com/yijia/system/service/impl/SysAppUserInfoImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/StationBalanceChangeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/StationBalanceChangeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/StationClassesSummaryMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/StationClassesSummaryMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/SysAppUserInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/SysAppUserInfoMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/StationSettlementPriceAdjustMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/StationSettlementPriceAdjustMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/StationSettlementPriceMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/StationSettlementPriceMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/HttpUtils$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/HttpUtils.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/PayOrderController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/PayOrderController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationClassStructureController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationClassStructureController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/SysAppUserInfoController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/SysAppUserInfoController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationSettlementPriceController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationSettlementPriceController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/PayOrder.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/PayOrder.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/SysAppUserInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/PayOrderMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/PayOrderMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/SysAppUserInfoMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IPayOrderService.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IPayOrderService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/ISysAppUserInfoService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationSettlementPrice.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationSettlementPrice.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationSettlementPriceAdjust.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationSettlementPriceAdjust.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/PayOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/PayOrderServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/SysAppUserInfoImpl.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/PayOrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/PayOrderMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationBalanceChangeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationBalanceChangeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationClassesSummaryMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationClassesSummaryMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/SysAppUserInfoMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationSettlementPriceAdjustMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationSettlementPriceAdjustMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationSettlementPriceMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationSettlementPriceMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/yijia-station-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/yijia-station-1.0.1.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/yijia-station.iml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/yijia-station.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/SysDeptMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/SysDeptMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/SysDeptMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/SysDeptMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-system/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-system/target/yijia-system-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/yijia-system-1.0.1.jar" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -177,7 +166,7 @@
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="restartRequiresConfirmation" value="false" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
@@ -194,17 +183,30 @@
       <recent name="D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\mapper" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.yijia.station.utils" />
       <recent name="com.yijia.station.service" />
       <recent name="com.yijia.station.service.impl" />
       <recent name="com.yijia.station.mapper" />
       <recent name="com.yijia.station.domain" />
-      <recent name="com.yijia.system.service.impl" />
     </key>
     <key name="CreateClassDialog.RecentsKey">
       <recent name="com.yijia.station.service" />
       <recent name="com.yijia.station.controller" />
     </key>
   </component>
+  <component name="RunAnythingCache">
+    <myKeys>
+      <visibility group="Gradle tasks" flag="true" />
+      <visibility group="Grunt tasks" flag="true" />
+      <visibility group="Gulp tasks" flag="true" />
+      <visibility group="Maven goals" flag="true" />
+      <visibility group="Node.js" flag="true" />
+      <visibility group="Recent projects" flag="true" />
+      <visibility group="Run configurations" flag="true" />
+      <visibility group="npm" flag="true" />
+      <visibility group="yarn" flag="true" />
+    </myKeys>
+  </component>
   <component name="RunManager" selected="Spring Boot.YiJiaApplication">
     <configuration name="YiJiaApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.yijia.YiJiaApplication" />
@@ -356,7 +358,17 @@
       <workItem from="1653013556525" duration="2657000" />
       <workItem from="1653290763696" duration="1589000" />
       <workItem from="1655264893988" duration="2135000" />
-      <workItem from="1655801947868" duration="12904000" />
+      <workItem from="1655801947868" duration="16701000" />
+      <workItem from="1656551022330" duration="985000" />
+      <workItem from="1656553380039" duration="4841000" />
+      <workItem from="1656983536644" duration="13700000" />
+      <workItem from="1658192871032" duration="1192000" />
+      <workItem from="1658454823725" duration="5468000" />
+      <workItem from="1659062334221" duration="2457000" />
+      <workItem from="1663034446050" duration="724000" />
+      <workItem from="1663221396376" duration="11120000" />
+      <workItem from="1663565886953" duration="36697000" />
+      <workItem from="1664329975655" duration="12974000" />
     </task>
     <task id="LOCAL-00001" summary="前端配置文件package-config.json删除">
       <created>1619772586309</created>
@@ -680,7 +692,14 @@
       <option name="project" value="LOCAL" />
       <updated>1634292126022</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="针对退款时将所有的订单信息进行退款2021-10-15">
+      <created>1656467119634</created>
+      <option name="number" value="00047" />
+      <option name="presentableId" value="LOCAL-00047" />
+      <option name="project" value="LOCAL" />
+      <updated>1656467119634</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -749,54 +768,78 @@
     <option name="LAST_COMMIT_MESSAGE" value="针对退款时将所有的订单信息进行退款2021-10-15" />
   </component>
   <component name="WindowStateProjectService">
-    <state width="1209" height="338" key="GridCell.Tab.0.bottom" timestamp="1656466631895">
+    <state x="765" y="269" key="#com.intellij.ide.util.MemberChooser" timestamp="1663747508651">
+      <screen x="0" y="0" width="1920" height="1160" />
+    </state>
+    <state x="765" y="269" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1160@0.0.1920.1160" timestamp="1663747508651" />
+    <state x="440" y="152" key="CommitChangelistDialog2" timestamp="1656467110718">
+      <screen x="0" y="0" width="1920" height="1160" />
+    </state>
+    <state x="440" y="152" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1656467110718" />
+    <state x="740" y="341" key="FileChooserDialogImpl" timestamp="1663925603901">
+      <screen x="0" y="0" width="1920" height="1160" />
+    </state>
+    <state x="740" y="341" key="FileChooserDialogImpl/0.0.1920.1160@0.0.1920.1160" timestamp="1663925603901" />
+    <state width="1860" height="337" key="GridCell.Tab.0.bottom" timestamp="1664349423794">
+      <screen x="0" y="0" width="1920" height="1160" />
+    </state>
+    <state width="1860" height="337" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1664349423794" />
+    <state width="1860" height="337" key="GridCell.Tab.0.center" timestamp="1664349423794">
+      <screen x="0" y="0" width="1920" height="1160" />
+    </state>
+    <state width="1860" height="337" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1664349423794" />
+    <state width="1860" height="337" key="GridCell.Tab.0.left" timestamp="1664349423793">
+      <screen x="0" y="0" width="1920" height="1160" />
+    </state>
+    <state width="1860" height="337" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1664349423793" />
+    <state width="1860" height="337" key="GridCell.Tab.0.right" timestamp="1664349423794">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1209" height="338" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631895" />
-    <state width="1209" height="338" key="GridCell.Tab.0.center" timestamp="1656466631895">
+    <state width="1860" height="337" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1664349423794" />
+    <state width="1860" height="337" key="GridCell.Tab.1.bottom" timestamp="1664349397921">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1209" height="338" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631895" />
-    <state width="1209" height="338" key="GridCell.Tab.0.left" timestamp="1656466631895">
+    <state width="1860" height="337" key="GridCell.Tab.1.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1664349397921" />
+    <state width="1860" height="337" key="GridCell.Tab.1.center" timestamp="1664349397921">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1209" height="338" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631895" />
-    <state width="1209" height="338" key="GridCell.Tab.0.right" timestamp="1656466631895">
+    <state width="1860" height="337" key="GridCell.Tab.1.center/0.0.1920.1160@0.0.1920.1160" timestamp="1664349397921" />
+    <state width="1860" height="337" key="GridCell.Tab.1.left" timestamp="1664349397921">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1209" height="338" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631895" />
-    <state width="1209" height="338" key="GridCell.Tab.1.bottom" timestamp="1656466631712">
+    <state width="1860" height="337" key="GridCell.Tab.1.left/0.0.1920.1160@0.0.1920.1160" timestamp="1664349397921" />
+    <state width="1860" height="337" key="GridCell.Tab.1.right" timestamp="1664349397921">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1209" height="338" key="GridCell.Tab.1.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631712" />
-    <state width="1209" height="338" key="GridCell.Tab.1.center" timestamp="1656466631712">
+    <state width="1860" height="337" key="GridCell.Tab.1.right/0.0.1920.1160@0.0.1920.1160" timestamp="1664349397921" />
+    <state width="1860" height="337" key="GridCell.Tab.2.bottom" timestamp="1664349361080">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1209" height="338" key="GridCell.Tab.1.center/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631712" />
-    <state width="1209" height="338" key="GridCell.Tab.1.left" timestamp="1656466631712">
+    <state width="1860" height="337" key="GridCell.Tab.2.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1664349361080" />
+    <state width="1860" height="337" key="GridCell.Tab.2.center" timestamp="1664349361080">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1209" height="338" key="GridCell.Tab.1.left/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631712" />
-    <state width="1209" height="338" key="GridCell.Tab.1.right" timestamp="1656466631712">
+    <state width="1860" height="337" key="GridCell.Tab.2.center/0.0.1920.1160@0.0.1920.1160" timestamp="1664349361080" />
+    <state width="1860" height="337" key="GridCell.Tab.2.left" timestamp="1664349361080">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1209" height="338" key="GridCell.Tab.1.right/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631712" />
-    <state width="1209" height="338" key="GridCell.Tab.2.bottom" timestamp="1656466631713">
+    <state width="1860" height="337" key="GridCell.Tab.2.left/0.0.1920.1160@0.0.1920.1160" timestamp="1664349361080" />
+    <state width="1860" height="337" key="GridCell.Tab.2.right" timestamp="1664349361080">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1209" height="338" key="GridCell.Tab.2.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631713" />
-    <state width="1209" height="338" key="GridCell.Tab.2.center" timestamp="1656466631713">
+    <state width="1860" height="337" key="GridCell.Tab.2.right/0.0.1920.1160@0.0.1920.1160" timestamp="1664349361080" />
+    <state x="461" y="231" key="SettingsEditor" timestamp="1663724002207">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1209" height="338" key="GridCell.Tab.2.center/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631713" />
-    <state width="1209" height="338" key="GridCell.Tab.2.left" timestamp="1656466631712">
+    <state x="461" y="231" key="SettingsEditor/0.0.1920.1160@0.0.1920.1160" timestamp="1663724002207" />
+    <state x="773" y="498" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1656467037183">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1209" height="338" key="GridCell.Tab.2.left/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631712" />
-    <state width="1209" height="338" key="GridCell.Tab.2.right" timestamp="1656466631713">
+    <state x="773" y="498" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1160@0.0.1920.1160" timestamp="1656467037183" />
+    <state x="660" y="289" width="599" height="616" key="find.popup" timestamp="1658455635376">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1209" height="338" key="GridCell.Tab.2.right/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631713" />
+    <state x="660" y="289" width="599" height="616" key="find.popup/0.0.1920.1160@0.0.1920.1160" timestamp="1658455635376" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1088,117 +1131,117 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>516</line>
+          <line>523</line>
           <option name="timeStamp" value="228" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>518</line>
+          <line>525</line>
           <option name="timeStamp" value="229" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>522</line>
+          <line>529</line>
           <option name="timeStamp" value="230" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>523</line>
+          <line>530</line>
           <option name="timeStamp" value="231" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>524</line>
+          <line>531</line>
           <option name="timeStamp" value="232" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>512</line>
+          <line>519</line>
           <option name="timeStamp" value="233" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>513</line>
+          <line>520</line>
           <option name="timeStamp" value="234" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>514</line>
+          <line>521</line>
           <option name="timeStamp" value="235" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>510</line>
+          <line>517</line>
           <option name="timeStamp" value="236" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>615</line>
+          <line>620</line>
           <option name="timeStamp" value="237" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>616</line>
+          <line>621</line>
           <option name="timeStamp" value="238" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>503</line>
+          <line>510</line>
           <option name="timeStamp" value="239" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>528</line>
+          <line>535</line>
           <option name="timeStamp" value="240" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>527</line>
+          <line>534</line>
           <option name="timeStamp" value="241" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>610</line>
+          <line>615</line>
           <option name="timeStamp" value="243" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>460</line>
+          <line>467</line>
           <option name="timeStamp" value="244" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>461</line>
+          <line>468</line>
           <option name="timeStamp" value="245" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>439</line>
+          <line>446</line>
           <option name="timeStamp" value="246" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>441</line>
+          <line>448</line>
           <option name="timeStamp" value="247" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>458</line>
+          <line>465</line>
           <option name="timeStamp" value="248" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>602</line>
+          <line>607</line>
           <option name="timeStamp" value="249" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>579</line>
+          <line>586</line>
           <option name="timeStamp" value="250" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>578</line>
+          <line>585</line>
           <option name="timeStamp" value="251" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -1223,29 +1266,34 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>550</line>
+          <line>557</line>
           <option name="timeStamp" value="256" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>552</line>
+          <line>559</line>
           <option name="timeStamp" value="257" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>554</line>
+          <line>561</line>
           <option name="timeStamp" value="258" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>553</line>
+          <line>560</line>
           <option name="timeStamp" value="259" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
-          <line>551</line>
+          <line>558</line>
           <option name="timeStamp" value="260" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>692</line>
+          <option name="timeStamp" value="263" />
+        </line-breakpoint>
         <line-breakpoint type="java-method">
           <url>file://$PROJECT_DIR$/yijia-label/src/main/java/com/yijia/label/mapper/CustomerLabelMapper.java</url>
           <line>27</line>

pom.xml

@@ -85,6 +85,18 @@
                 <version>${jna.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.huifu</groupId>
+                <artifactId>dg-demo-3.0.1-sources</artifactId>
+                <version>3.0.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.huifu</groupId>
+                <artifactId>dg-java-sdk-3.0.1</artifactId>
+                <version>3.0.1</version>
+            </dependency>
+
             <!-- swagger2-->
             <dependency>
                 <groupId>io.springfox</groupId>

yijia-admin/src/main/resources/application-druid.yml

@@ -6,11 +6,11 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 #url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                #url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: develop
-                password: 1234.Abcd
+                url: jdbc:mysql://39.101.135.83:33306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: yunwei
+                password: yunwei1qaz
                 #url: jdbc:mysql://localhost:3306/jiaduoduo_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 # username: zgc
                 #password: 123456

yijia-admin/src/main/resources/application.yml

@@ -68,13 +68,35 @@ spring:
       # 热部署开关
       enabled: true
   # redis 配置
+#  redis:
+#    # 地址
+#    host: localhost
+#    # 端口，默认为6379
+#    port: 6379
+#    # 密码
+#    password:
+#    # 连接超时时间
+#    timeout: 10s
+#    lettuce:
+#      pool:
+#        # 连接池中的最小空闲连接
+#        min-idle: 0
+#        # 连接池中的最大空闲连接
+#        max-idle: 8
+#        # 连接池的最大数据库连接数
+#        max-active: 8
+#        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+#        max-wait: -1ms
   redis:
     # 地址
-    host: localhost
+    host: 39.101.135.83
+    #host: localhost
     # 端口，默认为6379
-    port: 6379
+    port: 6399
+    #port: 6379
     # 密码
-    password:
+    password: oFKUqwahRDriBnYX
+    #password:
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -87,7 +109,6 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
-
 # token配置
 token:
     # 令牌自定义标识

yijia-admin/target/classes/application-druid.yml

@@ -6,11 +6,11 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 #url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                #url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: develop
-                password: 1234.Abcd
+                url: jdbc:mysql://39.101.135.83:33306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: yunwei
+                password: yunwei1qaz
                 #url: jdbc:mysql://localhost:3306/jiaduoduo_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 # username: zgc
                 #password: 123456

yijia-admin/target/classes/application.yml

@@ -68,13 +68,35 @@ spring:
       # 热部署开关
       enabled: true
   # redis 配置
+#  redis:
+#    # 地址
+#    host: localhost
+#    # 端口，默认为6379
+#    port: 6379
+#    # 密码
+#    password:
+#    # 连接超时时间
+#    timeout: 10s
+#    lettuce:
+#      pool:
+#        # 连接池中的最小空闲连接
+#        min-idle: 0
+#        # 连接池中的最大空闲连接
+#        max-idle: 8
+#        # 连接池的最大数据库连接数
+#        max-active: 8
+#        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+#        max-wait: -1ms
   redis:
     # 地址
-    host: localhost
+    host: 39.101.135.83
+    #host: localhost
     # 端口，默认为6379
-    port: 6379
+    port: 6399
+    #port: 6379
     # 密码
-    password:
+    password: oFKUqwahRDriBnYX
+    #password:
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -87,7 +109,6 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
-
 # token配置
 token:
     # 令牌自定义标识

yijia-admin/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jun 22 17:02:13 CST 2022
+#Thu Sep 22 11:14:54 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-admin

yijia-admin/yijia-admin.iml

@@ -143,6 +143,15 @@
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
     <orderEntry type="library" name="Maven: org.saobei:saobeiopen:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.huifu.adapay.core:adapay-core-sdk:1.2.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.12" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.huifu.adapay:adapay-java-sdk:1.2.10" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.huifu:dg-demo-3.0.1-sources:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.huifu:dg-java-sdk-3.0.1:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.huifu:dg-java-sdk-3.0.1-sources:3.0.1" level="project" />
     <orderEntry type="module" module-name="yijia-customer" />
     <orderEntry type="module" module-name="yijia-market" />
     <orderEntry type="module" module-name="yijia-integral" />

yijia-common/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jun 22 17:02:03 CST 2022
+#Thu Sep 22 11:14:46 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-common

yijia-coupon/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jun 22 17:02:08 CST 2022
+#Thu Sep 22 11:14:50 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-coupon

yijia-customer/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jun 22 17:02:09 CST 2022
+#Thu Sep 22 11:14:51 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-customer

yijia-framework/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jun 22 17:02:06 CST 2022
+#Thu Sep 22 11:14:48 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-framework

yijia-generator/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jun 22 17:02:07 CST 2022
+#Thu Sep 22 11:14:49 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-generator

yijia-integral/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jun 22 17:02:10 CST 2022
+#Thu Sep 22 11:14:52 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-integral

yijia-label/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jun 22 17:02:08 CST 2022
+#Thu Sep 22 11:14:51 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-label

yijia-market/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jun 22 17:02:12 CST 2022
+#Thu Sep 22 11:14:53 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-market

yijia-quartz/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jun 22 17:02:06 CST 2022
+#Thu Sep 22 11:14:49 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-quartz

yijia-station/pom.xml

@@ -31,6 +31,38 @@
             <version>1.0</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/com.huifu.adapay.core/adapay-core-sdk -->
+        <dependency>
+            <groupId>com.huifu.adapay.core</groupId>
+            <artifactId>adapay-core-sdk</artifactId>
+            <version>1.2.10</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.huifu.adapay/adapay-java-sdk -->
+        <dependency>
+            <groupId>com.huifu.adapay</groupId>
+            <artifactId>adapay-java-sdk</artifactId>
+            <version>1.2.10</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.huifu</groupId>
+            <artifactId>dg-demo-3.0.1-sources</artifactId>
+            <version>3.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.huifu</groupId>
+            <artifactId>dg-java-sdk-3.0.1</artifactId>
+            <version>3.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.huifu</groupId>
+            <artifactId>dg-java-sdk-3.0.1-sources</artifactId>
+            <version>3.0.1</version>
+        </dependency>
+
         <!-- 通用工具-->
         <dependency>
             <groupId>com.yijia</groupId>

yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java

@@ -1250,7 +1250,15 @@ public class PayOrderController extends BaseController
                     cell.setCellValue(payOrderList.get(j).getMobilePhone());
                     cell.setCellStyle(style);
                     cell = row.createCell(11);
-                    cell.setCellValue(payOrderList.get(j).getStatus());
+                    if(payOrderList.get(j).getStatus().equals("1")) {
+                        cell.setCellValue("支付成功");
+                    }else  if(payOrderList.get(j).getStatus().equals("2")){
+                        cell.setCellValue("线下退款");
+                    }else if(payOrderList.get(j).getStatus().equals("3")){
+                        cell.setCellValue("线上退款");
+                    }else{
+                        cell.setCellValue("支付失败");
+                    }
                     cell.setCellStyle(style);
                 }
             }
@@ -1391,4 +1399,7 @@ public class PayOrderController extends BaseController
         }
         return toAjaxee(i);
     }
+
+
+
 }

yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java

@@ -1575,10 +1575,10 @@ public class StationClassStructureController extends BaseController
                         orderLiter =addSpace(orderLiter,8);
                         String receivableAmt="";
                         if(sc.getReceivableAmt()!=null){
-                            receivableAmt = sc.getReceivableAmt().toString();
+                            receivableAmt = sc.getAmt().toString();
                         }else{
                             sc.setReceivableAmt(BigDecimal.valueOf(0));
-                            receivableAmt= sc.getReceivableAmt().toString();
+                            receivableAmt= sc.getAmt().toString();
                         }
                         content += sc.getPayType()+"  "+orderno+"  "+orderLiter+"  "+receivableAmt+"<BR>";
                     }
@@ -1820,10 +1820,10 @@ public class StationClassStructureController extends BaseController
                         orderLiter =addSpace(orderLiter,8);
                         String receivableAmt="";
                         if(sc.getReceivableAmt()!=null){
-                            receivableAmt = sc.getReceivableAmt().toString();
+                            receivableAmt = sc.getAmt().toString();
                         }else{
                             sc.setReceivableAmt(BigDecimal.valueOf(0));
-                            receivableAmt= sc.getReceivableAmt().toString();
+                            receivableAmt= sc.getAmt().toString();
                         }
                         content += sc.getPayType()+"  "+orderno+"  "+orderLiter+"  "+receivableAmt+"<BR>";
                     }

yijia-station/src/main/java/com/yijia/station/controller/StationSettlementPriceController.java

@@ -1,34 +1,26 @@
 package com.yijia.station.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import com.yijia.common.annotation.Log;
+import com.yijia.common.core.controller.BaseController;
+import com.yijia.common.core.domain.AjaxResult;
 import com.yijia.common.core.domain.entity.SysDept;
 import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.core.page.TableDataInfo;
+import com.yijia.common.enums.BusinessType;
 import com.yijia.common.utils.DateUtils;
 import com.yijia.common.utils.SecurityUtils;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.station.domain.StationSettlementPrice;
 import com.yijia.station.domain.StationSettlementPriceAdjust;
 import com.yijia.station.service.IStationSettlementPriceAdjustService;
+import com.yijia.station.service.IStationSettlementPriceService;
 import com.yijia.system.service.ISysDeptService;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.yijia.common.annotation.Log;
-import com.yijia.common.core.controller.BaseController;
-import com.yijia.common.core.domain.AjaxResult;
-import com.yijia.common.enums.BusinessType;
-import com.yijia.station.domain.StationSettlementPrice;
-import com.yijia.station.service.IStationSettlementPriceService;
-import com.yijia.common.utils.poi.ExcelUtil;
-import com.yijia.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 结算价格，司机价格Controller
@@ -136,6 +128,7 @@ public class StationSettlementPriceController extends BaseController
             stationSettlementPriceAdjust.setDriverPrice(stationSettlementPrice.getDriverPrice());
             stationSettlementPriceAdjust.setSettlementType(stationSettlementPrice.getSettlementType());
             stationSettlementPriceAdjust.setParentId(stationSettlementPrice.getId());
+            stationSettlementPriceAdjust.setDriverPriceType(stationSettlementPrice.getDriverPriceType());
            i= stationSettlementPriceAdjustService.insertStationSettlementPriceAdjust(stationSettlementPriceAdjust);
             stationSettlementPrice.setUpdateBy(currentUser.getUser().getUserId().toString());
             stationSettlementPrice.setUpdateTime(DateUtils.getNowDate());

yijia-station/src/main/java/com/yijia/station/domain/StationSettlementPrice.java

@@ -40,6 +40,17 @@ public class StationSettlementPrice extends BaseEntity
     private String balance;
     private Long deptId;
 
+    private String status;
+
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
     public String getDriverPriceType() {
         return driverPriceType;
     }

yijia-station/src/main/java/com/yijia/station/domain/StationSettlementPriceAdjust.java

@@ -1,10 +1,9 @@
 package com.yijia.station.domain;
 
-import java.math.BigDecimal;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.yijia.common.annotation.Excel;
 import com.yijia.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 结算价格，司机价格优惠调整对象 station_settlement_price_adjust
@@ -38,6 +37,18 @@ public class StationSettlementPriceAdjust extends BaseEntity
 
     private Long parentId;
 
+    /** 结算价格 */
+    @Excel(name = "司机类型")
+    private String driverPriceType;
+
+    public String getDriverPriceType() {
+        return driverPriceType;
+    }
+
+    public void setDriverPriceType(String driverPriceType) {
+        this.driverPriceType = driverPriceType;
+    }
+
     public String getStationName() {
         return stationName;
     }

yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java

@@ -3,6 +3,11 @@ package com.yijia.station.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.parser.Feature;
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.BasePay;
+import com.huifu.bspay.sdk.opps.core.config.MerConfig;
+import com.huifu.bspay.sdk.opps.core.request.V2TradePaymentScanpayRefundRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
 import com.saobei.open.sdk.DefaultSaobeiApiClient;
 import com.saobei.open.sdk.model.requst.trade.SaobeiTradeRefundRequest;
 import com.saobei.open.sdk.model.response.trade.SaobeiTradeRefundResponse;
@@ -16,22 +21,24 @@ import com.yijia.integral.domain.CustomerPoints;
 import com.yijia.integral.domain.CustomerPointsRecord;
 import com.yijia.integral.service.ICustomerPointsRecordService;
 import com.yijia.integral.service.ICustomerPointsService;
-import com.yijia.station.controller.HttpUtils;
 import com.yijia.station.controller.RSASignature;
 import com.yijia.station.controller.SXFPaySign;
 import com.yijia.station.domain.PayOrder;
-import com.yijia.system.domain.SysAppUserInfo;
 import com.yijia.station.mapper.PayOrderMapper;
-import com.yijia.system.mapper.SysAppUserInfoMapper;
 import com.yijia.station.service.IPayOrderService;
+import com.yijia.station.utils.HttpUtils;
+import com.yijia.system.domain.SysAppUserInfo;
 import com.yijia.system.domain.SysRespon;
+import com.yijia.system.mapper.SysAppUserInfoMapper;
 import com.yijia.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.SQLException;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -596,8 +603,6 @@ public class PayOrderServiceImpl implements IPayOrderService
                         throw  new SQLException("客户消费信息");
                     }
                 }
-
-
             }
             payOrder.setStatus("3");
             i= payOrderMapper.updatePayOrder(payOrder);
@@ -612,14 +617,113 @@ public class PayOrderServiceImpl implements IPayOrderService
                 if (!"0000".equals(respon.getResponCode())) {
                     throw new SQLException(respon.getResponMessage());
                 }
-            }else {
+            }else if("01".equals(payOrder.getThirdPayment())) {
                 respon= sendSxfRefund(payOrder);
                 if (!"0000".equals(respon.getResponCode())) {
                     throw new SQLException(respon.getResponMessage());
                 }
+            }else{
+                respon= HuiFuRefund(sysDept.getMno(),payOrder.getOrderNo(),payOrder.getAmt()+"",payOrder.getPayDate());
+                if (!"0000".equals(respon.getResponCode())) {
+                    throw new SQLException(respon.getResponMessage());
+                }
             }
         return AjaxResult.success(1);
     }
 
 
+
+    private  SysRespon HuiFuRefund( String mno,String oldOrderNo,String amt, Date  payDate) throws Exception  {
+
+        SysRespon sysRespon=new SysRespon();
+        BasePay.debug = true;
+
+        BasePay.prodMode = BasePay.MODE_PROD;
+
+        DecimalFormat df = new DecimalFormat("0.00");
+        df.setRoundingMode(RoundingMode.HALF_UP);
+        Double trantAmt=Double.valueOf(amt);
+
+        SimpleDateFormat formatter = new SimpleDateFormat("YYYYMMdd");
+        String dateString = formatter.format(payDate);
+        /**
+         * 单商户模式
+         */
+        MerConfig merConfig = new MerConfig();
+        merConfig.setProcutId("XLSISV");
+        merConfig.setSysId("6666000121616158");
+        merConfig.setRsaPrivateKey("MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDf2oY2LCw9mMPV9R5fiE+2oYuJ2Nsa2ZsvpYPyqX0j/0ACR4fz8UIChpZxhMdXla1sf0ntYkoYYoUKQkc0Z9MzOhECyGf6Sk7IG7EoPkQehLbGojira9STuVvA89pjkkSd5aHmllhnK0rOqE8yJELiT1970Uv+b+9PoAUS283X7z9sh0lxhopPctRGN/3YpKJeea+bfdAzrHEl1cvVwxvy/rqW5HMAbBcAQmatq00sU+k5LaJ6+MEyFtarJmdBwSF2DgobwcSXnquHpknP1aj4Tn2UEt2fslbUCnQ2weikGZsJ+ipSFSFyVR29tlGUW7wpULjUiFoqjYPFTvcCHNYLAgMBAAECggEAE0cyf7/WH4fkdayibP/EPaoz5i8yz2EmKDhM4L0P9eWpkYivgKaqVKVal3Qj5rsRMGLV7wej8e2qH3QNxcmbOrIpfN/ddISpvDoGS7zxCN/NDdYyozCqIf64lClsCV8zYZXBF6ai/l+QFbQQ/fR5fhvv0S35KXRiW60gQruDQrFCvHQuTD0Jgu1S01hhvtw95zUdW8Oh7vlCfCrVhZTjfdgujs7bxvCakLFuzjM2OXvmN0x8UylsbDO/b1WsK+XpmBLjva8syKnvpI4VPUX/DcLlRxGFe+LBRBAkK3rr9DPTRsNSD8E96YEhGr2CmbxKEh7JRlWD0FmVeSQeHGaYwQKBgQDy1b9qV830ZmavVftXCqmx3Omo6Tzwlt9Q9Jf5Zact6IGWjE+/KS6I+4dHhYZlnf0iM19pwSy1eYACr615ayqeaD6fE8j+n7UhXjmClZ1IKLT5zDr/ENb0KZzaVkJbQWAPyqbli2CqRayrA9ZsLpe6G64jmCrRHYKI/n5B2CXoSQKBgQDr/Va2/C2HlDC2x3Nk+rQlglU3dieT1loILbwFlTF4tlHCqIsmmvzll1Po7OfsmsLsnYqQjf4jxxiRcEOcTeAbAOgZ57ni0sbfUlmlgqVnWnzkZQR5+ykq1qI0p8BZWsB2Q+y47zIfPKrerw0xc5rU8uz/Uo4PxSHwT7lWQG4TswKBgGoc2T5BDDCGJszrh58re6fLXxd+hDCl3QPlPhuvPfSjqyz8N0TTXBBjyWOJh4cUGK8/P6xYy46pfzStS+LI36DE8MhWvvf1FhN0tzDG7CnCEAMwKX+X/jZHkNEf7HMwCCgeZ/vage0l8SPx01sGqSqcOeY38k3a1VXDz6w6JaZxAoGAHUkqKrku2UVtqjEkQ+LM2l7LPn++N52BPMSYMcUrB4TwroyGADt5qPBXrG9B9N3b1MtUN843PK9ngB0DdvE/H3rEUvqr2dc4cNxiXaTR6/qRxzI2FQEzQaqzJH+w4iXd/o89YFHm0XOQ7OOiaoGjNEwVVzYihRh8trreEDMctfsCgYBDaTFdqYkrzwzOm22MLezzlVpeUNzeGA46ul1fHb/FrQqQSDcyUQd+9rbw1KCYkLdE3wXJgJJRTvVCqJd5zWSlSvtiAY+StNz2qdYxerYTa0qvyghUyJ9Vy1zOBZSpAxdrlI95+yQTJFQftmTWaw5GKZGy/AsVW+LdzRIC7QnSKw==");
+        merConfig.setRsaPublicKey("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxF1Sryfp4U9usNCjd+/4zqq2awhApJla0dmQaEd06zKabuBdffLlohsqT8HcbOg7qO2788o6wkDfhwjABxzlLnMcTgayu6kC6EvpQSE2HgtPVAjJS1cfCO/l8QzBBYsZJFTmAswVVyYKzHiH00c9AIF8hqORd93KF9X3FzCuy1+1i+I0spUYcc31MkkhwN6Lj9IxlyjmgnltRLHJDJg0rShGuga+w0AvolkTRuJ0o6bk8ZvCETTiV6TGgw0rXlSVQio1+xbaqFKk5LgUqo+O4Kqre59hqpzYfXKd4UNjK7zVjmKHwySw7l0Zduh1q4c9JfCKlkRr5ApU23YY+E2FhwIDAQAB");
+        merConfig.setHuifuId(mno);
+        try {
+            BasePay.initWithMerConfig(merConfig);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        Random random=new Random();
+        String result1 = "";
+        for (int i = 0; i < 6; i++) {
+            result1 += random.nextInt(10);
+        }
+        String ordNo = System.nanoTime() + result1;
+
+
+        // 2.组装请求参数
+        V2TradePaymentScanpayRefundRequest request = new V2TradePaymentScanpayRefundRequest();
+        // 请求日期
+        request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
+        // 请求流水号
+        request.setReqSeqId(ordNo);
+        // 商户号
+        request.setHuifuId(mno);
+        // 申请退款金额
+        request.setOrdAmt(df.format(trantAmt));
+        // 原交易请求日期
+        request.setOrgReqDate(dateString);
+
+        // 设置非必填字段
+        Map<String, Object> extendInfoMap = getExtendInfos(oldOrderNo);
+        request.setExtendInfo(extendInfoMap);
+
+        // 3. 发起API调用
+        Map<String, Object> response = BasePayClient.request(request,false);;
+        System.out.println("返回数据:" + JSONObject.toJSONString(response));
+
+
+        if("00000100".equals(response.get("resp_code"))||"00000000".equals(response.get("resp_code"))){
+            sysRespon.setResponCode("0000");
+            sysRespon.setResponMessage("退款成功");
+        }else {
+            sysRespon.setResponCode("0001");
+            sysRespon.setResponMessage(response.get("resp_desc")+"");
+        }
+        return  sysRespon;
+
+    }
+
+
+
+    /**
+     * 非必填字段
+     * @return
+     */
+    private static Map<String, Object> getExtendInfos(String  oldNo) {
+        // 设置非必填字段
+        Map<String, Object> extendInfoMap = new HashMap<>();
+        // 原交易请求流水号
+        extendInfoMap.put("org_req_seq_id", oldNo);
+        // 备注
+        extendInfoMap.put("remark", "12321312");
+        // 异步通知地址
+        extendInfoMap.put("notify_url", "");
+        // 是否垫资退款
+        extendInfoMap.put("loan_flag", "");
+        // 垫资承担者
+        extendInfoMap.put("loan_undertaker", "");
+        // 垫资账户类型
+        extendInfoMap.put("loan_acct_type", "");
+        return extendInfoMap;
+    }
+
+
 }

yijia-station/src/main/java/com/yijia/station/utils/ConsumeType.java

@@ -0,0 +1,22 @@
+package com.yijia.station.utils;
+
+public class ConsumeType {
+    private String type;    //收银宝支付宝（主扫）SCAN_WEIXIN； 收银宝支付宝（主扫）SCAN_ALIPAY；收银宝小程序支付 WECHATPAY_MINIPROGRAM； 收银宝公众号支付：WECHAT_PUBLIC
+    private Long amount;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Long amount) {
+        this.amount = amount;
+    }
+}

yijia-station/src/main/java/com/yijia/station/utils/HFparam.java

@@ -0,0 +1,123 @@
+package com.yijia.station.utils;
+
+import com.yijia.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+///汇付调用的参数信息
+public class HFparam extends BaseEntity {
+    private String req_date;                       //请求格式：yyyyMMdd                      必填
+    private String req_seq_id;                  //	请求流水号                    必填
+    private String huifu_id;                  //	商户号                    必填
+
+
+    /**
+     * T_JSAPI: 微信公众号
+     * T_MINIAPP: 微信小程序
+     * A_JSAPI: 支付宝JS
+     * A_NATIVE: 支付宝正扫
+     * U_NATIVE: 银联正扫
+     * U_JSAPI: 银联JS
+     * D_NATIVE: 数字人民币正扫
+     * **/
+    private String trade_type;                       //交易类型                      必填
+    private String trans_amt;                  //交易金额                    必填
+    private String goods_desc;                  //商品描述                    必填
+
+
+    private String notify_url;                       //回调地址
+
+    private String wx_data;                  //微信支付上传参数
+    private String alipay_data;                  //支付宝支付上传参数
+
+
+    public String getReq_date() {
+        return req_date;
+    }
+
+    public void setReq_date(String req_date) {
+        this.req_date = req_date;
+    }
+
+    public String getReq_seq_id() {
+        return req_seq_id;
+    }
+
+    public void setReq_seq_id(String req_seq_id) {
+        this.req_seq_id = req_seq_id;
+    }
+
+    public String getHuifu_id() {
+        return huifu_id;
+    }
+
+    public void setHuifu_id(String huifu_id) {
+        this.huifu_id = huifu_id;
+    }
+
+    public String getTrade_type() {
+        return trade_type;
+    }
+
+    public void setTrade_type(String trade_type) {
+        this.trade_type = trade_type;
+    }
+
+    public String getTrans_amt() {
+        return trans_amt;
+    }
+
+    public void setTrans_amt(String trans_amt) {
+        this.trans_amt = trans_amt;
+    }
+
+    public String getGoods_desc() {
+        return goods_desc;
+    }
+
+    public void setGoods_desc(String goods_desc) {
+        this.goods_desc = goods_desc;
+    }
+
+    public String getNotify_url() {
+        return notify_url;
+    }
+
+    public void setNotify_url(String notify_url) {
+        this.notify_url = notify_url;
+    }
+
+    public String getWx_data() {
+        return wx_data;
+    }
+
+    public void setWx_data(String sub_appid,String sub_openid) {
+        this.wx_data = "{\"sub_appid\":\""+sub_appid+"\",\"sub_openid\":\""+sub_openid+"\"}" ;
+    }
+
+    public String getAlipay_data() {
+        return alipay_data;
+    }
+
+    public void setAlipay_data(String alipay_data) {
+        this.alipay_data = alipay_data;
+    }
+
+    ///生成微信请求的json串
+
+    public String toJsonWx() {
+            return new ToStringBuilder(this,  ToStringStyle.JSON_STYLE)
+                    .append("req_date", getReq_date())
+                    .append("req_seq_id", getReq_seq_id())
+                    .append("huifu_id", getHuifu_id())
+                    .append("trade_type", getTrade_type())
+                    .append("trans_amt", getTrans_amt())
+                    .append("goods_desc", getGoods_desc())
+                    .append("notify_url", getNotify_url())
+                    .append("wx_data", getWx_data())
+                    .toString();
+
+    }
+
+
+}

yijia-station/src/main/java/com/yijia/station/controller/HttpUtils.java → yijia-station/src/main/java/com/yijia/station/utils/HttpUtils.java

@@ -1,9 +1,12 @@
-package com.yijia.station.controller;
+package com.yijia.station.utils;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpStatus;
+import org.apache.http.NameValuePair;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
@@ -12,15 +15,23 @@ import org.apache.http.conn.ssl.SSLContextBuilder;
 import org.apache.http.conn.ssl.TrustStrategy;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.StringJoiner;
+import java.util.stream.Collectors;
 
 public class HttpUtils {
 	
@@ -141,4 +152,46 @@ public class HttpUtils {
 		}
 		return null;
 	}
+
+
+	public static String post(String url, Map<String, String> parameters) throws IOException {
+		 CloseableHttpClient client = httpClientBuilder().build();
+		HttpPost post = new HttpPost(url);
+		List<NameValuePair> pairList = parameters.entrySet().stream()
+				.map(entry -> new BasicNameValuePair(entry.getKey(), entry.getValue()))
+				.collect(Collectors.toList());
+		StringJoiner requestBody = new StringJoiner("&");
+		for (NameValuePair each : pairList) {
+			requestBody.add(StringUtils.join(each.getName(), "=", each.getValue()));
+		}
+		//log.info("Request url : [{}], parameters : [{}]", url, requestBody);
+		post.setEntity(new UrlEncodedFormEntity(pairList, StandardCharsets.UTF_8));
+		 CloseableHttpResponse execute = client.execute(post);
+		int statusCode = execute.getStatusLine().getStatusCode();
+		if (statusCode != HttpStatus.SC_OK) {
+			throw new IOException(
+					"Http request error, error message : [" + execute.getStatusLine().getReasonPhrase() + "]");
+		}
+		String result = Objects.isNull(execute.getEntity()) ? "" : EntityUtils.toString(execute.getEntity(),
+				StandardCharsets.UTF_8.toString());
+		//log.info("Response body : [{}]", result);
+		return result;
+	}
+
+	private static HttpClientBuilder httpClientBuilder() {
+		return HttpClients.custom()
+				.disableAutomaticRetries()
+				.setDefaultRequestConfig(defaultRequestConfig());
+	}
+
+	private static RequestConfig defaultRequestConfig() {
+		return RequestConfig.custom()
+				.setConnectTimeout(30_000)
+				.setSocketTimeout(60_000)
+				.setConnectionRequestTimeout(5_000)
+				.build();
+	}
+
+
+
 }

yijia-station/src/main/java/com/yijia/station/utils/HuiFuUtils.java

@@ -0,0 +1,88 @@
+package com.yijia.station.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Base64;
+import java.util.TreeMap;
+
+public  class  HuiFuUtils {
+
+
+
+
+    /**
+     * 对json内的数据码进行排序，取消掉空字符串和空值
+     */
+    public static String  paraseJson(String inputDataJSON) {
+       return JSON.toJSONString(JSONObject.parseObject(inputDataJSON, TreeMap.class));
+    }
+
+
+
+
+
+
+    /**
+     * RSA私钥签名：签名方式SHA256WithRSA
+     * @param data 待签名字符串
+     * @param privateKeyBase64 私钥（Base64编码）
+     * @return 签名byte[]
+     * @throws Exception
+     */
+    public static String sign(String data, String privateKeyBase64) {
+        // Base64 --> Key
+        try {
+            byte[] bytes = Base64.getDecoder().decode(privateKeyBase64);
+            PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(bytes);
+            KeyFactory keyFactory;
+            keyFactory = KeyFactory.getInstance("RSA");
+            PrivateKey privateKey = keyFactory.generatePrivate(keySpec);
+            // Sign
+            Signature signature = Signature.getInstance("SHA256WithRSA");
+            signature.initSign(privateKey);
+            signature.update(data.getBytes("UTF-8"));
+            return Base64.getEncoder().encodeToString(signature.sign());
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+
+
+    /**
+     * 使用汇付RSA公钥验签
+     * @param data 待签名字符串
+     * @param publicKeyBase64 公钥（Base64编码）
+     * @return 验签结果
+     * @throws Exception
+     */
+    public static boolean verify(String data, String publicKeyBase64, String sign) {
+        // Base64 --> Key
+        try {
+            byte[] bytes = Base64.getDecoder().decode(publicKeyBase64);
+            X509EncodedKeySpec keySpec = new X509EncodedKeySpec(bytes);
+            KeyFactory keyFactory;
+            keyFactory = KeyFactory.getInstance("RSA");
+            PublicKey publicKey = keyFactory.generatePublic(keySpec);
+            // verify
+            Signature signature = Signature.getInstance("SHA256WithRSA");
+            signature.initVerify(publicKey);
+            signature.update(data.getBytes("UTF-8"));
+            return signature.verify(Base64.getDecoder().decode(sign));
+        } catch (Exception e) {
+            System.out.println("验签失败");
+            return false;
+        }
+
+    }
+
+
+
+}

yijia-station/src/main/java/com/yijia/station/utils/Request.java

@@ -0,0 +1,130 @@
+package com.yijia.station.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.TreeMap;
+
+/**
+ * @author zzq
+ * @version 1.0.0
+ * @Title {@link}
+ * @Description
+ * @date 2020/5/26
+ */
+
+public class Request<T> implements Serializable {
+
+    private static final long serialVersionUID = -1128445146065327824L;
+
+    private String appId;
+    private String version;
+    private String charset;
+    private String signType;
+    private String sign;
+    private String timestamp;
+    private String service;
+    private T bizContent;
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getCharset() {
+        return charset;
+    }
+
+    public void setCharset(String charset) {
+        this.charset = charset;
+    }
+
+    public String getSignType() {
+        return signType;
+    }
+
+    public void setSignType(String signType) {
+        this.signType = signType;
+    }
+
+    public String getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(String timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getService() {
+        return service;
+    }
+
+    public void setService(String service) {
+        this.service = service;
+    }
+
+    public T getBizContent() {
+        return bizContent;
+    }
+
+    public void setBizContent(T bizContent) {
+        this.bizContent = bizContent;
+    }
+
+    public void sign(String key) {
+        TreeMap<String, String> param = new TreeMap<>();
+        param.put("appId", appId);
+        param.put("version", version);
+        param.put("charset", charset);
+        param.put("signType", signType);
+        param.put("timestamp", timestamp);
+        param.put("service", service);
+        param.put("bizContent", JSON.toJSONString(bizContent));
+        param.put("key", key);
+        this.sign = SignUtils.sign(param);
+    }
+
+    public Map<String, String> toMap() {
+        Map<String, String> param = new HashMap<>();
+        param.put("appId", appId);
+        param.put("version", version);
+        param.put("charset", charset);
+        param.put("signType", signType);
+        param.put("timestamp", timestamp);
+        param.put("service", service);
+        param.put("sign", sign);
+        param.put("bizContent", JSON.toJSONString(bizContent));
+        return param;
+    }
+
+    public void verify(String result, String appKey) {
+        JSONObject jsonObject = JSON.parseObject(result);
+        TreeMap<String, String> resultParam = new TreeMap<>();
+        for (Entry<String, Object> each : jsonObject.entrySet()) {
+            resultParam.put(each.getKey(),
+                Objects.nonNull(each.getValue()) ? String.valueOf(each.getValue()) : StringUtils.EMPTY);
+        }
+        resultParam.put("key", appKey);
+        if (!SignUtils.verify(resultParam)) {
+            throw new RuntimeException("验签不通过");
+        }
+    }
+
+}

yijia-station/src/main/java/com/yijia/station/utils/SignUtils.java

@@ -0,0 +1,39 @@
+package com.yijia.station.utils;
+
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Map.Entry;
+import java.util.StringJoiner;
+import java.util.TreeMap;
+
+/**
+ * @author zzq
+ * @version 1.0.0
+ * @Title {@link}
+ * @Description
+ * @date 2020/5/27
+ */
+
+public class SignUtils {
+
+    public static String sign(TreeMap<String, String> param) {
+        StringJoiner joiner = new StringJoiner("&");
+        for (Entry<String, String> each : param.entrySet()) {
+            joiner.add(StringUtils.join(each.getKey(), "=", each.getValue()));
+        }
+
+        return DigestUtils.md5Hex(joiner.toString());
+    }
+
+    public static boolean verify(TreeMap<String, String> param) {
+        String originalSign = param.remove("sign");
+        String sign = sign(param);
+        //log.info("原密文 : [{}], MD5签名结果 : [{}]", originalSign, sign);
+        boolean verify = StringUtils.equals(originalSign, sign);
+        //log.info("签名验证结果: [{}]", verify ? "通过" : "不通过");
+        return verify;
+    }
+
+}

yijia-station/src/main/java/com/yijia/station/utils/Tlparam.java

@@ -0,0 +1,75 @@
+package com.yijia.station.utils;
+
+import java.util.List;
+
+public class Tlparam {
+    private String sysId;                       //系统编号                      必填
+    private String bizOrderNo;                  //商户订单号                    必填
+    private String oldBizOrderNo;                  //商户订单号                    必填
+    private Long amount;                        //交易金额（单位分）              必填
+    private List<ConsumeType> consumeTypes;     //消费类型列表                   必填
+
+    private String shiftsTime;                  //班次时间 yyyyMMdd
+    private String shiftsMask;                  //班次标识
+
+
+    public String getOldBizOrderNo() {
+        return oldBizOrderNo;
+    }
+
+    public void setOldBizOrderNo(String oldBizOrderNo) {
+        this.oldBizOrderNo = oldBizOrderNo;
+    }
+
+    public String getSysId() {
+        return sysId;
+    }
+
+    public void setSysId(String sysId) {
+        this.sysId = sysId;
+    }
+
+    public String getBizOrderNo() {
+        return bizOrderNo;
+    }
+
+    public void setBizOrderNo(String bizOrderNo) {
+        this.bizOrderNo = bizOrderNo;
+    }
+
+    public Long getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Long amount) {
+        this.amount = amount;
+    }
+
+
+
+    public List<ConsumeType> getConsumeTypes() {
+        return consumeTypes;
+    }
+
+    public void setConsumeTypes(List<ConsumeType> consumeTypes) {
+        this.consumeTypes = consumeTypes;
+    }
+
+    public String getShiftsTime() {
+        return shiftsTime;
+    }
+
+    public void setShiftsTime(String shiftsTime) {
+        this.shiftsTime = shiftsTime;
+    }
+
+    public String getShiftsMask() {
+        return shiftsMask;
+    }
+
+    public void setShiftsMask(String shiftsMask) {
+        this.shiftsMask = shiftsMask;
+    }
+
+
+}

yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml

@@ -222,7 +222,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         p.refund_date,
         p.examin_status,
         p.refund_success_date,
-        p.third_payment
+        p.third_payment,
+        a.mobile_phone
         FROM
         pay_order p
         JOIN sys_dept d ON p.station_id = d.dept_id
@@ -237,6 +238,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="oilGun != null  and oilGun != ''"> and p.oil_gun = #{oilGun}</if>
             <if test="oilName != null  and oilName != ''"> and p.oil_name like concat('%', #{oilName}, '%')</if>
             <if test="oilPirce != null "> and p.oil_pirce = #{oilPirce}</if>
+            <if test="mobilePhone != null "> and a.mobile_phone like concat('%', #{mobilePhone}, '%')</if>
             <if test="oilType != null  and oilType != ''"> and p.oil_type = #{oilType}</if>
             <if test="orderLiters != null "> and p.order_liters = #{orderLiters}</if>
             <if test="amt != null "> and p.amt = #{amt}</if>

yijia-station/src/main/resources/mapper/station/StationSettlementPriceAdjustMapper.xml

@@ -15,11 +15,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="parentId"    column="parent_id"    />
         <result property="createName"    column="create_name"    />
         <result property="stationName"    column="station_name"    />
+        <result property="driverPriceType"    column="driver_price_type"    />
     </resultMap>
 
     <sql id="selectStationSettlementPriceAdjustVo">
         select c.id, c.create_by, c.create_time,c.parent_id, c.settlement_price, c.settlement_type,
-         c.driver_price,c.station_id,dept_name as station_name,u.nick_name as create_name
+         c.driver_price,c.station_id,dept_name as station_name,u.nick_name as create_name,driver_price_type
 		from station_settlement_price_adjust c left join sys_dept d on c.station_id = d.dept_id
 		left join sys_user u on c.create_by =u.user_id
     </sql>
@@ -30,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settlementPrice != null "> and settlement_price = #{settlementPrice}</if>
             <if test="settlementType != null  and settlementType != ''"> and settlement_type = #{settlementType}</if>
             <if test="driverPrice != null "> and driver_price = #{driverPrice}</if>
+            <if test="driverPriceType != null "> and driver_price_type = #{driverPriceType}</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="parentId != null "> and parent_id = #{parentId}</if>
             <if test="stationIdList != null ">
@@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="driverPrice != null">driver_price,</if>
             <if test="stationId != null">station_id,</if>
             <if test="parentId != null">parent_id,</if>
+            <if test="driverPriceType != null">driver_price_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -69,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="driverPrice != null">#{driverPrice},</if>
             <if test="stationId != null">#{stationId},</if>
             <if test="parentId != null">#{parentId},</if>
+            <if test="driverPriceType != null">#{driverPriceType},</if>
          </trim>
     </insert>
 
@@ -82,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="driverPrice != null">driver_price = #{driverPrice},</if>
             <if test="stationId != null">station_id = #{stationId},</if>
             <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="driverPriceType != null">driver_price_type = #{driverPriceType},</if>
         </trim>
         where id = #{id}
     </update>

yijia-station/src/main/resources/mapper/station/StationSettlementPriceMapper.xml

@@ -18,11 +18,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="balance"    column="balance"    />
         <result property="deptId"    column="dept_id"    />
         <result property="stationName"    column="station_name"    />
+        <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectStationSettlementPriceVo">
         select id, station_id, settlement_type, settlement_price, driver_price,p.create_by,p.create_time,
-        p.update_by,p.update_time,d.dept_name as station_name,balance,dept_id,driver_price_type
+        p.update_by,p.update_time,d.dept_name as station_name,balance,dept_id,driver_price_type,d.status
         from sys_dept d  left join station_settlement_price p on d.dept_id = p.station_id    </sql>
 
     <select id="selectStationSettlementPriceList" parameterType="StationSettlementPrice" resultMap="StationSettlementPriceResult">

yijia-station/target/classes/mapper/station/PayOrderMapper.xml

@@ -222,7 +222,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         p.refund_date,
         p.examin_status,
         p.refund_success_date,
-        p.third_payment
+        p.third_payment,
+        a.mobile_phone
         FROM
         pay_order p
         JOIN sys_dept d ON p.station_id = d.dept_id
@@ -237,6 +238,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="oilGun != null  and oilGun != ''"> and p.oil_gun = #{oilGun}</if>
             <if test="oilName != null  and oilName != ''"> and p.oil_name like concat('%', #{oilName}, '%')</if>
             <if test="oilPirce != null "> and p.oil_pirce = #{oilPirce}</if>
+            <if test="mobilePhone != null "> and a.mobile_phone like concat('%', #{mobilePhone}, '%')</if>
             <if test="oilType != null  and oilType != ''"> and p.oil_type = #{oilType}</if>
             <if test="orderLiters != null "> and p.order_liters = #{orderLiters}</if>
             <if test="amt != null "> and p.amt = #{amt}</if>

yijia-station/target/classes/mapper/station/StationSettlementPriceAdjustMapper.xml

@@ -15,11 +15,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="parentId"    column="parent_id"    />
         <result property="createName"    column="create_name"    />
         <result property="stationName"    column="station_name"    />
+        <result property="driverPriceType"    column="driver_price_type"    />
     </resultMap>
 
     <sql id="selectStationSettlementPriceAdjustVo">
         select c.id, c.create_by, c.create_time,c.parent_id, c.settlement_price, c.settlement_type,
-         c.driver_price,c.station_id,dept_name as station_name,u.nick_name as create_name
+         c.driver_price,c.station_id,dept_name as station_name,u.nick_name as create_name,driver_price_type
 		from station_settlement_price_adjust c left join sys_dept d on c.station_id = d.dept_id
 		left join sys_user u on c.create_by =u.user_id
     </sql>
@@ -30,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settlementPrice != null "> and settlement_price = #{settlementPrice}</if>
             <if test="settlementType != null  and settlementType != ''"> and settlement_type = #{settlementType}</if>
             <if test="driverPrice != null "> and driver_price = #{driverPrice}</if>
+            <if test="driverPriceType != null "> and driver_price_type = #{driverPriceType}</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="parentId != null "> and parent_id = #{parentId}</if>
             <if test="stationIdList != null ">
@@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="driverPrice != null">driver_price,</if>
             <if test="stationId != null">station_id,</if>
             <if test="parentId != null">parent_id,</if>
+            <if test="driverPriceType != null">driver_price_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -69,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="driverPrice != null">#{driverPrice},</if>
             <if test="stationId != null">#{stationId},</if>
             <if test="parentId != null">#{parentId},</if>
+            <if test="driverPriceType != null">#{driverPriceType},</if>
          </trim>
     </insert>
 
@@ -82,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="driverPrice != null">driver_price = #{driverPrice},</if>
             <if test="stationId != null">station_id = #{stationId},</if>
             <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="driverPriceType != null">driver_price_type = #{driverPriceType},</if>
         </trim>
         where id = #{id}
     </update>

yijia-station/target/classes/mapper/station/StationSettlementPriceMapper.xml

@@ -18,11 +18,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="balance"    column="balance"    />
         <result property="deptId"    column="dept_id"    />
         <result property="stationName"    column="station_name"    />
+        <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectStationSettlementPriceVo">
         select id, station_id, settlement_type, settlement_price, driver_price,p.create_by,p.create_time,
-        p.update_by,p.update_time,d.dept_name as station_name,balance,dept_id,driver_price_type
+        p.update_by,p.update_time,d.dept_name as station_name,balance,dept_id,driver_price_type,d.status
         from sys_dept d  left join station_settlement_price p on d.dept_id = p.station_id    </sql>
 
     <select id="selectStationSettlementPriceList" parameterType="StationSettlementPrice" resultMap="StationSettlementPriceResult">

yijia-station/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jun 22 17:02:11 CST 2022
+#Thu Sep 22 11:14:53 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-station

yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,5 +1,6 @@
 com\yijia\station\controller\StationPicController.class
 com\yijia\station\controller\StationSettlementPriceController.class
+com\yijia\station\utils\Request.class
 com\yijia\station\service\IStationSettlementPriceAdjustService.class
 com\yijia\station\mapper\StationBalanceChangeMapper.class
 com\yijia\station\service\impl\StationClassesSummaryServiceImpl.class
@@ -12,6 +13,7 @@ com\yijia\station\mapper\StationOilGunMapper.class
 com\yijia\station\controller\StationNoticeController.class
 com\yijia\station\domain\StationClassesSummary.class
 com\yijia\station\domain\PayOrder.class
+com\yijia\station\utils\HttpUtils$1.class
 com\yijia\station\mapper\StationNoticeMapper.class
 com\yijia\station\mapper\StationPersonnelMapper.class
 com\yijia\station\controller\StationOilPriceController.class
@@ -25,29 +27,32 @@ com\yijia\station\service\impl\StationOilGunServiceImpl.class
 com\yijia\station\service\IStationPersonnelService.class
 com\yijia\station\domain\StationPayInterfance.class
 com\yijia\station\service\impl\StationNoticeServiceImpl.class
+com\yijia\station\utils\HFparam.class
 com\yijia\station\controller\ApiRequestBean.class
 com\yijia\station\task\SaticScheduleTask.class
 com\yijia\station\service\IStationPicService.class
 com\yijia\station\mapper\StationInfoMapper.class
 com\yijia\station\service\impl\StationSettlementPriceAdjustServiceImpl.class
 com\yijia\station\service\IStationInfoService.class
-com\yijia\station\controller\HttpUtils$1.class
 com\yijia\station\service\IStationOilPriceService.class
 com\yijia\station\mapper\StationClassesSummaryMapper.class
 com\yijia\station\domain\SysDeptDemo.class
 com\yijia\station\domain\StationOilPriceAdjust.class
 com\yijia\station\controller\StationInfoController.class
 com\yijia\station\domain\StationOilGun.class
+com\yijia\station\utils\HttpUtils.class
 com\yijia\station\service\impl\StationOilPriceServiceImpl.class
 com\yijia\station\mapper\StationDeviceManageMapper.class
 com\yijia\station\mapper\StationSettlementPriceMapper.class
 com\yijia\station\controller\SysAppUserInfoController.class
+com\yijia\station\utils\SignUtils.class
 com\yijia\station\service\IStationNoticeService.class
 com\yijia\station\service\impl\StationOilPriceAdjustServiceImpl.class
 com\yijia\station\controller\RSAEncrypt.class
 com\yijia\station\service\IStationSettlementPriceService.class
 com\yijia\station\controller\StationDeviceManageController.class
 com\yijia\station\controller\StationPersonnelController.class
+com\yijia\station\utils\Tlparam.class
 com\yijia\station\mapper\StationPicMapper.class
 com\yijia\station\domain\StationSettlementPriceAdjust.class
 com\yijia\station\controller\PayOrderController.class
@@ -63,7 +68,6 @@ com\yijia\station\service\IStationBalanceChangeService.class
 com\yijia\station\controller\NoOilOrderController.class
 com\yijia\station\controller\RSASignature.class
 com\yijia\station\controller\ApiResponseBean.class
-com\yijia\station\controller\HttpUtils.class
 com\yijia\station\service\IStationOilPriceAdjustService.class
 com\yijia\station\mapper\PayOrderMapper.class
 com\yijia\station\mapper\StationClassStructureMapper.class
@@ -71,6 +75,7 @@ com\yijia\station\service\IStationClassStructureService.class
 com\yijia\station\controller\StationClassStructureController.class
 com\yijia\station\service\IStationOilGunService.class
 com\yijia\station\domain\StationClassStructure.class
+com\yijia\station\utils\HuiFuUtils.class
 com\yijia\station\domain\StationPersonnel.class
 com\yijia\station\controller\StationOilGunController.class
 com\yijia\station\utils\FeiEPrinterUtil.class
@@ -85,6 +90,7 @@ com\yijia\station\service\IStationDeviceManageService.class
 com\yijia\station\domain\StationInfo.class
 com\yijia\station\service\IStationPayService.class
 com\yijia\station\domain\StationPay.class
+com\yijia\station\utils\ConsumeType.class
 com\yijia\station\controller\SXFPaySign.class
 com\yijia\station\mapper\StationSettlementPriceAdjustMapper.class
 com\yijia\station\controller\StationPayController.class

yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,6 +1,7 @@
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationDeviceManageServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationClassStructureController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationClassStructure.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\utils\HFparam.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationSettlementPriceServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\NoOilOrderController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationOilPriceMapper.java
@@ -32,6 +33,8 @@ D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\servi
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\utils\FeiEPrinterUtil.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationPayInterfance.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationSettlementPriceAdjustServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\utils\SignUtils.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\utils\HttpUtils.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationBalanceChangeController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationSettlementPriceMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\PayOrderServiceImpl.java
@@ -46,10 +49,12 @@ D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mappe
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationClassesSummaryController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationClassesSummary.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationDeviceManage.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\utils\Tlparam.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationOilPriceController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationInfoServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationPay111Controller.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationPersonnel.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\utils\ConsumeType.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationSettlementPriceAdjust.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationSettlementPriceAdjustMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationBalanceChangeService.java
@@ -66,6 +71,7 @@ D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domai
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationDeviceManageMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationOilGunService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationPicService.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\utils\Request.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationPersonnelService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationPayService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationNoticeController.java
@@ -76,11 +82,11 @@ D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mappe
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationSettlementPriceAdjustController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationInfoMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\SXFPaySign.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\HttpUtils.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationPersonnelController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationPayController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\ApiResponseBean.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationPayServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\utils\HuiFuUtils.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\DeptInfoDemo.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationOilPriceAdjust.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilGunServiceImpl.java

yijia-station/yijia-station.iml

@@ -20,6 +20,17 @@
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
     <orderEntry type="library" name="Maven: org.saobei:saobeiopen:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.huifu.adapay.core:adapay-core-sdk:1.2.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.12" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.74" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
+    <orderEntry type="library" name="Maven: com.huifu.adapay:adapay-java-sdk:1.2.10" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.huifu:dg-demo-3.0.1-sources:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.huifu:dg-java-sdk-3.0.1:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.huifu:dg-java-sdk-3.0.1-sources:3.0.1" level="project" />
     <orderEntry type="module" module-name="yijia-common" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.18.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.18.RELEASE" level="project" />
@@ -55,11 +66,9 @@
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.6" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.74" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />

yijia-system/target/classes/mapper/system/SysAppUserInfoMapper.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.system.mapper.SysAppUserInfoMapper">
+    
+    <resultMap type="SysAppUserInfo" id="SysAppUserInfoResult">
+    	<id     property="userId"      column="user_id"      />
+        <result property="userType"    column="user_type"    />
+        <result property="minaOpenid"     column="mina_openid"     />
+        <result property="blogOpenid"   column="blog_openid"   />
+        <result property="mobilePhone"    column="mobile_phone"    />
+        <result property="sexFlag"      column="sex_flag"      />
+        <result property="registeDate"    column="registe_date"    />
+        <result property="blogToken"      column="blog_token"      />
+        <result property="minaToken"    column="mina_token"    />
+        <result property="blogNickName"    column="blog_nick_name"    />
+        <result property="blogProfilePhoto"    column="blog_profile_photo"    />
+        <result property="updateDate"    column="update_date"    />
+        <result property="unionId"    column="union_id"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="aliId"    column="ali_id"    />
+    </resultMap>
+    
+    <sql id="selectSysAppUserInfoVo">
+        SELECT user_id,user_type,blog_openid,mina_openid,mobile_phone,blog_nick_name,
+     sex_flag,registe_date,blog_token,mina_token,blog_profile_photo,update_date,
+     union_id,station_id,ali_id
+     from app_user_info
+    </sql>
+    
+
+    
+    <select id="selectSysAppUserInfoList" parameterType="SysAppUserInfo" resultMap="SysAppUserInfoResult">
+        <include refid="selectSysAppUserInfoVo"/>
+        <where>
+			<if test="userType != null and userType != ''">
+				AND user_type =#{userType}
+			</if>
+			<if test="minaOpenid != null and minaOpenid != ''">
+				AND mina_openid = #{minaOpenid}
+			</if>
+            <if test="blogOpenid != null and blogOpenid != ''">
+                AND blog_openid = #{blogOpenid}
+            </if>
+            <if test="sexFlag != null and sexFlag != ''">
+                AND sex_flag = #{sexFlag}
+            </if>
+            <if test="registeDate != null and registeDate != ''">
+                AND registe_date = #{registeDate}
+            </if>
+            <if test="blogToken != null and blogToken != ''">
+                AND blog_token = #{blogToken}
+            </if>
+            <if test="minaOpenid != null and minaOpenid != ''">
+                AND mina_openid = #{minaOpenid}
+            </if>
+            <if test="blogNickName != null and blogNickName != ''">
+                AND blog_nick_name = #{blogNickName}
+            </if>
+            <if test="blogProfilePhoto != null and blogProfilePhoto != ''">
+                AND blog_profile_photo = #{blogProfilePhoto}
+            </if>
+            <if test="updateDate != null and updateDate != ''">
+                AND update_date = #{updateDate}
+            </if>
+
+            <if test="unionId != null and unionId != ''">
+                AND union_id = #{unionId}
+            </if>
+
+            <if test="stationId != null and stationId != ''">
+                AND station_id = #{stationId}
+            </if>
+
+            <if test="aliId != null and aliId != ''">
+                AND ali_id = #{aliId}
+            </if>
+		</where>
+    </select>
+
+    <select id="selectSysAppUserInfoById" parameterType="Long" resultMap="SysAppUserInfoResult">
+        <include refid="selectSysAppUserInfoVo"/>
+        where user_id = #{userId}
+    </select>
+</mapper>

yijia-system/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jun 22 17:02:04 CST 2022
+#Thu Sep 22 11:14:47 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-system