添加班次顺序

.idea/workspace.xml

@@ -26,31 +26,21 @@
   </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__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 afterPath="$PROJECT_DIR$/yijia-common/src/main/java/com/yijia/common/core/domain/entity/ShiftClass.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/ShiftClassController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/IShiftMaskService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/ShiftMaskServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-system/src/main/java/com/yijia/system/mapper/ShiftMaskMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/ShiftClassMapper.xml" 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$/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-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/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/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/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/maven-archiver/pom.properties" afterDir="false" />
@@ -69,34 +59,16 @@
       <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/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/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/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/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/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/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/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/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/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/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/yijia-system-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/yijia-system-1.0.1.jar" afterDir="false" />
     </list>
@@ -154,7 +126,7 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -172,8 +144,9 @@
     <option name="notificationShown" value="true" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\resources\mapper\system" />
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="com.yijia.station.service" />
+      <recent name="com.yijia.station.controller" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\resources\mapper\station" />
@@ -183,15 +156,14 @@
       <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.controller" />
       <recent name="com.yijia.station.service.impl" />
+      <recent name="com.yijia.station.service" />
       <recent name="com.yijia.station.mapper" />
       <recent name="com.yijia.station.domain" />
     </key>
-    <key name="CreateClassDialog.RecentsKey">
-      <recent name="com.yijia.station.service" />
-      <recent name="com.yijia.station.controller" />
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\resources\mapper\system" />
     </key>
   </component>
   <component name="RunAnythingCache">
@@ -368,7 +340,10 @@
       <workItem from="1663034446050" duration="724000" />
       <workItem from="1663221396376" duration="11120000" />
       <workItem from="1663565886953" duration="36697000" />
-      <workItem from="1664329975655" duration="12974000" />
+      <workItem from="1664329975655" duration="15398000" />
+      <workItem from="1665190910176" duration="2359000" />
+      <workItem from="1665277043309" duration="10334000" />
+      <workItem from="1665622771275" duration="2673000" />
     </task>
     <task id="LOCAL-00001" summary="前端配置文件package-config.json删除">
       <created>1619772586309</created>
@@ -768,74 +743,66 @@
     <option name="LAST_COMMIT_MESSAGE" value="针对退款时将所有的订单信息进行退款2021-10-15" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="765" y="269" key="#com.intellij.ide.util.MemberChooser" timestamp="1663747508651">
+    <state x="765" y="269" key="#com.intellij.ide.util.MemberChooser" timestamp="1665365073143">
       <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">
+    <state x="765" y="269" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1160@0.0.1920.1160" timestamp="1665365073143" />
+    <state x="740" y="341" key="FileChooserDialogImpl" timestamp="1664420679024">
       <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">
+    <state x="740" y="341" key="FileChooserDialogImpl/0.0.1920.1160@0.0.1920.1160" timestamp="1664420679024" />
+    <state width="1860" height="318" key="GridCell.Tab.0.bottom" timestamp="1665625069632">
       <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">
+    <state width="1860" height="318" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665625069632" />
+    <state width="1860" height="318" key="GridCell.Tab.0.center" timestamp="1665625069632">
       <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">
+    <state width="1860" height="318" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665625069632" />
+    <state width="1860" height="318" key="GridCell.Tab.0.left" timestamp="1665625069632">
       <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">
+    <state width="1860" height="318" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665625069632" />
+    <state width="1860" height="318" key="GridCell.Tab.0.right" timestamp="1665625069632">
       <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">
+    <state width="1860" height="318" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665625069632" />
+    <state width="1860" height="337" key="GridCell.Tab.1.bottom" timestamp="1665541319100">
       <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="1664349423794" />
-    <state width="1860" height="337" key="GridCell.Tab.1.bottom" timestamp="1664349397921">
+    <state width="1860" height="337" key="GridCell.Tab.1.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
+    <state width="1860" height="337" key="GridCell.Tab.1.center" timestamp="1665541319100">
       <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="1664349397921" />
-    <state width="1860" height="337" key="GridCell.Tab.1.center" timestamp="1664349397921">
+    <state width="1860" height="337" key="GridCell.Tab.1.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
+    <state width="1860" height="337" key="GridCell.Tab.1.left" timestamp="1665541319100">
       <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="1664349397921" />
-    <state width="1860" height="337" key="GridCell.Tab.1.left" timestamp="1664349397921">
+    <state width="1860" height="337" key="GridCell.Tab.1.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
+    <state width="1860" height="337" key="GridCell.Tab.1.right" timestamp="1665541319100">
       <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="1664349397921" />
-    <state width="1860" height="337" key="GridCell.Tab.1.right" timestamp="1664349397921">
+    <state width="1860" height="337" key="GridCell.Tab.1.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
+    <state width="1860" height="337" key="GridCell.Tab.2.bottom" timestamp="1665541319100">
       <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="1664349397921" />
-    <state width="1860" height="337" key="GridCell.Tab.2.bottom" timestamp="1664349361080">
+    <state width="1860" height="337" key="GridCell.Tab.2.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
+    <state width="1860" height="337" key="GridCell.Tab.2.center" timestamp="1665541319100">
       <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="1664349361080" />
-    <state width="1860" height="337" key="GridCell.Tab.2.center" timestamp="1664349361080">
+    <state width="1860" height="337" key="GridCell.Tab.2.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
+    <state width="1860" height="337" key="GridCell.Tab.2.left" timestamp="1665541319100">
       <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="1664349361080" />
-    <state width="1860" height="337" key="GridCell.Tab.2.left" timestamp="1664349361080">
+    <state width="1860" height="337" key="GridCell.Tab.2.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
+    <state width="1860" height="337" key="GridCell.Tab.2.right" timestamp="1665541319100">
       <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="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="1860" height="337" key="GridCell.Tab.2.right/0.0.1920.1160@0.0.1920.1160" timestamp="1664349361080" />
