'添加支付字段'

.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__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,15 +26,52 @@
   </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/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__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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/SAAS_AFTEREND2_jar/SAAS-AFTEREND2.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/SAAS_AFTEREND2_jar/SAAS-AFTEREND2.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-common/src/main/java/com/yijia/common/core/domain/entity/ShiftClass.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/src/main/java/com/yijia/common/core/domain/entity/ShiftClass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/entity/ShiftClass.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/entity/ShiftClass.class" 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/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/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/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" 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/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" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/yijia-customer-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/yijia-customer-1.0.1.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-framework/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-framework/target/maven-archiver/pom.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-framework/target/yijia-framework-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-framework/target/yijia-framework-1.0.1.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-generator/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-generator/target/maven-archiver/pom.properties" afterDir="false" />
+      <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/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" />
+      <change beforePath="$PROJECT_DIR$/yijia-market/target/yijia-market-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-market/target/yijia-market-1.0.1.jar" afterDir="false" />
+      <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/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/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/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-system/src/main/resources/mapper/system/ShiftClassMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/ShiftClassMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/ShiftClassMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/ShiftClassMapper.xml" 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/target/classes/META-INF/yijia-station.kotlin_module" 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/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/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/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/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/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/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/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" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -308,7 +345,7 @@
       <workItem from="1665190910176" duration="2359000" />
       <workItem from="1665277043309" duration="10334000" />
       <workItem from="1665622771275" duration="5158000" />
-      <workItem from="1665709084314" duration="18983000" />
+      <workItem from="1665709084314" duration="24188000" />
     </task>
     <task id="LOCAL-00001" summary="前端配置文件package-config.json删除">
       <created>1619772586309</created>
@@ -716,54 +753,54 @@
       <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="1664420679024" />
-    <state width="1860" height="337" key="GridCell.Tab.0.bottom" timestamp="1665973506135">
+    <state width="1860" height="318" key="GridCell.Tab.0.bottom" timestamp="1666167865573">
       <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="1665973506135" />
-    <state width="1860" height="337" key="GridCell.Tab.0.center" timestamp="1665973506135">
+    <state width="1860" height="318" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1666167865573" />
+    <state width="1860" height="318" key="GridCell.Tab.0.center" timestamp="1666167865573">
       <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="1665973506135" />
-    <state width="1860" height="337" key="GridCell.Tab.0.left" timestamp="1665973506134">
+    <state width="1860" height="318" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1666167865573" />
+    <state width="1860" height="318" key="GridCell.Tab.0.left" timestamp="1666167865573">
       <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="1665973506134" />
-    <state width="1860" height="337" key="GridCell.Tab.0.right" timestamp="1665973506135">
+    <state width="1860" height="318" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1666167865573" />
+    <state width="1860" height="318" key="GridCell.Tab.0.right" timestamp="1666167865573">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665973506135" />
-    <state width="1860" height="337" key="GridCell.Tab.1.bottom" timestamp="1665973505931">
+    <state width="1860" height="318" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1666167865573" />
+    <state width="1860" height="337" key="GridCell.Tab.1.bottom" timestamp="1666058203693">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.1.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665973505931" />
-    <state width="1860" height="337" key="GridCell.Tab.1.center" timestamp="1665973505931">
+    <state width="1860" height="337" key="GridCell.Tab.1.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1666058203693" />
+    <state width="1860" height="337" key="GridCell.Tab.1.center" timestamp="1666058203693">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.1.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665973505931" />
-    <state width="1860" height="337" key="GridCell.Tab.1.left" timestamp="1665973505931">
+    <state width="1860" height="337" key="GridCell.Tab.1.center/0.0.1920.1160@0.0.1920.1160" timestamp="1666058203693" />
+    <state width="1860" height="337" key="GridCell.Tab.1.left" timestamp="1666058203693">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.1.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665973505931" />
-    <state width="1860" height="337" key="GridCell.Tab.1.right" timestamp="1665973505931">
+    <state width="1860" height="337" key="GridCell.Tab.1.left/0.0.1920.1160@0.0.1920.1160" timestamp="1666058203693" />
+    <state width="1860" height="337" key="GridCell.Tab.1.right" timestamp="1666058203693">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.1.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665973505931" />
-    <state width="1860" height="337" key="GridCell.Tab.2.bottom" timestamp="1665973505932">
+    <state width="1860" height="337" key="GridCell.Tab.1.right/0.0.1920.1160@0.0.1920.1160" timestamp="1666058203693" />
+    <state width="1860" height="337" key="GridCell.Tab.2.bottom" timestamp="1666058203694">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.2.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665973505932" />
-    <state width="1860" height="337" key="GridCell.Tab.2.center" timestamp="1665973505932">
+    <state width="1860" height="337" key="GridCell.Tab.2.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1666058203694" />
+    <state width="1860" height="337" key="GridCell.Tab.2.center" timestamp="1666058203694">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.2.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665973505932" />
-    <state width="1860" height="337" key="GridCell.Tab.2.left" timestamp="1665973505932">
+    <state width="1860" height="337" key="GridCell.Tab.2.center/0.0.1920.1160@0.0.1920.1160" timestamp="1666058203694" />
+    <state width="1860" height="337" key="GridCell.Tab.2.left" timestamp="1666058203693">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.2.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665973505932" />
-    <state width="1860" height="337" key="GridCell.Tab.2.right" timestamp="1665973505932">
+    <state width="1860" height="337" key="GridCell.Tab.2.left/0.0.1920.1160@0.0.1920.1160" timestamp="1666058203693" />
+    <state width="1860" height="337" key="GridCell.Tab.2.right" timestamp="1666058203694">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.2.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665973505932" />
+    <state width="1860" height="337" key="GridCell.Tab.2.right/0.0.1920.1160@0.0.1920.1160" timestamp="1666058203694" />
     <state x="461" y="231" key="SettingsEditor" timestamp="1663724002207">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>

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