+    <state width="1860" height="337" key="GridCell.Tab.2.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
     <state x="461" y="231" key="SettingsEditor" timestamp="1663724002207">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
     <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 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>
@@ -1131,169 +1098,89 @@
         </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>538</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>525</line>
+          <line>540</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>529</line>
+          <line>544</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>530</line>
+          <line>545</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>531</line>
+          <line>546</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>519</line>
+          <line>534</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>520</line>
+          <line>535</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>521</line>
+          <line>536</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>517</line>
+          <line>532</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>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>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>510</line>
+          <line>525</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>535</line>
+          <line>550</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>534</line>
+          <line>549</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>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>467</line>
+          <line>477</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>468</line>
+          <line>478</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>446</line>
+          <line>456</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>448</line>
+          <line>458</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>465</line>
+          <line>475</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>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>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>585</line>
-          <option name="timeStamp" value="251" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java</url>
-          <line>652</line>
-          <option name="timeStamp" value="252" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java</url>
-          <line>651</line>
-          <option name="timeStamp" value="253" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java</url>
-          <line>656</line>
-          <option name="timeStamp" value="254" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java</url>
-          <line>660</line>
-          <option name="timeStamp" value="255" />
-        </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>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>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>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>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>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>

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

@@ -92,11 +92,11 @@ spring:
     host: 39.101.135.83
     #host: localhost
     # 端口，默认为6379
-    port: 6399
+    port: 6379
     #port: 6379
     # 密码
-    password: oFKUqwahRDriBnYX
-    #password:
+    #password: oFKUqwahRDriBnYX
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce:

yijia-admin/target/classes/application.yml

@@ -92,11 +92,11 @@ spring:
     host: 39.101.135.83
     #host: localhost
     # 端口，默认为6379
-    port: 6399
+    port: 6379
     #port: 6379
     # 密码
-    password: oFKUqwahRDriBnYX
-    #password:
+    #password: oFKUqwahRDriBnYX
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce:

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Sep 22 11:14:54 CST 2022
+#Thu Oct 13 09:38:01 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-admin

yijia-common/src/main/java/com/yijia/common/core/domain/entity/ShiftClass.java

@@ -0,0 +1,156 @@
+package com.yijia.common.core.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yijia.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.sql.Time;
+import java.util.Date;
+
+public class ShiftClass extends BaseEntity
+
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 排班id */
+    private Long shiftClassId;
+
+
+
+    /** 排班开始时间*/
+    private Time shiftStartTime;
+
+    /** 排班结束时间 */
+
+    private Time shiftEndTime;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+
+    /** 创建人 */
+    private Long createUser;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 修改人 */
+    private Long updateUser;
+
+
+
+
+
+    /** 油站id */
+    private Integer stationId;
+
+
+    /** 班次标识 */
+    private String shiftMask;
+
+    /** 班次标识 */
+    private String delFlag;
+
+
+    public Integer getStationId() {
+        return stationId;
+    }
+
+    public void setStationId(Integer stationId) {
+        this.stationId = stationId;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Long getShiftClassId() {
+        return shiftClassId;
+    }
+
+    public void setShiftClassId(Long shiftClassId) {
+        this.shiftClassId = shiftClassId;
+    }
+
+    public Time getShiftStartTime() {
+        return shiftStartTime;
+    }
+
+    public void setShiftStartTime(Time shiftStartTime) {
+        this.shiftStartTime = shiftStartTime;
+    }
+
+    public Time getShiftEndTime() {
+        return shiftEndTime;
+    }
+
+    public void setShiftEndTime(Time shiftEndTime) {
+        this.shiftEndTime = shiftEndTime;
+    }
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Long createUser) {
+        this.createUser = createUser;
+    }
+
+    @Override
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    @Override
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Long getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Long updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public String getShiftMask() {
+        return shiftMask;
+    }
+
+    public void setShiftMask(String shiftMask) {
+        this.shiftMask = shiftMask;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("shiftClassId", getShiftClassId())
+                .append("shiftStartTime", getShiftStartTime())
+                .append("shiftEndTime", getShiftEndTime())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+
+
+}

yijia-common/src/main/java/com/yijia/common/core/domain/entity/SysDept.java

@@ -193,6 +193,52 @@ public class SysDept extends BaseEntity
     private String  mnoStatus;
 
 