@@ -11,6 +11,9 @@ spring:
                 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://47.105.116.204:3306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8&useSSL=true
+#                username: develop
+#                password: 1234.Abcd
                 #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/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Oct 13 09:38:01 CST 2022
+#Wed Oct 19 16:24:42 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-admin

yijia-admin/yijia-admin.iml

@@ -143,6 +143,13 @@
     <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: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: org.apache.httpcomponents:httpmime:4.5.12" 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.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0" 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" />

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Oct 13 09:37:54 CST 2022
+#Wed Oct 19 16:24:32 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-common

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

@@ -62,6 +62,7 @@ com\yijia\common\constant\ScheduleConstants$Status.class
 com\yijia\common\core\domain\model\LoginBody.class
 com\yijia\common\core\page\TableSupport.class
 com\yijia\common\exception\file\FileSizeLimitExceededException.class
+com\yijia\common\core\domain\entity\ShiftClass.class
 com\yijia\common\utils\uuid\IdUtils.class
 com\yijia\common\exception\file\FileException.class
 com\yijia\common\core\text\StrFormatter.class

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Oct 13 09:37:58 CST 2022
+#Wed Oct 19 16:24:37 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
-#Thu Oct 13 09:37:59 CST 2022
+#Wed Oct 19 16:24:38 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
-#Thu Oct 13 09:37:56 CST 2022
+#Wed Oct 19 16:24:34 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
-#Thu Oct 13 09:37:57 CST 2022
+#Wed Oct 19 16:24:36 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
-#Thu Oct 13 09:37:59 CST 2022
+#Wed Oct 19 16:24:38 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
-#Thu Oct 13 09:37:58 CST 2022
+#Wed Oct 19 16:24:37 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
-#Thu Oct 13 09:38:00 CST 2022
+#Wed Oct 19 16:24:40 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
-#Thu Oct 13 09:37:57 CST 2022
+#Wed Oct 19 16:24:35 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-quartz

yijia-station/pom.xml

@@ -39,17 +39,17 @@
 <!--        </dependency>-->
 
 <!--        &lt;!&ndash; https://mvnrepository.com/artifact/com.huifu.adapay/adapay-java-sdk &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.huifu.adapay</groupId>-->
-<!--            <artifactId>adapay-java-sdk</artifactId>-->
-<!--            <version>1.2.10</version>-->
-<!--        </dependency>-->
+        <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-demo-3.0.1-sources</artifactId>
+            <version>3.0.1</version>
+        </dependency>
 
         <dependency>
             <groupId>com.huifu</groupId>

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

@@ -476,11 +476,11 @@ public class PayOrderController extends BaseController
     /**
      * lng线上退款
      */
-    @GetMapping(value = "/examinRefundLNGSuccess")
-    public AjaxResult refund(@RequestBody PayOrder payOrder)
+    @GetMapping(value = "/examinRefundLNGSuccess/{orderId}")
+    public AjaxResult examinRefundLNGSuccess(@PathVariable("orderId") Long orderId)
     {
 
-        PayOrder payOrder1=payOrderService.selectPayOrderById(payOrder.getOrderId());
+        PayOrder payOrder1=payOrderService.selectPayOrderById(orderId);
         if(payOrder1.getStatus().equals("3")){
             return AjaxResult.error("已经被线上退款，不能重复退款");
         }
@@ -488,7 +488,7 @@ public class PayOrderController extends BaseController
             return AjaxResult.error("已经被退款，不能重复退款");
         }
         try {
-            AjaxResult ajaxResult=payOrderService.lngRefund(payOrder);
+            AjaxResult ajaxResult=payOrderService.lngRefund(payOrder1);
             return ajaxResult;
         } catch (Exception e) {
             return AjaxResult.error(e.getMessage());

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

@@ -68,6 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="printNum"    column="print_num"  />
         <result property="userName"    column="user_name"  />
         <result property="thirdPayment"    column="third_payment"  />
+        <result column="tl_shifts_mask"      property="tlShiftsMask" />
+        <result column="tl_shifts_time"      property="tlShiftsTime" />
     </resultMap>
 
 
@@ -77,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt,
            other_amt, dzk_amt, score, member_no, member_amt, print_count, pay_type, pay_way, oil_personnel,
             pay_date, created_date, order_type, car_no, customer_phone, customer_grade,sell_amt,sell_discount_amt,driver_discount_amt,
-            examin_user,examin_date,refund_user,refund_date,examin_status,refund_success_date,p.third_payment
+            examin_user,examin_date,refund_user,refund_date,examin_status,refund_success_date,p.third_payment,p.tl_shifts_mask,p.tl_shifts_time
             from pay_order p join sys_dept d on p.station_id =d.dept_id
     </sql>
 
@@ -646,7 +648,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt,
         other_amt, dzk_amt, score, member_no, member_amt, print_count, pay_type, pay_way, oil_personnel,oil_personnel_id,
         pay_date, created_date, order_type, car_no,customer_grade,sell_amt,sell_discount_amt,
-        examin_user,examin_date,refund_user,refund_date,examin_status,refund_success_date,p.third_payment
+        examin_user,examin_date,refund_user,refund_date,examin_status,refund_success_date,p.third_payment,p.tl_shifts_mask,p.tl_shifts_time
         from pay_order p
         where order_id = #{orderId}
     </select>

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

@@ -68,6 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="printNum"    column="print_num"  />
         <result property="userName"    column="user_name"  />
         <result property="thirdPayment"    column="third_payment"  />
+        <result column="tl_shifts_mask"      property="tlShiftsMask" />
+        <result column="tl_shifts_time"      property="tlShiftsTime" />
     </resultMap>
 
 
@@ -77,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt,
            other_amt, dzk_amt, score, member_no, member_amt, print_count, pay_type, pay_way, oil_personnel,
             pay_date, created_date, order_type, car_no, customer_phone, customer_grade,sell_amt,sell_discount_amt,driver_discount_amt,
-            examin_user,examin_date,refund_user,refund_date,examin_status,refund_success_date,p.third_payment
+            examin_user,examin_date,refund_user,refund_date,examin_status,refund_success_date,p.third_payment,p.tl_shifts_mask,p.tl_shifts_time
             from pay_order p join sys_dept d on p.station_id =d.dept_id
     </sql>
 
@@ -646,7 +648,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt,
         other_amt, dzk_amt, score, member_no, member_amt, print_count, pay_type, pay_way, oil_personnel,oil_personnel_id,
         pay_date, created_date, order_type, car_no,customer_grade,sell_amt,sell_discount_amt,
-        examin_user,examin_date,refund_user,refund_date,examin_status,refund_success_date,p.third_payment
+        examin_user,examin_date,refund_user,refund_date,examin_status,refund_success_date,p.third_payment,p.tl_shifts_mask,p.tl_shifts_time
         from pay_order p
         where order_id = #{orderId}
     </select>

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Oct 13 09:38:00 CST 2022
+#Wed Oct 19 16:24:40 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-station

yijia-station/yijia-station.iml

@@ -20,6 +20,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: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: org.apache.httpcomponents:httpmime:4.5.12" 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.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.74" 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" />
@@ -57,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/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Oct 13 09:37:55 CST 2022
+#Wed Oct 19 16:24:33 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-system

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

@@ -10,7 +10,9 @@ com\yijia\system\service\ISysDictTypeService.class
 com\yijia\system\domain\SysAppUserInfo.class
 com\yijia\system\domain\SysOperLog.class
 com\yijia\system\domain\vo\RouterVo.class
+com\yijia\system\mapper\ShiftMaskMapper.class
 com\yijia\system\service\impl\SysAgentServiceImpl.class
+com\yijia\system\service\impl\ShiftMaskServiceImpl.class
 com\yijia\system\service\ISysMenuService.class
 com\yijia\system\domain\SysPost.class
 com\yijia\system\service\impl\SysRoleServiceImpl.class
@@ -30,6 +32,7 @@ com\yijia\system\service\impl\SysDictDataServiceImpl.class
 com\yijia\system\domain\SysDeptFalge.class
 com\yijia\system\service\impl\SysAppUserInfoImpl.class
 com\yijia\system\service\impl\SysDeptServiceImpl.class
+com\yijia\system\service\IShiftMaskService.class
 com\yijia\system\mapper\SysAgentMapper.class
 com\yijia\system\mapper\SysAppUserInfoMapper.class
 com\yijia\system\service\ISysLogininforService.class