+    /**通联分账所需要的sysId*/
+    private String  tlSysId;
+
+
+    /**通联需要的appid*/
+    private String  tlAppId;
+
+
+    /**通联分账班结密钥*/
+    private String  tlAppKey;
+
+    /**通联分账油站编码*/
+    private String  tlOilStationNo;
+
+
+    public String getTlSysId() {
+        return tlSysId;
+    }
+
+    public void setTlSysId(String tlSysId) {
+        this.tlSysId = tlSysId;
+    }
+
+    public String getTlAppId() {
+        return tlAppId;
+    }
+
+    public void setTlAppId(String tlAppId) {
+        this.tlAppId = tlAppId;
+    }
+
+    public String getTlAppKey() {
+        return tlAppKey;
+    }
+
+    public void setTlAppKey(String tlAppKey) {
+        this.tlAppKey = tlAppKey;
+    }
+
+    public String getTlOilStationNo() {
+        return tlOilStationNo;
+    }
+
+    public void setTlOilStationNo(String tlOilStationNo) {
+        this.tlOilStationNo = tlOilStationNo;
+    }
 
     public String getMnoProportion() {
         return mnoProportion;

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Sep 22 11:14:46 CST 2022
+#Thu Oct 13 09:37:54 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
-#Thu Sep 22 11:14:50 CST 2022
+#Thu Oct 13 09:37:58 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 Sep 22 11:14:51 CST 2022
+#Thu Oct 13 09:37:59 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 Sep 22 11:14:48 CST 2022
+#Thu Oct 13 09:37:56 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 Sep 22 11:14:49 CST 2022
+#Thu Oct 13 09:37:57 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 Sep 22 11:14:52 CST 2022
+#Thu Oct 13 09:37:59 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 Sep 22 11:14:51 CST 2022
+#Thu Oct 13 09:37:58 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 Sep 22 11:14:53 CST 2022
+#Thu Oct 13 09:38:00 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 Sep 22 11:14:49 CST 2022
+#Thu Oct 13 09:37:57 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-quartz

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

@@ -0,0 +1,88 @@
+package com.yijia.station.controller;
+
+
+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.model.LoginUser;
+import com.yijia.common.core.page.TableDataInfo;
+import com.yijia.common.enums.BusinessType;
+import com.yijia.common.utils.SecurityUtils;
+import com.yijia.common.core.domain.entity.ShiftClass;
+import com.yijia.system.service.IShiftMaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 油站信息Controller
+ *
+ * @author qujia
+ * @date 2020-12-08
+ */
+@RestController
+@RequestMapping("/shiftClass/info")
+public class ShiftClassController extends BaseController
+{
+    @Autowired
+    private IShiftMaskService shiftMaskService;
+
+
+    /**
+     * 查询等级信息列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(ShiftClass shiftClass)
+    {
+
+        startPage();
+        List<ShiftClass> shiftClassList = shiftMaskService.selectShiftClassList(shiftClass);
+        shiftClassList.get(0).getCreateTime().getTime();
+        return getDataTable(shiftClassList);
+    }
+
+    /**
+     * 新增油品
+     */
+    @Log(title = "新增班次", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ShiftClass shiftClass)
+    {
+        LoginUser current=SecurityUtils.getLoginUser();
+        shiftClass.setCreateTime(new Date());
+        shiftClass.setCreateUser(current.getUser().getUserId());
+        return toAjax(shiftMaskService.insertShiftClass(shiftClass));
+    }
+
+
+
+
+    /**
+     * 获取等级信息详细信息
+     */
+    @GetMapping(value = "/{shiftClassId}")
+    public AjaxResult getInfo(@PathVariable("shiftClassId") Long shiftClassId)
+    {
+        ShiftClass shiftClass=shiftMaskService.selectShiftClassById(shiftClassId);
+
+        return AjaxResult.success(shiftClass);
+    }
+
+    /**
+     * 修改油站信息
+     */
+    @Log(title = "修改班次信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ShiftClass shiftClass)
+    {
+        LoginUser current=SecurityUtils.getLoginUser();
+        shiftClass.setUpdateTime(new Date());
+        shiftClass.setUpdateUser(current.getUser().getUserId());
+        return toAjax(shiftMaskService.updateShiftClass(shiftClass));
+    }
+
+
+
+}

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

@@ -278,6 +278,28 @@ public class PayOrder extends BaseEntity
     //第三方支付类型，01是随行付，02云闪付
     private String thirdPayment;
 
+    //通联班次标识
+    private String tlShiftsMask;
+
+    //通联的班次时间
+    private String tlShiftsTime;
+
+
+    public String getTlShiftsMask() {
+        return tlShiftsMask;
+    }
+
+    public void setTlShiftsMask(String tlShiftsMask) {
+        this.tlShiftsMask = tlShiftsMask;
+    }
+
+    public String getTlShiftsTime() {
+        return tlShiftsTime;
+    }
+
+    public void setTlShiftsTime(String tlShiftsTime) {
+        this.tlShiftsTime = tlShiftsTime;
+    }
 
     public String getThirdPayment() {
         return thirdPayment;

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

@@ -26,15 +26,20 @@ import com.yijia.station.controller.SXFPaySign;
 import com.yijia.station.domain.PayOrder;
 import com.yijia.station.mapper.PayOrderMapper;
 import com.yijia.station.service.IPayOrderService;
+import com.yijia.station.utils.ConsumeType;
 import com.yijia.station.utils.HttpUtils;
+import com.yijia.station.utils.Request;
+import com.yijia.station.utils.Tlparam;
 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.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.SQLException;
@@ -429,6 +434,11 @@ public class PayOrderServiceImpl implements IPayOrderService
 
 
 
+    /**
+     *
+     * 随行付退款调用
+     *
+     * **/
     public SysRespon sendSxfRefund(PayOrder payOrder) throws Exception {
 
         SysRespon respon=new SysRespon();
@@ -505,7 +515,12 @@ public class PayOrderServiceImpl implements IPayOrderService
         return respon;
     }
 
-
+    //**
+    //
+    // 圈圈退款调用
+    //
+    //
+    // *//
     private  SysRespon saoBeiRefund( String token,String mno,String termialId,String oldOrderNo,String amt) throws Exception  {
         //创建client
         DefaultSaobeiApiClient<SaobeiTradeRefundRequest, SaobeiTradeRefundResponse> client = new DefaultSaobeiApiClient<>(token);//令牌的token
@@ -549,6 +564,12 @@ public class PayOrderServiceImpl implements IPayOrderService
         return  sysRespon;
 
     }
+
+    /**
+     *
+     * 将退款的订单关联信息取消
+     *
+     * */
     @Transactional(rollbackFor = Exception.class)
     @Override
     public AjaxResult sxfRefund( PayOrder payOrder1) throws  Exception
@@ -622,17 +643,31 @@ public class PayOrderServiceImpl implements IPayOrderService
                 if (!"0000".equals(respon.getResponCode())) {
                     throw new SQLException(respon.getResponMessage());
                 }
-            }else{
+            }else if("03".equals(payOrder.getThirdPayment())){
                 respon= HuiFuRefund(sysDept.getMno(),payOrder.getOrderNo(),payOrder.getAmt()+"",payOrder.getPayDate());
                 if (!"0000".equals(respon.getResponCode())) {
                     throw new SQLException(respon.getResponMessage());
                 }
+            }else{
+                BigDecimal  amt= payOrder.getAmt().multiply(BigDecimal.valueOf(100));
+                Long amtvalue=amt.longValue();;
+                respon= tLFusClassPayApply(payOrder,sysDept,amtvalue);
+                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();
@@ -689,7 +724,6 @@ public class PayOrderServiceImpl implements IPayOrderService
         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("退款成功");
@@ -704,7 +738,7 @@ public class PayOrderServiceImpl implements IPayOrderService
 
 
     /**
-     * 非必填字段
+     * 非必填字段   汇付退款调用
      * @return
      */
     private static Map<String, Object> getExtendInfos(String  oldNo) {
@@ -726,4 +760,99 @@ public class PayOrderServiceImpl implements IPayOrderService
     }
 
 
+    /***
+     * 通联支付： 业务使用实时班结，与分账支付时调用；
+     * @param
+     * @return
+     * @throws IOException
+     */
+    public SysRespon tLFusClassPayApply(PayOrder payOrder,SysDept sysDept,Long amtvalue) throws IOException {
+        SysRespon sysRespon=new SysRespon();
+
+        Random random=new Random();
+        String result1 = "";
+        for (int i = 0; i < 6; i++) {
+            result1 += random.nextInt(10);
+        }
+        String ordNo = System.nanoTime() + result1;
+        HashMap resultInfo = new HashMap();
+        Tlparam payApply = new Tlparam();
+        payApply.setSysId(sysDept.getTlSysId());           //系统ID
+        payApply.setOldBizOrderNo(payOrder.getOrderNo());
+        //payApply.setOldBizOrderNo("1645517510567428967");
+        payApply.setBizOrderNo(ordNo); //订单号
+        payApply.setAmount(amtvalue);         //金额
+
+        List<ConsumeType> consumeTypes = new ArrayList<>();
+        ConsumeType consumeType = new ConsumeType();
+        consumeType.setType("C0001");               //业务类型 C0001 加油； C0002：便利店； C0003：洗车；
+        consumeType.setAmount(amtvalue);
+
+        consumeTypes.add(consumeType);
+        payApply.setConsumeTypes(consumeTypes);
+
+
+
+        payApply.setShiftsTime(payOrder.getTlShiftsTime());     //班次时间
+        payApply.setShiftsMask(payOrder.getTlShiftsMask());     //班次标识
+
+
+        /*返回参数
+        {
+        "msg":"SUCCESS",
+        "payInterfaceTrxCode":"",
+        "finishTime":"",
+        "code":"SUCCESS",
+        "orderNo":"P20220118000000012424451",
+        "payStatusMsg":"进行中",
+        "sysId":"1480833167961694210",
+        "bizCode":"0000",
+        "sign":"56ad0f322a4ab753452d22753522709c",
+        "remark":"这是备注",
+        "shiftsTime":"20220118",
+        "shiftsMask":"2",
+        "bizMsg":"处理成功",
+        "payInfo":"{\"appId\":\"wxb46701bd193ee573\",
+                    \"timeStamp\":\"1642494427\",
+                    \"nonceStr\":\"1924ebadd7314805ac762e7c7eeaa530\",
+                    \"package\":\"prepay_id=wx18162707708597421cf8564bcf054c0000\",
+                    \"signType\":\"RSA\",
+                    \"paySign\":\"M5IUB1NrFmcn83vaG8ekvWkmVLFon2ziisM0HXKnT7O/aaeGSAlbYI8VsnUhUgEEl3duncfIqYaA+8m454xjuA0pGHitVPeRNBvoIKR+ojiCJhT2MgfZSgE1x2Js518ZpfLT2Fbthn37Tu8ow48MzpNvy4zytkiof0IzX2bNyi4JTnoZW7aLyW963m2pL+KzLS7ZXGAXU/k8utyTwXZGMGRnNkguE0Jf2ra7GxVVAT4vxmh0GfW3e/Vqq8iL6xIqdMn+bPo6vteWgfjDcs3EKpmlbsEcv7lJN0gClPou3+prEBEf22M2dfKoAz/JgY4THPEQZX2QFxtnc8pl1gX7Lg==\"
+                    }",
+        "payStatus":"2000",
+        "bizOrderNo":"1642494424396"
+        }
+        * */
+        String post = post("oil.pay.refund", payApply, sysDept.getTlAppId(), sysDept.getTlAppKey());
+
+        JSONObject jsonObject = JSON.parseObject(post);
+        if("0000".equals(jsonObject.get("bizCode").toString())){
+            sysRespon.setResponCode("0000");
+            sysRespon.setResponMessage("退款成功");
+        }else {
+            sysRespon.setResponCode( jsonObject.get("bizCode").toString());
+            sysRespon.setResponMessage( jsonObject.get("bizMsg").toString());
+        }
+        return sysRespon;
+    }
+
+
+    //生产环境
+
+
+    private static <T> String post(String service, T body, String appId, String appKey) throws IOException {
+        Request<T> request = new Request<>();
+        request.setAppId(appId);
+        request.setCharset("utf-8");
+        request.setSignType("MD5");
+        request.setVersion("11");
+        request.setTimestamp(DateFormatUtils.format(new Date(), "yyyyMMddHHmmss"));
+        request.setService(service);
+        request.setBizContent(body);
+        request.sign(appKey);
+        String result = HttpUtils.post("https://merchant.allinpaygd.com/gateway", request.toMap());
+        request.verify(result, appKey);
+        return result;
+    }
+
 }

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

@@ -0,0 +1,118 @@
+<?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.qujia.station.mapper.ShiftMaskMapper">
+    
+    <resultMap type="ShiftClass" id="ShiftClassResult">
+        <result property="shiftClassId"    column="shift_class_id"    />
+        <result property="shiftStartTime"    column="shift_start_time"    />
+        <result property="shiftEndTime"    column="shift_end_time"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="createUser"    column="create_user"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateUser"    column="update_user"    />
+        <result property="shiftMask"    column="shift_mask"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectShiftClassVo">
+ SELECT
+	shift_class_id,
+	shift_start_time,
+	shift_end_time,
+	create_time,
+	create_user,
+	update_time,
+	update_user,
+	station_id,
+	shift_mask,
+	del_flag
+FROM
+	shift_class
+    </sql>
+
+    <select id="selectShiftClassList" parameterType="ShiftClass" resultMap="ShiftClassResult">
+        <include refid="selectShiftClassVo"/>
+        <where>
+            <if test="shiftStartTime != null  and shiftStartTime != ''"> and shift_start_time = #{shiftStartTime}</if>
+            <if test="shiftEndTime != null  and shiftEndTime != ''"> and shift_end_time = #{shiftEndTime}</if>
+            <if test="createTime != null  and createTime != ''"> and create_time = #{createTime}</if>
+            <if test="stationId != null  and stationId != ''"> and station_id = #{stationId}</if>
+            <if test="createUser != null  and createUser != ''"> and create_user = #{createUser}</if>
+            <if test="updateTime != null  and updateTime != ''"> and update_time = #{updateTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and update_user = #{updateUser}</if>
+
+            <if test="shiftMask != null  and shiftMask != ''"> and shift_mask = #{shiftMask}</if>
+            <if test="delFlag != null  and delFlag != ''"> and del_flag = #{delFlag}</if>
+        </where>
+        order by shift_class_id desc
+    </select>
+    
+    <select id="selectShiftClassById" parameterType="Long" resultMap="ShiftClassResult">
+        <include refid="selectShiftClassVo"/>
+        where shift_class_id = #{shiftClassId}
+    </select>
+        
+    <insert id="insertShiftClass" parameterType="ShiftClass">
+        insert into shift_class
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="shiftClassId != null">shift_class_id,</if>
+            <if test="shiftStartTime != null">shift_start_time,</if>
+            <if test="shiftEndTime != null">shift_end_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="createUser != null">create_user,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateUser != null">update_user,</if>
+
+            <if test="shiftMask != null">shift_mask,</if>
+            <if test="delFlag != null">del_flag,</if>
+
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="shiftClassId != null">#{shiftClassId},</if>
+            <if test="shiftStartTime != null">#{shiftStartTime},</if>
+            <if test="shiftEndTime != null">#{shiftEndTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+
+            <if test="shiftMask != null">#{shiftMask},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+
+         </trim>
+    </insert>
+
+    <update id="updateShiftClass" parameterType="ShiftClass">
+        update shift_class
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="shiftStartTime != null">shift_start_time = #{shiftStartTime},</if>
+            <if test="shiftEndTime != null">shift_end_time = #{shiftEndTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="createUser != null">create_user = #{createUser},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateUser != null">update_user = #{updateUser},</if>
+            <if test="shiftMask != null">shift_mask = #{shiftMask},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+
+        </trim>
+        where shift_class_id = #{shiftClassId}
+    </update>
+
+    <delete id="deleteShiftClassById" parameterType="Long">
+        delete from shift_class where shift_class_id = #{shiftClassId}
+    </delete>
+
+    <delete id="deleteShiftClassByIds" parameterType="String">
+        delete from shift_class where shift_class_id in
+        <foreach item="shiftClassId" collection="array" open="(" separator="," close=")">
+            #{shiftClassId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Sep 22 11:14:53 CST 2022
+#Thu Oct 13 09:38:00 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

@@ -38,6 +38,7 @@ 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\mapper\ShiftMaskMapper.class
 com\yijia\station\controller\StationInfoController.class
 com\yijia\station\domain\StationOilGun.class
 com\yijia\station\utils\HttpUtils.class
@@ -48,8 +49,11 @@ 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\service\IShiftMaskService.class
 com\yijia\station\controller\RSAEncrypt.class
+com\yijia\station\domain\ShiftClass.class
 com\yijia\station\service\IStationSettlementPriceService.class
+com\yijia\station\controller\ShiftClassController.class
 com\yijia\station\controller\StationDeviceManageController.class
 com\yijia\station\controller\StationPersonnelController.class
 com\yijia\station\utils\Tlparam.class
@@ -85,6 +89,7 @@ com\yijia\station\domain\StationNotice.class
 com\yijia\station\domain\DeptInfoDemo.class
 com\yijia\station\service\impl\StationClassStructureServiceImpl.class
 com\yijia\station\domain\StationDeviceManage.class
+com\yijia\station\service\impl\ShiftMaskServiceImpl.class
 com\yijia\station\service\impl\StationPersonnelServiceImpl.class
 com\yijia\station\service\IStationDeviceManageService.class
 com\yijia\station\domain\StationInfo.class

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

@@ -1,96 +1,101 @@
 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
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationOilPriceAdjustController.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationSettlementPrice.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationPicController.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\SysDeptDemo.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationClassesSummaryMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationNoticeServiceImpl.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\SignUtil.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationNoticeMapper.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilPriceAdjustServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\RSAEncrypt.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\PayOrder.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationPersonnelMapper.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IPayOrderService.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationNotice.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationPic.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationClassStructureMapper.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilPriceServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationPay.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationOilPriceService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationSettlementPriceService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationSettlementPriceController.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationInfo.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\controller\StationBalanceChangeController.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationOilGunMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationPicServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationInfoController.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationPayMapper.java
+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\controller\StationPay111Controller.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\controller\SysAppUserInfoController.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\ShiftMaskServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationClassStructureServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationDeviceManageService.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationOilGunController.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\PayOrderController.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\ApiRequestBean.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\RSASignature.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\service\impl\StationPayServiceImpl.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\IStationClassesSummaryService.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationInfoService.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationDeviceManageController.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\service\impl\StationSettlementPriceServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationSettlementPrice.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\SysDeptDemo.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\ShiftClass.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\SignUtil.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilPriceAdjustServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IPayOrderService.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationNotice.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilPriceServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationOilPriceService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationClassStructureService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationOilPriceAdjustService.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationInfo.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationPersonnelServiceImpl.java
 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\controller\ShiftClassController.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
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationClassesSummaryServiceImpl.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationOilGunMapper.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationPicServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationSettlementPriceAdjustService.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationInfoController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\task\SaticScheduleTask.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationOilGun.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationPayMapper.java
-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
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\SysAppUserInfoController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationPicMapper.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationClassStructureServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationNoticeService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationBalanceChangeMapper.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationDeviceManageService.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationOilGunController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationBalanceChange.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\PayOrderController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationOilPrice.java
 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\mapper\ShiftMaskMapper.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
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\ApiRequestBean.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\RSASignature.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationOilPriceAdjustMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\PayOrderMapper.java
 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\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\service\IShiftMaskService.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
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationClassesSummaryService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationBalanceChangeServiceImpl.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationInfoService.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationDeviceManageController.java

yijia-system/src/main/java/com/yijia/system/mapper/ShiftMaskMapper.java

@@ -0,0 +1,66 @@
+package com.yijia.system.mapper;
+
+
+import com.yijia.common.core.domain.entity.ShiftClass;
+
+import java.util.List;
+
+/**
+ * 班次信息信息Mapper接口
+ * 
+ * @author qujia
+ * @date 2021-10-24
+ */
+public interface ShiftMaskMapper
+{
+    /**
+     * 查询班次信息
+     * 
+     * @param shiftClassId 班次信息ID
+     * @return 班次信息
+     */
+    public ShiftClass selectShiftClassById(Long shiftClassId);
+
+    /**
+     * 查询班次信息
+     * 
+     * @param shiftClass 等级信息
+     * @return 班次信息集合
+     */
+    public List<ShiftClass> selectShiftClassList(ShiftClass shiftClass);
+
+    /**
+     * 新增班次信息
+     *
+     * @param shiftClass 班次信息
+     * @return 结果
+     */
+    public int insertShiftClass(ShiftClass shiftClass);
+
+    /**
+     * 修改班次信息
+     * 
+     * @param shiftClass 班次信息
+     * @return 结果
+     */
+    public int updateShiftClass(ShiftClass shiftClass);
+
+    /**
+     * 删除班次信息
+     * 
+     * @param shiftClassId 班次信息ID
+     * @return 结果
+     */
+    public int deleteShiftClassById(Long shiftClassId);
+
+    /**
+     * 批量删除班次信息
+     * 
+     * @param shiftClassIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteShiftClassByIds(Long[] shiftClassIds);
+
+
+
+}

yijia-system/src/main/java/com/yijia/system/service/IShiftMaskService.java

@@ -0,0 +1,66 @@
+package com.yijia.system.service;
+
+
+import com.yijia.common.core.domain.entity.ShiftClass;
+
+import java.util.List;
+
+/**
+ * 班次信息信息Mapper接口
+ * 
+ * @author qujia
+ * @date 2021-10-24
+ */
+public interface IShiftMaskService
+{
+    /**
+     * 查询班次信息
+     * 
+     * @param shiftClassId 班次信息ID
+     * @return 班次信息
+     */
+    public ShiftClass selectShiftClassById(Long shiftClassId);
+
+    /**
+     * 查询班次信息
+     * 
+     * @param shiftClass 等级信息
+     * @return 班次信息集合
+     */
+    public List<ShiftClass> selectShiftClassList(ShiftClass shiftClass);
+
+    /**
+     * 新增班次信息
+     *
+     * @param shiftClass 班次信息
+     * @return 结果
+     */
+    public int insertShiftClass(ShiftClass shiftClass);
+
+    /**
+     * 修改班次信息
+     * 
+     * @param shiftClass 班次信息
+     * @return 结果
+     */
+    public int updateShiftClass(ShiftClass shiftClass);
+
+    /**
+     * 删除班次信息
+     * 
+     * @param shiftClassId 班次信息ID
+     * @return 结果
+     */
+    public int deleteShiftClassById(Long shiftClassId);
+
+    /**
+     * 批量删除班次信息
+     * 
+     * @param shiftClassIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteShiftClassByIds(Long[] shiftClassIds);
+
+
+
+}

yijia-system/src/main/java/com/yijia/system/service/impl/ShiftMaskServiceImpl.java

@@ -0,0 +1,85 @@
+package com.yijia.system.service.impl;
+
+
+import com.yijia.common.core.domain.entity.ShiftClass;
+import com.yijia.system.mapper.ShiftMaskMapper;
+import com.yijia.system.service.IShiftMaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 油站信息Service业务层处理
+ * 
+ * @author qujia
+ * @date 2020-12-08
+ */
+@Service
+public class ShiftMaskServiceImpl implements IShiftMaskService
+{
+    @Autowired
+    private ShiftMaskMapper shiftMaskMapper;
+
+    /**
+     * 查询班次信息
+     *
+     * @param shiftClassId 班次信息ID
+     * @return 班次信息
+     */
+    public ShiftClass selectShiftClassById(Long shiftClassId){
+        return shiftMaskMapper.selectShiftClassById(shiftClassId);
+    }
+
+    /**
+     * 查询班次信息
+     *
+     * @param shiftClass 等级信息
+     * @return 班次信息集合
+     */
+    public List<ShiftClass> selectShiftClassList(ShiftClass shiftClass){
+        return shiftMaskMapper.selectShiftClassList(shiftClass);
+    }
+
+    /**
+     * 新增班次信息
+     *
+     * @param shiftClass 班次信息
+     * @return 结果
+     */
+    public int insertShiftClass(ShiftClass shiftClass){
+        return  shiftMaskMapper.insertShiftClass(shiftClass);
+    }
+
+    /**
+     * 修改班次信息
+     *
+     * @param shiftClass 班次信息
+     * @return 结果
+     */
+    public int updateShiftClass(ShiftClass shiftClass){
+        return shiftMaskMapper.updateShiftClass(shiftClass);
+    }
+
+    /**
+     * 删除班次信息
+     *
+     * @param shiftClassId 班次信息ID
+     * @return 结果
+     */
+    public int deleteShiftClassById(Long shiftClassId){
+        return shiftMaskMapper.deleteShiftClassById(shiftClassId);
+    }
+
+    /**
+     * 批量删除班次信息
+     *
+     * @param shiftClassIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteShiftClassByIds(Long[] shiftClassIds){
+        return shiftMaskMapper.deleteShiftClassByIds(shiftClassIds);
+    }
+
+
+}

yijia-system/src/main/resources/mapper/system/ShiftClassMapper.xml

@@ -0,0 +1,118 @@
+<?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.ShiftMaskMapper">
+    
+    <resultMap type="ShiftClass" id="ShiftClassResult">
+        <result property="shiftClassId"    column="shift_class_id"    />
+        <result property="shiftStartTime"    column="shift_start_time"    />
+        <result property="shiftEndTime"    column="shift_end_time"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="createUser"    column="create_user"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateUser"    column="update_user"    />
+        <result property="shiftMask"    column="shift_mask"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectShiftClassVo">
+ SELECT
+	shift_class_id,
+	shift_start_time,
+	shift_end_time,
+	create_time,
+	create_user,
+	update_time,
+	update_user,
+	station_id,
+	shift_mask,
+	del_flag
+FROM
+	shift_class
+    </sql>
+
+    <select id="selectShiftClassList" parameterType="ShiftClass" resultMap="ShiftClassResult">
+        <include refid="selectShiftClassVo"/>
+        <where>
+            <if test="shiftStartTime != null  and shiftStartTime != ''"> and shift_start_time = #{shiftStartTime}</if>
+            <if test="shiftEndTime != null  and shiftEndTime != ''"> and shift_end_time = #{shiftEndTime}</if>
+            <if test="createTime != null  and createTime != ''"> and create_time = #{createTime}</if>
+            <if test="stationId != null  and stationId != ''"> and station_id = #{stationId}</if>
+            <if test="createUser != null  and createUser != ''"> and create_user = #{createUser}</if>
+            <if test="updateTime != null  and updateTime != ''"> and update_time = #{updateTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and update_user = #{updateUser}</if>
+
+            <if test="shiftMask != null  and shiftMask != ''"> and shift_mask = #{shiftMask}</if>
+            <if test="delFlag != null  and delFlag != ''"> and del_flag = #{delFlag}</if>
+        </where>
+        order by shift_class_id desc
+    </select>
+    
+    <select id="selectShiftClassById" parameterType="Long" resultMap="ShiftClassResult">
+        <include refid="selectShiftClassVo"/>
+        where shift_class_id = #{shiftClassId}
+    </select>
+        
+    <insert id="insertShiftClass" parameterType="ShiftClass">
+        insert into shift_class
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="shiftClassId != null">shift_class_id,</if>
+            <if test="shiftStartTime != null">shift_start_time,</if>
+            <if test="shiftEndTime != null">shift_end_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="createUser != null">create_user,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateUser != null">update_user,</if>
+
+            <if test="shiftMask != null">shift_mask,</if>
+            <if test="delFlag != null">del_flag,</if>
+
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="shiftClassId != null">#{shiftClassId},</if>
+            <if test="shiftStartTime != null">#{shiftStartTime},</if>
+            <if test="shiftEndTime != null">#{shiftEndTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+
+            <if test="shiftMask != null">#{shiftMask},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+
+         </trim>
+    </insert>
+
+    <update id="updateShiftClass" parameterType="ShiftClass">
+        update shift_class
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="shiftStartTime != null">shift_start_time = #{shiftStartTime},</if>
+            <if test="shiftEndTime != null">shift_end_time = #{shiftEndTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="createUser != null">create_user = #{createUser},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateUser != null">update_user = #{updateUser},</if>
+            <if test="shiftMask != null">shift_mask = #{shiftMask},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+
+        </trim>
+        where shift_class_id = #{shiftClassId}
+    </update>
+
+    <delete id="deleteShiftClassById" parameterType="Long">
+        delete from shift_class where shift_class_id = #{shiftClassId}
+    </delete>
+
+    <delete id="deleteShiftClassByIds" parameterType="String">
+        delete from shift_class where shift_class_id in
+        <foreach item="shiftClassId" collection="array" open="(" separator="," close=")">
+            #{shiftClassId}
+        </foreach>
+    </delete>
+    
+</mapper>

yijia-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -65,6 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="refundExaminStatus"    column="refund_examin_status" />
 		<result property="isAlipayFlag"    column="is_alipay_flag" />
 		<result property="thirdPayment"    column="third_payment" />
+		<result column="tl_app_id"         property="tlAppId" />
+		<result column="tl_oil_station_no"          property="tlOilStationNo" />
+		<result column="tl_sys_id"         property="tlSysId" />
+		<result column="tl_app_key"          property="tlAppKey" />
 	</resultMap>
 
 	<sql id="selectDeptVo">
@@ -73,7 +77,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         d.station_latitude, d.mno, discount_setting,card_enabled_flag,d.app_id, d.app_secret,gzh_app_id,gzh_app_secret,ali_app_id,gzh_app_secret,
         ali_app_id,ali_public_key,ali_private_key,ali_encrypt_key,image1,image2,image3,image4,image5,ws_print_flag,print_setting,notice,integral_print_flag,
         d.integral_flag,d.integral_rule_flag,d.card_rule_flag,d.coupon_flag,d.label_flag,d.print_device_type,d.balance,d.is_lng_flag,d.city,coupon_enabled_flag,
-        d.merchant_no,d.terminal_id,d.yun_key,d.mno_array,mno_proportion,mno_status,refund_examin_status,is_alipay_flag,third_payment
+        d.merchant_no,d.terminal_id,d.yun_key,d.mno_array,mno_proportion,mno_status,refund_examin_status,is_alipay_flag,third_payment,tl_app_id,tl_oil_station_no,
+        tl_sys_id,tl_app_key
         from sys_dept d
     </sql>
 
@@ -363,6 +368,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		     <if test="isAlipayFlag != null">is_alipay_flag,</if>
 		    <if test="refundExaminStatus != null">refund_examin_status,</if>
 		   <if test="thirdPayment != null">third_payment,</if>
+		<if test="tlAppId != null">tl_app_id,</if>
+		<if test="tlOilStationNo != null">tl_oil_station_no,</if>
+		<if test="tlSysId != null">tl_sys_id,</if>
+		<if test="tlAppKey != null">tl_app_key,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -420,6 +429,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="isAlipayFlag != null">#{isAlipayFlag},</if>
 		<if test="refundExaminStatus != null">#{refundExaminStatus},</if>
 		<if test="thirdPayment != null">#{thirdPayment},</if>
+		<if test="tlAppId != null">#{tlAppId},</if>
+		<if test="tlOilStationNo != null">#{tlOilStationNo},</if>
+		<if test="tlSysId != null">#{tlSysId},</if>
+		<if test="tlAppKey != null">#{tlAppKey},</if>
  			sysdate()
  		)
 	</insert>
@@ -481,6 +494,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="isAlipayFlag != null">is_alipay_flag= #{isAlipayFlag},</if>
 			<if test="thirdPayment != null">third_payment= #{thirdPayment},</if>
 			<if test="refundExaminStatus != null">refund_examin_status= #{refundExaminStatus},</if>
+
+			<if test="tlAppId != null">tl_app_id= #{tlAppId},</if>
+			<if test="tlOilStationNo != null">tl_oil_station_no= #{tlOilStationNo},</if>
+			<if test="tlSysId != null">tl_sys_id= #{tlSysId},</if>
+			<if test="tlAppKey != null">tl_app_key= #{tlAppKey},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}

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

@@ -65,6 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="refundExaminStatus"    column="refund_examin_status" />
 		<result property="isAlipayFlag"    column="is_alipay_flag" />
 		<result property="thirdPayment"    column="third_payment" />
+		<result column="tl_app_id"         property="tlAppId" />
+		<result column="tl_oil_station_no"          property="tlOilStationNo" />
+		<result column="tl_sys_id"         property="tlSysId" />
+		<result column="tl_app_key"          property="tlAppKey" />
 	</resultMap>
 
 	<sql id="selectDeptVo">
@@ -73,7 +77,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         d.station_latitude, d.mno, discount_setting,card_enabled_flag,d.app_id, d.app_secret,gzh_app_id,gzh_app_secret,ali_app_id,gzh_app_secret,
         ali_app_id,ali_public_key,ali_private_key,ali_encrypt_key,image1,image2,image3,image4,image5,ws_print_flag,print_setting,notice,integral_print_flag,
         d.integral_flag,d.integral_rule_flag,d.card_rule_flag,d.coupon_flag,d.label_flag,d.print_device_type,d.balance,d.is_lng_flag,d.city,coupon_enabled_flag,
-        d.merchant_no,d.terminal_id,d.yun_key,d.mno_array,mno_proportion,mno_status,refund_examin_status,is_alipay_flag,third_payment
+        d.merchant_no,d.terminal_id,d.yun_key,d.mno_array,mno_proportion,mno_status,refund_examin_status,is_alipay_flag,third_payment,tl_app_id,tl_oil_station_no,
+        tl_sys_id,tl_app_key
         from sys_dept d
     </sql>
 
@@ -363,6 +368,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		     <if test="isAlipayFlag != null">is_alipay_flag,</if>
 		    <if test="refundExaminStatus != null">refund_examin_status,</if>
 		   <if test="thirdPayment != null">third_payment,</if>
+		<if test="tlAppId != null">tl_app_id,</if>
+		<if test="tlOilStationNo != null">tl_oil_station_no,</if>
+		<if test="tlSysId != null">tl_sys_id,</if>
+		<if test="tlAppKey != null">tl_app_key,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -420,6 +429,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="isAlipayFlag != null">#{isAlipayFlag},</if>
 		<if test="refundExaminStatus != null">#{refundExaminStatus},</if>
 		<if test="thirdPayment != null">#{thirdPayment},</if>
+		<if test="tlAppId != null">#{tlAppId},</if>
+		<if test="tlOilStationNo != null">#{tlOilStationNo},</if>
+		<if test="tlSysId != null">#{tlSysId},</if>
+		<if test="tlAppKey != null">#{tlAppKey},</if>
  			sysdate()
  		)
 	</insert>
@@ -481,6 +494,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="isAlipayFlag != null">is_alipay_flag= #{isAlipayFlag},</if>
 			<if test="thirdPayment != null">third_payment= #{thirdPayment},</if>
 			<if test="refundExaminStatus != null">refund_examin_status= #{refundExaminStatus},</if>
+
+			<if test="tlAppId != null">tl_app_id= #{tlAppId},</if>
+			<if test="tlOilStationNo != null">tl_oil_station_no= #{tlOilStationNo},</if>
+			<if test="tlSysId != null">tl_sys_id= #{tlSysId},</if>
+			<if test="tlAppKey != null">tl_app_key= #{tlAppKey},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Sep 22 11:14:47 CST 2022
+#Thu Oct 13 09:37:55 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-system