From cd45ac2fa0097de2fd9bf637fc5a23593be1aef0 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 10 十月 2023 16:20:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java | 2
cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml | 8
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IncomeQuery.java | 2
.idea/misc.xml | 1
.idea/workspace.xml | 113 +++--
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/RechargeRecords.java | 89 ++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RegisterOrderQuery.java | 1
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/FinanceClient.java | 6
cloud-server-account/src/main/java/com/dsh/account/model/IncomeQuery.java | 2
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionQuery.java | 5
cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java | 63 ++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 89 ++-
cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java | 4
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java | 3
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/CoursePackage.java | 180 ++++++++
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 5
cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml | 9
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 7
cloud-server-management/src/main/java/com/dsh/course/service/TGameConfigService.java | 17
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html | 228 ++++++++-
cloud-server-other/src/main/java/com/dsh/other/mapper/SiteBookingMapper.java | 1
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java | 5
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 92 +++-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 2
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteBookingServiceImpl.java | 5
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 11
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 21
cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java | 21
cloud-server-account/src/main/java/com/dsh/account/mapper/RechargeRecordsMapper.java | 2
cloud-server-course/src/main/java/com/dsh/course/model/RegisterOrderQuery.java | 1
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 9
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java | 3
cloud-server-course/src/main/java/com/dsh/course/entity/TAppUser.java | 11
cloud-server-other/src/main/java/com/dsh/other/service/ISiteBookingService.java | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html | 10
cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java | 1
cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java | 1
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 3
cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java | 1
cloud-server-management/src/main/java/com/dsh/course/mapper/TGameConfigMapper.java | 18
cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java | 2
cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java | 1
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java | 1
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TGameConfig.java | 2
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java | 6
cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml | 6
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java | 4
cloud-server-management/src/main/java/com/dsh/course/service/impl/TGameConfigServiceImpl.java | 21
cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionQuery.java | 2
cloud-server-other/src/main/resources/mapper/SiteBookingMapper.xml | 9
cloud-server-account/src/main/java/com/dsh/account/dto/Receivers.java | 14
cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html | 157 ------
cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java | 3
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 8
55 files changed, 980 insertions(+), 312 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c7462ea..02fed69 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="JavaScriptSettings">
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f73921d..8080553 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -26,25 +26,34 @@
</component>
<component name="ChangeListManager">
<list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.8。1">
+ <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TGameConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TGameConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/resources/mapper/GameMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/resources/mapper/GameMapper.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/mapper/SiteBookingMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/mapper/SiteBookingMapper.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/service/ISiteBookingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/service/ISiteBookingService.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteBookingServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteBookingServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/resources/mapper/SiteBookingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/resources/mapper/SiteBookingMapper.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -74,7 +83,9 @@
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
- <option name="mavenHome" value="使用 Maven 包装器" />
+ <option name="localRepository" value="C:\Users\45438\.m2\repository" />
+ <option name="mavenHome" value="$PROJECT_DIR$/../../apache-maven-3.9.3" />
+ <option name="userSettingsFile" value="C:\Users\45438\.m2\settings.xml" />
</MavenGeneralSettings>
</option>
</component>
@@ -84,6 +95,9 @@
<component name="ProblemsViewState">
<option name="selectedTabId" value="ProjectErrors" />
</component>
+ <component name="ProjectColorInfo">{
+ "associatedIndex": 2
+}</component>
<component name="ProjectId" id="2T0poWYlZShlnPso29uxjn4gQQo" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="1" id="Add" />
@@ -92,43 +106,43 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent"><![CDATA[{
- "keyToString": {
- "DefaultHtmlFileTemplate": "HTML File",
- "RequestMappingsPanelOrder0": "0",
- "RequestMappingsPanelOrder1": "1",
- "RequestMappingsPanelWidth0": "75",
- "RequestMappingsPanelWidth1": "75",
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "WebServerToolWindowFactoryState": "false",
- "git-widget-placeholder": "master",
- "ignore.virus.scanning.warn.message": "true",
- "last_opened_file_path": "D:/Javaproject/PlayPay/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "project.structure.last.edited": "模块",
- "project.structure.proportion": "0.15",
- "project.structure.side.proportion": "0.54367816",
- "service.view.auto.scroll.to.source": "true",
- "settings.editor.selected.configurable": "preferences.lookFeel",
- "spring.configuration.checksum": "6e27eb92c8707375af194da5aa857bbc",
- "vue.rearranger.settings.migration": "true"
+ <component name="PropertiesComponent">{
+ "keyToString": {
+ "DefaultHtmlFileTemplate": "HTML File",
+ "RequestMappingsPanelOrder0": "0",
+ "RequestMappingsPanelOrder1": "1",
+ "RequestMappingsPanelWidth0": "75",
+ "RequestMappingsPanelWidth1": "75",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "WebServerToolWindowFactoryState": "false",
+ "git-widget-placeholder": "master",
+ "ignore.virus.scanning.warn.message": "true",
+ "last_opened_file_path": "D:/jdk",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "project.structure.last.edited": "项目",
+ "project.structure.proportion": "0.15",
+ "project.structure.side.proportion": "0.54367816",
+ "service.view.auto.scroll.to.source": "true",
+ "settings.editor.selected.configurable": "preferences.pluginManager",
+ "spring.configuration.checksum": "6e27eb92c8707375af194da5aa857bbc",
+ "vue.rearranger.settings.migration": "true"
}
-}]]></component>
+}</component>
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
+ <recent name="D:\javaproject\play\cloud-server-parent" />
<recent name="D:\Javaproject\PlayPay\cloud-server-management\src\main\webapp\WEB-INF\view\system\ball" />
<recent name="D:\Javaproject\PlayPay\cloud-server-account\src\test\java\com\dsh" />
<recent name="D:\Javaproject\PlayPay\cloud-server-management\src\main\webapp\static\modular\system\ball" />
<recent name="D:\Javaproject\PlayPay\cloud-server-course\src\main\resources\mapper" />
- <recent name="D:\ttt\java\PlayPai\cloud-server-management\src\main\webapp\WEB-INF\view\system\ball" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\JavaTool\PlayPai1\cloud-server-management\src\main\webapp\static\modular\system\tStudent" />
@@ -136,11 +150,11 @@
<recent name="D:\ttt\java\PlayPai\cloud-server-parent" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
+ <recent name="com.dsh.course.mapper" />
+ <recent name="com.dsh.course.service.impl" />
+ <recent name="com.dsh.course.service" />
<recent name="com.dsh.guns.modular.system.service.impl" />
<recent name="com.dsh.guns.modular.system.service" />
- <recent name="com.dsh.other.mapper" />
- <recent name="com.dsh.other.service.impl" />
- <recent name="com.dsh.other.service" />
</key>
</component>
<component name="RunDashboard">
@@ -347,6 +361,13 @@
<workItem from="1696462020097" duration="481000" />
<workItem from="1696465598653" duration="19850000" />
<workItem from="1696639362946" duration="88523000" />
+ <workItem from="1696894655693" duration="923000" />
+ <workItem from="1696895595069" duration="471000" />
+ <workItem from="1696896079395" duration="4306000" />
+ <workItem from="1696900426210" duration="3256000" />
+ <workItem from="1696903826401" duration="164000" />
+ <workItem from="1696904129011" duration="6673000" />
+ <workItem from="1696917635013" duration="5121000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -720,7 +741,7 @@
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java</url>
- <line>1358</line>
+ <line>1360</line>
<option name="timeStamp" value="14" />
</line-breakpoint>
</breakpoints>
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
index a3e5662..cc1c78b 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
@@ -4,16 +4,14 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.account.entity.CoachType;
import com.dsh.account.entity.RechargeRecords;
+import com.dsh.account.entity.TAppUser;
import com.dsh.account.entity.VipPayment;
import com.dsh.account.model.IncomeQuery;
import com.dsh.account.model.query.RechargeRecordsQuery;
import com.dsh.account.model.query.coachQuery.CoachQuery;
import com.dsh.account.model.vo.CoachSerchVO;
import com.dsh.account.model.vo.RechargeRecordsVO;
-import com.dsh.account.service.CoachService;
-import com.dsh.account.service.CoachTypeService;
-import com.dsh.account.service.IVipPaymentService;
-import com.dsh.account.service.RechargeRecordsService;
+import com.dsh.account.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -31,7 +29,8 @@
private RechargeRecordsService rechargeRecordsService;
@Autowired
private IVipPaymentService vipPaymentService;
-
+ @Autowired
+ private TAppUserService appUserService;
/**
* 充值记录列表数据
@@ -42,6 +41,18 @@
return rechargeRecordsService.rechargeList(query);
}
/**
+ * 数据统计-充值记录列表数据
+ */
+ @ResponseBody
+ @RequestMapping("/finance/rechargeList1")
+ public List<RechargeRecords> rechargeList1(@RequestBody RechargeRecordsQuery query){
+ List<RechargeRecords> payStatus = rechargeRecordsService.list(new QueryWrapper<RechargeRecords>().eq("payStatus", 2));
+ for (RechargeRecords list : payStatus) {
+ TAppUser byId = appUserService.getById(list.getAppUserId());
+ }
+ return payStatus;
+ }
+ /**
* 加入会员列表数据
*/
@ResponseBody
diff --git a/cloud-server-account/src/main/java/com/dsh/account/dto/Receivers.java b/cloud-server-account/src/main/java/com/dsh/account/dto/Receivers.java
new file mode 100644
index 0000000..7dabf5c
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/dto/Receivers.java
@@ -0,0 +1,14 @@
+package com.dsh.account.dto;
+
+import lombok.Data;
+
+@Data
+public class Receivers {
+
+ String type;
+ String account;
+ String name;
+ Integer amout;
+ String description;
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
index cf89650..d15782a 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
@@ -26,4 +26,7 @@
@PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId);
+ @PostMapping("/base/competition/queryByCode")
+
+ Integer queryByCode(@RequestBody String code);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java
index a0b66ac..cd82212 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java
@@ -1,8 +1,12 @@
package com.dsh.account.feignclient.course;
import com.dsh.account.feignclient.course.model.CoursePackage;
+import com.dsh.account.feignclient.course.model.TCoursePackagePayment;
+import io.swagger.models.auth.In;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
/**
* @author zhibing.pu
@@ -19,4 +23,6 @@
*/
@PostMapping("/base/coursePackage/queryCoursePackageById")
CoursePackage queryCoursePackageById(Integer id);
+ @PostMapping("/base/coursePackage/queryByCode")
+ Integer queryByCode(String code);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java
index 2a99333..11c4ef3 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java
@@ -25,5 +25,6 @@
@PostMapping("/base/site/getNewAddSiteList")
List<SiteVo> getAppUserSiteList();
-
+ @PostMapping("/base/site/queryByCode")
+ Integer queryByCode(@RequestBody String code);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/mapper/RechargeRecordsMapper.java b/cloud-server-account/src/main/java/com/dsh/account/mapper/RechargeRecordsMapper.java
index 42f2e2d..bb0143e 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/mapper/RechargeRecordsMapper.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/mapper/RechargeRecordsMapper.java
@@ -22,6 +22,6 @@
public interface RechargeRecordsMapper extends BaseMapper<RechargeRecords> {
List<RechargeRecordsVO> rechargeList(@Param("query") RechargeRecordsQuery query,@Param("sTime")String sTime,@Param("eTime")String eTime);
- List<VipPayment> listAll(@Param("query") IncomeQuery query, @Param("sTime")String sTime, @Param("eTime")String eTime, @Param("amount") BigDecimal amount);
+ List<VipPayment> listAll(@Param("query") IncomeQuery query, @Param("sTime")String sTime, @Param("eTime")String eTime, @Param("amount") BigDecimal amount,@Param("insertType")Integer insertType);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/IncomeQuery.java b/cloud-server-account/src/main/java/com/dsh/account/model/IncomeQuery.java
index 0806803..6a56c86 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/IncomeQuery.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/IncomeQuery.java
@@ -20,5 +20,5 @@
private BigDecimal amount;
// 用户ids
private List<Integer> userIds;
-
+ private Integer insertType;
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java b/cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java
index 466050c..f0db8f8 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java
@@ -21,4 +21,5 @@
private Integer type;
private List<Integer> userIds;
private BigDecimal amount;
+ private Integer insertType;
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
index 242d614..01d206d 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
@@ -376,7 +376,7 @@
STime = query.getTime().split(" - ")[0] + " 00:00:00";
ETime = query.getTime().split(" - ")[1] + " 23:59:59";
}
- return rechargeRecordsMapper.listAll(query,STime,ETime,query.getAmount());
+ return rechargeRecordsMapper.listAll(query,STime,ETime,query.getAmount(),query.getInsertType());
}
public static <T> List<T> pageList(List<T> list, int pageNum, int pageSize) {
//计算总页数
diff --git a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
index 1fdf41e..664a52c 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
@@ -10,8 +10,17 @@
import com.alipay.api.domain.AlipayTradeQueryModel;
import com.alipay.api.request.*;
import com.alipay.api.response.*;
+import com.dsh.account.dto.Receivers;
+import com.dsh.account.feignclient.competition.DeductionCompetitionsClient;
+import com.dsh.account.feignclient.competition.model.PaymentCompetition;
+import com.dsh.account.feignclient.course.CoursePackageClient;
+import com.dsh.account.feignclient.course.model.TCoursePackagePayment;
+import com.dsh.account.feignclient.other.SiteClient;
+import com.dsh.account.feignclient.other.model.SiteBooking;
+import com.dsh.account.mapper.RechargeRecordsMapper;
import com.dsh.account.util.httpClinet.HttpClientUtil;
import org.apache.commons.collections.map.HashedMap;
+import org.apache.http.client.methods.CloseableHttpResponse;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.dom4j.Document;
import org.dom4j.DocumentException;
@@ -21,6 +30,7 @@
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
@@ -389,7 +399,8 @@
}
-
+ @Resource
+ private RechargeRecordsMapper rereMapper;
/**
@@ -414,6 +425,9 @@
map1.put("transaction_id", map.get("transaction_id"));//微信支付订单号
String result = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
map1.put("result", result);
+
+
+
return map1;
}else{
System.err.println(map.get("err_code_des"));
@@ -425,10 +439,57 @@
e.printStackTrace();
} catch (DocumentException e) {
e.printStackTrace();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
}
return null;
}
+@Resource
+private CoursePackageClient coursePackageClient;
+ @Resource
+ private DeductionCompetitionsClient competitionsClient;
+
+ @Resource
+ private SiteClient siteClient;
+ //分账
+ public ResultUtil order(String code) throws Exception {
+
+
+
+ Integer coursePackagePayments = coursePackageClient.queryByCode(code);
+ Integer paymentCompetitions = competitionsClient.queryByCode(code);
+ Integer siteBookings = siteClient.queryByCode(code);
+
+
+
+
+
+// Map<String,String> headers = new HashMap<>();
+// headers.put("Authorization",map.get("sign"));
+// headers.put("Accept","application/json");
+// headers.put("Wechatpay-Serial",certPath);
+//
+// List<Receivers> receivers = new ArrayList<>();
+//
+// Map<String,Object> body = new HashMap<>();
+// body.put("appid",appid);
+// body.put("transaction_id",map.get("transaction_id"));
+// body.put("out_order_no",map.get("out_trade_no"));
+// body.put("receivers",receivers);
+// body.put("unfreeze_unsplit",true);
+
+ //支付分账
+// String url ="https://api.mch.weixin.qq.com/v3/profitsharing/orders";
+// CloseableHttpResponse closeableHttpResponse = HttpClientUtil.setPostHttpRequset(url, body, headers, "application/json");
+//
+
+
+
+
+
+
+ }
/**
* 微信扫码收款
diff --git a/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java
index d69244d..dc08906 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java
@@ -75,7 +75,7 @@
* @param url 请求地址
* @param params 请求参数
*/
- private static CloseableHttpResponse setPostHttpRequset(String url, Map<String, Object> params, Map<String, String> header, String contentType) throws Exception{
+ public static CloseableHttpResponse setPostHttpRequset(String url, Map<String, Object> params, Map<String, String> header, String contentType) throws Exception{
HttpPost httpPost = new HttpPost(url);
httpPost.setConfig(getRequestConfig());
if(null != header){
diff --git a/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml b/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
index 6317187..7792f19 100644
--- a/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
+++ b/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
@@ -5,9 +5,13 @@
<select id="rechargeList" resultType="com.dsh.account.model.vo.RechargeRecordsVO">
select t1.* from t_recharge_records t1
+ left join t_app_user t2 on t1.appUserId = t2.id
<where>
<if test="query.amount!=null and query.amount!= ''">
and t1.amount <= #{query.amount}
+ </if>
+ <if test="query.insertType!=null and query.insertType!= ''">
+ and t2.insertType = #{query.insertType}
</if>
<if test="query.name!=null and query.name!= ''">
AND t1.name LIKE concat('%',#{query.name},'%')
@@ -28,10 +32,14 @@
</select>
<select id="listAll" resultType="com.dsh.account.entity.VipPayment">
select t1.* from t_vip_payment t1
+ left join t_app_user t2 on t1.appUserId = t2.id
<where>
<if test="amount!=null and amount!= ''">
and t1.amount <= #{amount}
</if>
+ <if test="query.insertType!=null and query.insertType!= ''">
+ and t2.insertType = #{query.insertType}
+ </if>
<if test="query.userIds != null and query.userIds.size()>0">
AND t1.appUserId IN
<foreach collection="query.userIds" separator="," item="id" open="(" close=")">
@@ -41,6 +49,7 @@
<if test="sTime !=null and sTime!= '' and eTime !=null and eTime!= ''">
and t1.insertTime between #{sTime} and #{eTime}
</if>
+ and t1.payStatus = 2
</where>
</select>
</mapper>
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 901066a..3a10b45 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -117,6 +117,14 @@
}
+ @PostMapping("/base/competition/queryByCode")
+ public Integer queryByCode(@RequestBody String code){
+
+ return paymentCompetitionService.queryByCode(code);
+ }
+
+
+
@PostMapping("/base/competition/getCompetitionsDetails")
public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList){
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java
index bceea9f..95271a8 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java
@@ -40,4 +40,5 @@
List<PaymentCompetition> listAll(@Param("query")CompetitionQuery query, @Param("sTime")String sTime, @Param("eTime")String eTime, @Param("amount") BigDecimal amount);
+ Integer queryBycode(String code);
}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionQuery.java b/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionQuery.java
index 8b15910..1f58786 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionQuery.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionQuery.java
@@ -16,5 +16,5 @@
private BigDecimal amount;
// 用户ids
private List<Integer> userIds;
-
+ private Integer insertType;
}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java
index 8d19245..593ce0a 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java
@@ -53,4 +53,6 @@
List<BillingRequest> queryCancelDatas(Integer appUserId, String monthStart, String monthEnd);
List<PaymentCompetition> listAll(CompetitionQuery query);
+
+ Integer queryByCode(String code);
}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
index a9b8333..e21498e 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
@@ -260,4 +260,9 @@
return paymentCompetitionMapper.listAll(query,STime,ETime,query.getAmount());
}
+
+ @Override
+ public Integer queryByCode(String code) {
+ return this.baseMapper.queryBycode(code);
+ }
}
diff --git a/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml b/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
index a865758..15a4e75 100644
--- a/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
+++ b/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
@@ -74,4 +74,10 @@
</if>
</where>
</select>
+ <select id="queryBycode" resultType="java.lang.Integer">
+ SELECT cp.storeId
+ FROM t_course_package_payment py
+ LEFT JOIN t_course_package cp ON py.coursePackageId = cp.id
+ WHERE py.code = #{code}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
index b3aa303..e4b4470 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
@@ -454,6 +454,13 @@
TCoursePackage byId1 = coursePackageService.getById(byId.getCoursePackageId());
return byId1;
}
+ @ResponseBody
+ @PostMapping("/course/queryByDiscountId1")
+ public TCoursePackage queryByDiscountId1(@RequestBody Integer id){
+ TCoursePackageDiscount byId = discountService.getById(id);
+ TCoursePackage byId1 = coursePackageService.getById(byId.getCoursePackageId());
+ return byId1;
+ }
@PostMapping("/course/queryDiscountById")
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
index 555c8a6..3cfdac8 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
@@ -78,6 +78,17 @@
return null;
}
}
+
+ @Autowired
+ private TCoursePackagePaymentService packagePaymentService;
+
+ @ResponseBody
+ @PostMapping("/base/coursePackage/queryByCode")
+ public Integer queryByCode(@RequestBody String code){
+
+
+ return packagePaymentService.listStoreId(code);
+ }
/**
* 根据id获取课包
*/
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index c65589a..793e679 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -372,15 +372,18 @@
List<RegisterOrderVO> res = packagePaymentService.listAllRegister(query);
List<RegisterOrderVO> result = new ArrayList<>();
- for (RegisterOrderVO re : res) {
- if(re.getSalesName()==null){
+ Iterator<RegisterOrderVO> iterator = res.iterator();
+ while (iterator.hasNext()) {
+ RegisterOrderVO re = iterator.next();
+
+ if (re.getSalesName() == null) {
re.setSalesName("无");
}
- if(re.getPayType()!=null){
- if (re.getPayType() == 3){
- re.setPayMoneyAndType(re.getPlayPaiCoin()+"玩湃币");
- }else{
- re.setPayMoneyAndType("￥"+re.getMoney());
+ if (re.getPayType() != null) {
+ if (re.getPayType() == 3) {
+ re.setPayMoneyAndType(re.getPlayPaiCoin() + "玩湃币");
+ } else {
+ re.setPayMoneyAndType("￥" + re.getMoney());
}
}
Store store = storeClient.queryStoreById(re.getStoreId());
@@ -390,6 +393,10 @@
re.setPayUser(appUser.getName());
re.setPhone(appUser.getPhone());
re.setStoreName(store.getName());
+ // 在这里添加条件来删除不满足要求的元素
+ if (appUser.getInsertType() != query.getInsertType()) {
+ iterator.remove(); // 使用迭代器的 remove 方法删除元素
+ }
}
return res;
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/TAppUser.java b/cloud-server-course/src/main/java/com/dsh/course/entity/TAppUser.java
index edd1d68..b657d88 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/TAppUser.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/TAppUser.java
@@ -160,6 +160,15 @@
@TableField("insertTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
-
+ /**
+ * 添加人类型 1 = 平台添加 2 = 运营商添加 3 = 门店添加
+ */
+ @TableField("insertType")
+ private Integer insertType;
+ /**
+ * 添加人ID
+ */
+ @TableField("headImg")
+ private Integer addUserId;
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java b/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
index edd843d..9fd00ff 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
@@ -76,4 +76,5 @@
List<TCoursePackagePayment> listOne(@Param("ids") List<Integer> ids);
+ Integer queryStore(String code);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/RegisterOrderQuery.java b/cloud-server-course/src/main/java/com/dsh/course/model/RegisterOrderQuery.java
index e264e88..456dcd0 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/RegisterOrderQuery.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/RegisterOrderQuery.java
@@ -37,4 +37,5 @@
private Integer orderSource;
// 订单金额
private BigDecimal amount;
+ private Integer insertType;
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java b/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java
index 441ec3d..61d9912 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java
@@ -140,4 +140,5 @@
List<Map<String, Object>> bypac(PacQueryDto pacQueryDto);
List<TCoursePackagePayment> listOne(List<Integer> ids);
+ Integer listStoreId(String code);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index 2bfc8a7..619ba42 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -257,6 +257,11 @@
return this.baseMapper.listOne(ids);
}
+ @Override
+ public Integer listStoreId(String code) {
+ return this.baseMapper.queryStore(code);
+ }
+
/**
* 获取课包购买人数
* @param coursePackageId
diff --git a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
index 149f878..4b1bc79 100644
--- a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
@@ -205,6 +205,14 @@
<select id="listOne" resultType="com.dsh.course.entity.TCoursePackagePayment">
select * from t_course_package_payment where appUserId in <foreach collection="ids" separator="," open="(" item="id" close=")">#{id}</foreach>
</select>
+ <select id="queryStore" resultType="java.lang.Integer">
+ SELECT
+ tc.storeId
+ FROM
+ t_payment_competition pc
+ LEFT JOIN t_competition tc on pc.competitionId = tc.id
+ WHERE pc.code=#{code}
+ </select>
<update id="updateBytime">
update t_course_package_payment
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/FinanceClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/FinanceClient.java
index d92e119..c64a996 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/FinanceClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/FinanceClient.java
@@ -1,6 +1,7 @@
package com.dsh.course.feignClient.account;
import com.dsh.course.feignClient.account.model.CoachType;
+import com.dsh.course.feignClient.account.model.RechargeRecords;
import com.dsh.guns.modular.system.model.RechargeRecordsQuery;
import com.dsh.guns.modular.system.model.RechargeRecordsVO;
import org.springframework.cloud.openfeign.FeignClient;
@@ -23,4 +24,9 @@
*/
@RequestMapping("/finance/rechargeList")
List<RechargeRecordsVO> rechargeList(@RequestBody RechargeRecordsQuery query);
+ /**
+ * 数据统计-充值记录列表数据
+ */
+ @RequestMapping("/finance/rechargeList1")
+ List<RechargeRecords> rechargeList1(@RequestBody RechargeRecordsQuery query);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/RechargeRecords.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/RechargeRecords.java
new file mode 100644
index 0000000..c921314
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/RechargeRecords.java
@@ -0,0 +1,89 @@
+package com.dsh.course.feignClient.account.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 充值记录
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_recharge_records")
+public class RechargeRecords extends Model<RechargeRecords> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
+ /**
+ * 流水号
+ */
+ @TableField("code")
+ private String code;
+ /**
+ * 用户id
+ */
+ @TableField("appUserId")
+ private Integer appUserId;
+ /**
+ * 充值金额
+ */
+ @TableField("amount")
+ private BigDecimal amount;
+ /**
+ * 玩湃币
+ */
+ @TableField("playPaiCoins")
+ private Integer playPaiCoins;
+ /**
+ * 支付状态（1=待支付，2=已支付）
+ */
+ @TableField("payStatus")
+ private Integer payStatus;
+ /**
+ * 支付时间
+ */
+ @TableField("payTime")
+ private Date payTime;
+ /**
+ * 第三方支付流水号
+ */
+ @TableField("orderNumber")
+ private String orderNumber;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ @TableField("state")
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ private Date insertTime;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionQuery.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionQuery.java
index 2076d71..ba14285 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionQuery.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionQuery.java
@@ -1,5 +1,6 @@
package com.dsh.course.feignClient.competition.model;
+import io.swagger.models.auth.In;
import lombok.Data;
import java.math.BigDecimal;
@@ -16,5 +17,7 @@
private BigDecimal amount;
// 用户ids
private List<Integer> userIds;
-
+ // 筛选是平台 还是运营商 还是门店
+ private Integer type;
+ private Integer insertType;
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java
index 1b0ae84..2908ad2 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java
@@ -5,6 +5,7 @@
import com.dsh.course.feignClient.course.model.*;
import com.dsh.course.model.AuditDiscount;
import com.dsh.guns.modular.system.model.*;
+import com.dsh.guns.modular.system.model.dto.CoursePackage;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -113,6 +114,8 @@
@PostMapping("/course/queryByDiscountId")
TCoursePackage queryByDiscountId(Integer id);
+ @PostMapping("/course/queryByDiscountId1")
+ CoursePackage queryByDiscountId1(Integer id);
@PostMapping("/course/queryDiscountById")
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TGameConfigMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TGameConfigMapper.java
new file mode 100644
index 0000000..bd401a8
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/TGameConfigMapper.java
@@ -0,0 +1,18 @@
+package com.dsh.course.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsh.guns.modular.system.model.TGameConfig;
+
+
+/**
+ * <p>
+ * 游戏配置 Mapper 接口
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-09-18
+ */
+public interface TGameConfigMapper extends BaseMapper<TGameConfig> {
+
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/service/TGameConfigService.java b/cloud-server-management/src/main/java/com/dsh/course/service/TGameConfigService.java
new file mode 100644
index 0000000..1611c3f
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/service/TGameConfigService.java
@@ -0,0 +1,17 @@
+package com.dsh.course.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.guns.modular.system.model.TGameConfig;
+
+/**
+ * <p>
+ * 游戏配置 服务类
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-09-18
+ */
+public interface TGameConfigService extends IService<TGameConfig> {
+
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/service/impl/TGameConfigServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/course/service/impl/TGameConfigServiceImpl.java
new file mode 100644
index 0000000..db7a4b5
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/service/impl/TGameConfigServiceImpl.java
@@ -0,0 +1,21 @@
+package com.dsh.course.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.course.mapper.TGameConfigMapper;
+import com.dsh.course.service.TGameConfigService;
+import com.dsh.guns.modular.system.model.TGameConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 游戏配置 服务实现类
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-09-18
+ */
+@Service
+public class TGameConfigServiceImpl extends ServiceImpl<TGameConfigMapper, TGameConfig> implements TGameConfigService {
+
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
index e23922a..ecf2190 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
@@ -3,10 +3,7 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dsh.course.feignClient.account.*;
-import com.dsh.course.feignClient.account.model.CityManager;
-import com.dsh.course.feignClient.account.model.QueryDataFee;
-import com.dsh.course.feignClient.account.model.TAppUser;
-import com.dsh.course.feignClient.account.model.VipPayment;
+import com.dsh.course.feignClient.account.model.*;
import com.dsh.course.feignClient.activity.PointMercharsClient;
import com.dsh.course.feignClient.competition.CompetitionClient;
import com.dsh.course.feignClient.competition.model.Competition;
@@ -114,7 +111,7 @@
*/
@RequestMapping(value = "/getIncomeData")
@ResponseBody
- public Object getIncomeData(Integer type) {
+ public Object getIncomeData(Integer operatorId,Integer storeId) {
// 充值记录查询query
RechargeRecordsQuery rechargeRecordsQuery = new RechargeRecordsQuery();
// 报名课程查询query
@@ -126,6 +123,12 @@
// 场地预约记录查询query
SiteBookingQuery siteBookingQuery = new SiteBookingQuery();
Integer roleType = UserExt.getUser().getObjectType();
+ rechargeRecordsQuery.setInsertType(roleType);
+ query.setInsertType(roleType);
+ competitionQuery.setInsertType(roleType);
+ incomeQuery.setInsertType(roleType);
+ incomeQuery.setInsertType(roleType);
+
IncomeVO incomeVO = new IncomeVO();
List<IncomeVO> incomeVOS = new ArrayList<>();
// 会员支付记录
@@ -142,6 +145,7 @@
}
// 充值记录
List<RechargeRecordsVO> rechargeRecordsVOS = financeClient.rechargeList(rechargeRecordsQuery);
+ List<RechargeRecords> rechargeRecords = financeClient.rechargeList1(rechargeRecordsQuery);
for (RechargeRecordsVO rechargeRecordsVO : rechargeRecordsVOS) {
IncomeVO temp = new IncomeVO();
temp.setInsertTime(rechargeRecordsVO.getInsertTime());
@@ -223,8 +227,8 @@
// 累加到总金额
totalAmount1 = totalAmount1.add(total);
- Date insertTime = incomeVO1.getInsertTime(); // 假设有一个方法用于获取 insertTime
- BigDecimal amount1 = incomeVO1.getAmount(); // 假设有一个方法用于获取 amount
+ Date insertTime = incomeVO1.getInsertTime();
+ BigDecimal amount1 = incomeVO1.getAmount();
Calendar calendar = Calendar.getInstance();
calendar.setTime(insertTime);
int year = calendar.get(Calendar.YEAR); // 获取年份
@@ -242,8 +246,13 @@
Collections.sort(sortedYears);
// 创建一个新的 IncomeVO 列表，包含按年份累计的 amount
List<Object> resultIncomeVOS = new ArrayList<>();
- // 循环遍历2023年到2028年的年份
- for (int year = 2023; year <= 2028; year++) {
+ // 当前年往前推十年
+ List<Integer> integers1 = new ArrayList<>();
+ int years = DateUtil.year(new Date());
+ for (int i = 0; i < 10; i++) {
+ integers1.add(years-i);
+ }
+ for (int year = integers1.get(0); year >= integers1.get(integers1.size()-1); year++) {
BigDecimal totalAmount = yearToTotalAmountMap.getOrDefault(year, BigDecimal.ZERO);
// 创建一个新的 IncomeVO 对象，并设置年份和累计金额
IncomeVO resultIncomeVO = new IncomeVO();
@@ -276,20 +285,55 @@
int currentMonth = currentDate.getMonthValue();
// 初始化一个长度为当前月份的天数的列表，并将每一天的金额初始化为零
int daysInCurrentMonth = currentDate.lengthOfMonth();
- List<BigDecimal> weekAmount = new ArrayList<>(daysInCurrentMonth);
- for (int i = 0; i < daysInCurrentMonth; i++) {
- weekAmount.add(BigDecimal.ZERO);
- }
+ List<BigDecimal> weekAmount = new ArrayList<>();
+
+ // 获取最近四周
+ LocalDateTime minNow = LocalDateTime.now().with(LocalTime.MIN);
+ LocalDateTime maxNow = LocalDateTime.now().with(LocalTime.MAX);
+ // 周度数据
+ LocalDateTime week1Start = minNow.minusDays(6);
+ LocalDateTime week1End = maxNow;
+
+ LocalDateTime week2Start = minNow.minusDays(13);
+ LocalDateTime week2End = minNow.minusDays(7);
+
+ LocalDateTime week3Start = minNow.minusDays(20);
+ LocalDateTime week3End = minNow.minusDays(14);
+
+ LocalDateTime week4Start = minNow.minusDays(27);
+ LocalDateTime week4End = minNow.minusDays(21);
+ // 用于存放四个周的数据
+ List<Object> objects1 = new ArrayList<>();
+ // 计算每个周的amount总和
+ BigDecimal tAmount1 = BigDecimal.ZERO;
+ BigDecimal tAmount2 = BigDecimal.ZERO;
+ BigDecimal tAmount3 = BigDecimal.ZERO;
+ BigDecimal tAmount4 = BigDecimal.ZERO;
for (IncomeVO incomeVO1 : incomeVOS) {
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String string = dateFormat.format(incomeVO1.getInsertTime());
- LocalDate insertDate = LocalDate.parse(string, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- if (insertDate.getMonthValue() == currentMonth) {
- int dayOfMonth = insertDate.getDayOfMonth();
- BigDecimal currentAmount = weekAmount.get(dayOfMonth - 1); // 列表索引从0开始
- weekAmount.set(dayOfMonth - 1, currentAmount.add(incomeVO1.getAmount()));
+ Date insertTime = incomeVO1.getInsertTime();
+ // 将Date转换为LocalDateTime
+ Instant instant = insertTime.toInstant();
+ ZoneId zoneId = ZoneId.systemDefault();
+ LocalDateTime dateTime = instant.atZone(zoneId).toLocalDateTime();
+ // 判断该数据属于哪个周
+ if (dateTime.isAfter(week1Start) && dateTime.isBefore(week1End)) {
+ BigDecimal amount1 = incomeVO1.getAmount();
+ tAmount1=tAmount1.add(amount1);
+ } else if (dateTime.isAfter(week2Start) && dateTime.isBefore(week2End)) {
+ BigDecimal amount1 = incomeVO1.getAmount();
+ tAmount2=tAmount2.add(amount1);
+ } else if (dateTime.isAfter(week3Start) && dateTime.isBefore(week3End)) {
+ BigDecimal amount1 = incomeVO1.getAmount();
+ tAmount4=tAmount3.add(amount1);
+ } else if (dateTime.isAfter(week4Start) && dateTime.isBefore(week4End)) {
+ BigDecimal amount1 = incomeVO1.getAmount();
+ tAmount4=tAmount4.add(amount1);
}
}
+ weekAmount.add(tAmount1);
+ weekAmount.add(tAmount2);
+ weekAmount.add(tAmount3);
+ weekAmount.add(tAmount4);
monthlyData.put("weekIncome", Collections.singletonList(weekAmount));
LocalDateTime currentDateTime = LocalDateTime.now();
@@ -311,11 +355,6 @@
}
monthlyData.put("dayIncome", Collections.singletonList(amountByDay));
- // 创建一个 Map 用于存储今年本周的累计 amount
- Map<Integer, BigDecimal> dayToTotalAmountMap = new HashMap<>();
- BigDecimal yearAmount = BigDecimal.ZERO; // 初始化累加变量为0
- BigDecimal monthAmount = BigDecimal.ZERO; // 初始化累加变量为0
- BigDecimal todayAmount = BigDecimal.ZERO; // 初始化累加变量为0
// 获取当前日期和时间
LocalDateTime now = LocalDateTime.now();
// 今年的起始日期和结束日期
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
index aa3447b..b8bdf86 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
@@ -230,7 +230,6 @@
user.setName(userName);
user.setPhone(phone);
user.setObjectType(2);
- userService.save(user);
TOperator data = new TOperator();
data.setUserId(user.getId());
data.setName(name);
@@ -238,6 +237,8 @@
data.setStatus(1);
data.setState(1);
operatorService.save(data);
+ user.setObjectId(data.getId());
+ userService.save(user);
if (SinataUtil.isNotEmpty(comArr)){
JSONArray jsonArray = JSON.parseArray(comArr);
int size = jsonArray.size();
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
index 3414c9e..8f39ecc 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
@@ -20,6 +20,7 @@
import com.dsh.guns.modular.system.model.DiscountUpdateState;
import com.dsh.guns.modular.system.model.TCity;
import com.dsh.guns.modular.system.model.TStore;
+import com.dsh.guns.modular.system.model.dto.CoursePackage;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.ICoursePackageService;
import com.dsh.guns.modular.system.service.IStoreService;
@@ -62,9 +63,6 @@
@Autowired
private CourseClient courseClient;
-
-
-
/**
* 跳转到车辆管理首页
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
index aa246a9..f5f3c49 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -29,7 +29,7 @@
import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.util.HttpRequestUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
-import com.sun.org.apache.regexp.internal.RE;
+
import groovyjarjarpicocli.CommandLine;
import net.bytebuddy.asm.Advice;
import org.aspectj.weaver.ast.Var;
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 4efb025..6c7ba02 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -18,6 +18,7 @@
import com.dsh.course.feignClient.other.BallClient;
import com.dsh.course.feignClient.other.SiteClient;
import com.dsh.course.feignClient.other.model.Site;
+import com.dsh.course.service.TGameConfigService;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.modular.system.model.*;
@@ -31,6 +32,7 @@
import com.sun.org.apache.xerces.internal.impl.io.ASCIIReader;
import io.netty.util.AsciiString;
import io.rong.util.HttpUtil;
+import io.swagger.models.auth.In;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.logging.log4j.util.Base64Util;
import org.springframework.beans.factory.annotation.Autowired;
@@ -188,17 +190,17 @@
@RequestMapping("/save")
@ResponseBody
- public ResultUtil save(String operationId,String red, String blue, String province, String city, Integer site, Integer store
- , String kuacheng, BigDecimal kuachengCoin, BigDecimal kuachengCash,String kuachengImage,BigDecimal kuachengInt,Integer kuachengId
- , String shequ, BigDecimal shequCoin, BigDecimal shequCash,String shequImage,BigDecimal shequInt,Integer shequId
- , String shemen, BigDecimal shemenCoin, BigDecimal shemenCash,String shemenImage,BigDecimal shemenInt,Integer shemenId
- , String sudu, BigDecimal suduCoin, BigDecimal suduCash,String suduImage,BigDecimal suduInt,Integer suduId
- , String fangkuai, BigDecimal fangkuaiCoin, BigDecimal fangkuaiCash,String fangkuaiImage,BigDecimal fangkuaiInt,Integer fangkuaiId
- , String jx, BigDecimal jxCoin, BigDecimal jxCash,String jxImage,BigDecimal jxInt,Integer jxId
- , String sq, BigDecimal sqCoin, BigDecimal sqCash,String sqImage,BigDecimal sqInt,Integer sqId
- , String zs, BigDecimal zsCoin, BigDecimal zsCash,String zsImage,BigDecimal zsInt,Integer zsId
- , String zs2, BigDecimal zs2Coin, BigDecimal zs2Cash,String zs2Image,BigDecimal zs2Int,Integer zs2Id
- , String ly, BigDecimal lyCoin, BigDecimal lyCash,String lyImage,BigDecimal lyInt,Integer lyId
+ public ResultUtil save(Integer id, String operationId, String red, String blue, String province, String city, Integer site, Integer store
+ , String kuacheng, BigDecimal kuachengCoin, BigDecimal kuachengCash, String kuachengImage, BigDecimal kuachengInt, Integer kuachengId,Integer kcId
+ , String shequ, BigDecimal shequCoin, BigDecimal shequCash, String shequImage, BigDecimal shequInt, Integer shequId,Integer shequIId
+ , String shemen, BigDecimal shemenCoin, BigDecimal shemenCash, String shemenImage, BigDecimal shemenInt, Integer shemenId,Integer smId
+ , String sudu, BigDecimal suduCoin, BigDecimal suduCash, String suduImage, BigDecimal suduInt, Integer suduId,Integer sdId
+ , String fangkuai, BigDecimal fangkuaiCoin, BigDecimal fangkuaiCash, String fangkuaiImage, BigDecimal fangkuaiInt, Integer fangkuaiId,Integer fkId
+ , String jx, BigDecimal jxCoin, BigDecimal jxCash, String jxImage, BigDecimal jxInt, Integer jxId,Integer jxIId
+ , String sq, BigDecimal sqCoin, BigDecimal sqCash, String sqImage, BigDecimal sqInt, Integer sqId,Integer qwId
+ , String zs, BigDecimal zsCoin, BigDecimal zsCash, String zsImage, BigDecimal zsInt, Integer zsId,Integer zsIId
+ , String zs2, BigDecimal zs2Coin, BigDecimal zs2Cash, String zs2Image, BigDecimal zs2Int, Integer zs2Id,Integer zs2IId
+ , String ly, BigDecimal lyCoin, BigDecimal lyCash, String lyImage, BigDecimal lyInt, Integer lyId,Integer lyIId
@@ -213,6 +215,7 @@
game.setCityCode(city);
game.setSiteId(site);
game.setStoreId(store);
+ game.setId(id);
if (!operationId.equals("平台")){
@@ -230,6 +233,7 @@
//玩湃跨城赛
TGameConfig gameConfigkuacheng = new TGameConfig();
+ gameConfigkuacheng.setId(kcId);
gameConfigkuacheng.setGameId(kuachengId);
gameConfigkuacheng.setCash(kuachengCash);
gameConfigkuacheng.setImg(kuachengImage);
@@ -244,72 +248,77 @@
//社区冠军赛
TGameConfig gameConfigshequ = new TGameConfig();
+ gameConfigshequ.setId(shequIId);
gameConfigshequ.setGameId(shequId);
gameConfigshequ.setCash(shequCash);
gameConfigshequ.setImg(shequImage);
gameConfigshequ.setName(shequ);
gameConfigshequ.setPlayCoin(shequCoin);
gameConfigshequ.setIntegral(shequInt);
- gameConfigshequ.setOtherId(shequId);
+ gameConfigshequ.setOtherId(gameId);
gameConfigList.add(gameConfigshequ);
//射门速度-玩湃熊之力
TGameConfig gameConfigshemen = new TGameConfig();
gameConfigshemen.setGameId(shemenId);
+ gameConfigshemen.setId(smId);
gameConfigshemen.setCash(shemenCash);
gameConfigshemen.setImg(shemenImage);
gameConfigshemen.setName(shemen);
gameConfigshemen.setPlayCoin(shemenCoin);
gameConfigshemen.setIntegral(shemenInt);
- gameConfigshemen.setOtherId(shemenId);
+ gameConfigshemen.setOtherId(gameId);
gameConfigList.add(gameConfigshemen);
//玩湃熊之力-速度
TGameConfig gameConfigsudu = new TGameConfig();
- gameConfigsudu.setGameId(suduId);
+ gameConfigsudu.setGameId(suduId);gameConfigsudu.setId(sdId);
gameConfigsudu.setCash(suduCash);
gameConfigsudu.setImg(suduImage);
gameConfigsudu.setName(sudu);
gameConfigsudu.setPlayCoin(suduCoin);
gameConfigsudu.setIntegral(suduInt);
- gameConfigsudu.setOtherId(suduId);
+ gameConfigsudu.setOtherId(gameId);
gameConfigList.add(gameConfigsudu);
//方块球王
TGameConfig gameConfigfangkuai = new TGameConfig();
gameConfigfangkuai.setGameId(fangkuaiId);
+ gameConfigfangkuai.setId(fkId);
gameConfigfangkuai.setCash(fangkuaiCash);
gameConfigfangkuai.setImg(fangkuaiImage);
gameConfigfangkuai.setName(fangkuai);
gameConfigfangkuai.setPlayCoin(fangkuaiCoin);
gameConfigfangkuai.setIntegral(fangkuaiInt);
- gameConfigfangkuai.setOtherId(fangkuaiId);
+ gameConfigfangkuai.setOtherId(gameId);
gameConfigList.add(gameConfigfangkuai);
//镜像阵容
TGameConfig gameConfigjx = new TGameConfig();
gameConfigjx.setGameId(jxId);
+ gameConfigjx.setId(jxIId);
gameConfigjx.setCash(jxCash);
gameConfigjx.setImg(jxImage);
gameConfigjx.setName(jx);
gameConfigjx.setPlayCoin(jxCoin);
gameConfigjx.setIntegral(jxInt);
- gameConfigjx.setOtherId(jxId);
+ gameConfigjx.setOtherId(gameId);
gameConfigList.add(gameConfigjx);
//社区小球王
TGameConfig gameConfigsq = new TGameConfig();
gameConfigsq.setGameId(sqId);
+ gameConfigsq.setId(qwId);
gameConfigsq.setCash(sqCash);
gameConfigsq.setImg(sqImage);
gameConfigsq.setName(sq);
gameConfigsq.setPlayCoin(sqCoin);
gameConfigsq.setIntegral(sqInt);
- gameConfigsq.setOtherId(sqId);
+ gameConfigsq.setOtherId(gameId);
gameConfigList.add(gameConfigsq);
@@ -317,34 +326,36 @@
//涨姿势
TGameConfig gameConfigzs = new TGameConfig();
gameConfigzs.setGameId(zsId);
+ gameConfigzs.setId(zsIId);
gameConfigzs.setCash(zsCash);
gameConfigzs.setImg(zsImage);
gameConfigzs.setName(zs);
gameConfigzs.setPlayCoin(zsCoin);
gameConfigzs.setIntegral(zsInt);
- gameConfigzs.setOtherId(zsId);
+ gameConfigzs.setOtherId(gameId);
gameConfigList.add(gameConfigzs);
//涨姿势2
TGameConfig gameConfigzs2 = new TGameConfig();
- gameConfigzs2.setGameId(zs2Id);
+ gameConfigzs2.setGameId(zs2Id);gameConfigzs2.setId(zs2IId);
gameConfigzs2.setCash(zs2Cash);
gameConfigzs2.setImg(zs2Image);
gameConfigzs2.setName(zs2);
gameConfigzs2.setPlayCoin(zs2Coin);
gameConfigzs2.setIntegral(zs2Int);
- gameConfigzs2.setOtherId(zs2Id);
+ gameConfigzs2.setOtherId(gameId);
gameConfigList.add(gameConfigzs2);
//绿茵密码
TGameConfig gameConfigly = new TGameConfig();
gameConfigly.setGameId(lyId);
+ gameConfigly.setId(lyIId);
gameConfigly.setCash(lyCash);
gameConfigly.setImg(lyImage);
gameConfigly.setName(ly);
gameConfigly.setPlayCoin(lyCoin);
gameConfigly.setIntegral(lyInt);
- gameConfigly.setOtherId(lyId);
+ gameConfigly.setOtherId(gameId);
gameConfigList.add(gameConfigly);
@@ -364,6 +375,8 @@
+ @Autowired
+ private TGameConfigService gameConfigService;
@RequestMapping("/pre_edit/{id}")
public String pre_edit(@PathVariable("id") Integer id,Model model) {
@@ -371,6 +384,41 @@
System.out.println("---------game------"+game);
model.addAttribute("game",game);
+
+ TGameConfig kc = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 14));
+ model.addAttribute("kc",kc);
+
+
+ TGameConfig sq = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 16));
+ model.addAttribute("sq",sq);
+
+
+ TGameConfig sm = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 13));
+ model.addAttribute("sm",sm);
+
+ TGameConfig sd = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 15));
+ model.addAttribute("sd",sd);
+
+ TGameConfig fk = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 1));
+ model.addAttribute("fk",fk);
+
+ TGameConfig jx = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 7));
+ model.addAttribute("jx",jx);
+
+ TGameConfig qw = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 8));
+ model.addAttribute("qw",qw);
+
+ TGameConfig zs = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 10));
+ model.addAttribute("zs",zs);
+
+ TGameConfig zs2 = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 11));
+ model.addAttribute("zs2",zs2);
+
+ TGameConfig ly = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 5));
+ model.addAttribute("ly",ly);
+
+
+
return PREFIX+"ball_pre_edit.html";
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IncomeQuery.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IncomeQuery.java
index 1d65760..ca01165 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IncomeQuery.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IncomeQuery.java
@@ -20,5 +20,5 @@
private BigDecimal amount;
// 用户ids
private List<Integer> userIds;
-
+ private Integer insertType;
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java
index 1f66a7a..77c4dd9 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java
@@ -22,4 +22,5 @@
private Integer type;
private List<Integer> userIds;
private BigDecimal amount;
+ private Integer insertType;
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RegisterOrderQuery.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RegisterOrderQuery.java
index 91151ee..f7d5213 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RegisterOrderQuery.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RegisterOrderQuery.java
@@ -36,4 +36,5 @@
private Integer orderSource;
// 订单金额
private BigDecimal amount;
+ private Integer insertType;
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TGameConfig.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TGameConfig.java
index 4c0f052..3fc2bc8 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TGameConfig.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TGameConfig.java
@@ -59,7 +59,7 @@
@TableField("gameId")
private Integer gameId;
-
+ @TableField("otherId")
private Integer otherId;
@Override
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/CoursePackage.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/CoursePackage.java
new file mode 100644
index 0000000..318b7d5
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/CoursePackage.java
@@ -0,0 +1,180 @@
+package com.dsh.guns.modular.system.model.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.dsh.course.feignClient.course.model.TCoursePackage;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 课包
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_course_package")
+public class CoursePackage{
+
+
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 省
+ */
+ @TableField("province")
+ private String province;
+ /**
+ * 省编号
+ */
+ @TableField("provinceCode")
+ private String provinceCode;
+ /**
+ * 市
+ */
+ @TableField("city")
+ private String city;
+ /**
+ * 市编号
+ */
+ @TableField("cityCode")
+ private String cityCode;
+ /**
+ * 门店id
+ */
+ @TableField("storeId")
+ private Integer storeId;
+ /**
+ * 课包类型id
+ */
+ @TableField("coursePackageTypeId")
+ private Integer coursePackageTypeId;
+ /**
+ * 课包名称
+ */
+ @TableField("name")
+ private String name;
+ /**
+ * 上课场地id
+ */
+ @TableField("siteId")
+ private Integer siteId;
+ /**
+ * 教练id
+ */
+ @TableField("coachId")
+ private Integer coachId;
+ /**
+ * 最多预约人数
+ */
+ @TableField("maxSubscribeNumber")
+ private Integer maxSubscribeNumber;
+
+ @TableField("codeTime")
+ private Integer codeTime;
+ /**
+ * 上课开始时间
+ */
+ @TableField("classStartTime")
+ private String classStartTime;
+ /**
+ * 上课结束时段
+ */
+ @TableField("classEndTime")
+ private String classEndTime;
+ /**
+ * 上课周，多个分号分隔
+ */
+ @TableField("classWeeks")
+ private String classWeeks;
+ /**
+ * 封面图
+ */
+ @TableField("coverDrawing")
+ private String coverDrawing;
+ /**
+ * 详情图
+ */
+ @TableField("detailDrawing")
+ private String detailDrawing;
+ /**
+ * 介绍图
+ */
+ @TableField("introduceDrawing")
+ private String introduceDrawing;
+ /**
+ * 排序
+ */
+ @TableField("sort")
+ private Integer sort;
+ /**
+ * 支付方式（1=现金，2=玩湃币）
+ */
+ @TableField("payType")
+ private Integer payType;
+ /**
+ * 有效天数
+ */
+ @TableField("validDays")
+ private Integer validDays;
+ /**
+ * 课程状态（1=未开始，2=进行中，3=已结束，4=已取消）
+ */
+ @TableField("status")
+ private Integer status;
+ /**
+ * 审核状态（1=待审核，2=已同意，3=已拒绝）
+ */
+ @TableField("auditStatus")
+ private Integer auditStatus;
+ /**
+ * 审核人id
+ */
+ @TableField("auditUserId")
+ private Integer auditUserId;
+ /**
+ * 审核备注
+ */
+ @TableField("authRemark")
+ private String authRemark;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ @TableField("state")
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date insertTime;
+ @TableField("type")
+ private Integer type;
+ @TableField("needNum")
+ private Integer needNum;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("startTime")
+ private Date startTime;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("endTime")
+ private Date endTime;
+}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
index caf096a..08433d9 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
@@ -108,6 +108,7 @@
"multiple": false,
"mode": "horizontal",
"size": "md",
+ "value":"",
"horizontal": {
"leftFixed": "lg"
},
@@ -138,6 +139,7 @@
"type": "select",
"label": "所在市：",
"name": "city",
+ "value":"",
"id": "u:14bafe37d5f3",
"multiple": false,
"mode": "horizontal",
@@ -172,6 +174,7 @@
"type": "select",
"label": "所属门店：",
"name": "store",
+ "value":"",
"id": "u:576899b1b531",
"multiple": false,
"mode": "horizontal",
@@ -206,6 +209,7 @@
"type": "select",
"label": "所属场地：",
"name": "site",
+ "value":"",
"id": "u:0d288f4bdd8e",
"multiple": false,
"mode": "horizontal",
@@ -249,7 +253,8 @@
},
"value": "",
"required": true
-
+ ,
+ "value":""
},
{
"type": "input-text",
@@ -260,7 +265,8 @@
"clearValueOnHidden": false,
"hidden": false,
"required": true
-
+ ,
+ "value":""
},
{
"type": "button",
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html
index f375f7f..f858bef 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html
@@ -53,7 +53,18 @@
"style": {
"marginLeft": "0"
}
- },{
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "id",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${game.id}`
+ }
+ ,
+ {
"type": "select",
"label": "",
"name": "operationId",
@@ -76,7 +87,8 @@
}
},
"labelField": "value",
- "valueField": "id"
+ "valueField": "id",
+ "value":`${game.operationId}`
},{
"type": "checkbox",
"option": "平台",
@@ -325,7 +337,8 @@
"accept": ".jpeg, .jpg, .png, .gif",
"multiple": false,
"hideUploadButton": false,
- "fixedSize": false
+ "fixedSize": false,
+ "value":`${kc.img}`
},
{
"type": "hidden",
@@ -335,6 +348,14 @@
"mode": "inline",
"labelClassName": "text-dark m-b",
"value": "玩湃跨城赛"
+ },{
+ "type": "hidden",
+ "label": "",
+ "name": "kcId",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${kc.id}`
},
{
"type": "hidden",
@@ -362,6 +383,7 @@
"id": "u:99015dfd4264",
"mode": "inline",
"labelClassName": "text-dark m-b text-lg"
+ ,"value" :`${kc.playCoin}`
},
{
"type": "input-text",
@@ -369,7 +391,8 @@
"name": "kuachengCash",
"id": "u:31888fb92add",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value" :`${kc.cash}`
},
{
"type": "input-text",
@@ -377,7 +400,8 @@
"name": "kuachengInt",
"id": "u:c42ab4593d20",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${kc.integral}`
}
],
"actions": [
@@ -400,6 +424,15 @@
},
"body": [
{
+ "type": "hidden",
+ "label": "",
+ "name": "shequIId",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${sq.id}`
+ },
+ {
"type": "input-image",
"label": "背景图：",
"name": "shequImage",
@@ -417,7 +450,8 @@
"accept": ".jpeg, .jpg, .png, .gif",
"multiple": false,
"hideUploadButton": false,
- "fixedSize": false
+ "fixedSize": false,
+ "value":`${sq.img}`
},
{
"type": "hidden",
@@ -453,7 +487,8 @@
"name": "shequCoin",
"id": "u:99015dfd4264",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${sq.playCoin}`
},
{
"type": "input-text",
@@ -461,7 +496,8 @@
"name": "shequCash",
"id": "u:31888fb92add",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${sq.cash}`
},
{
"type": "input-text",
@@ -469,7 +505,8 @@
"name": "shequInt",
"id": "u:c42ab4593d20",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${sq.integral}`
}
],
"actions": [
@@ -491,6 +528,15 @@
},
"body": [
{
+ "type": "hidden",
+ "label": "",
+ "name": "smId",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${sm.id}`
+ },
+ {
"type": "input-image",
"label": "背景图：",
"name": "shemenImage",
@@ -508,7 +554,8 @@
"accept": ".jpeg, .jpg, .png, .gif",
"multiple": false,
"hideUploadButton": false,
- "fixedSize": false
+ "fixedSize": false,
+ "value":`${sm.img}`
},
{
"type": "hidden",
@@ -544,7 +591,8 @@
"name": "shemenCoin",
"id": "u:99015dfd4264",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${sm.playCoin}`
},
{
"type": "input-text",
@@ -552,7 +600,8 @@
"name": "shemenCash",
"id": "u:31888fb92add",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${sm.cash}`
},
{
"type": "input-text",
@@ -560,7 +609,8 @@
"name": "shemenInt",
"id": "u:c42ab4593d20",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${sm.integral}`
}
],
"actions": [
@@ -580,6 +630,15 @@
"columns": [
{
"body": [
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "sdId",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${sd.id}`
+ },
{
"type": "card",
"header": {
@@ -605,7 +664,8 @@
"accept": ".jpeg, .jpg, .png, .gif",
"multiple": false,
"hideUploadButton": false,
- "fixedSize": false
+ "fixedSize": false,
+ "value":`${sd.img}`
},
{
"type": "hidden",
@@ -641,7 +701,8 @@
"name": "suduCoin",
"id": "u:b6faed384d78",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${sm.playCoin}`
},
{
"type": "input-text",
@@ -649,7 +710,8 @@
"name": "suduCash",
"id": "u:c7181c9b3ded",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${sm.cash}`
},
{
"type": "input-text",
@@ -657,7 +719,8 @@
"name": "suduInt",
"id": "u:ee897e373acb",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${sm.integral}`
}
],
"actions": [
@@ -672,6 +735,15 @@
},
{
"body": [
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "fkId",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${fk.id}`
+ },
{
"type": "card",
"header": {
@@ -697,7 +769,8 @@
"accept": ".jpeg, .jpg, .png, .gif",
"multiple": false,
"hideUploadButton": false,
- "fixedSize": false
+ "fixedSize": false,
+ "value":`${fk.img}`
},
{
"type": "hidden",
@@ -733,7 +806,8 @@
"name": "fangkuaiCoin",
"id": "u:99015dfd4264",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${fk.playCoin}`
},
{
"type": "input-text",
@@ -741,7 +815,8 @@
"name": "fangkuaiCash",
"id": "u:31888fb92add",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${fk.cash}`
},
{
"type": "input-text",
@@ -749,7 +824,8 @@
"name": "fangkuaiInt",
"id": "u:c42ab4593d20",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value" :`${fk.integral}`
}
],
"actions": [
@@ -763,6 +839,15 @@
},
{
"body": [
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "jxIId",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${jx.id}`
+ },
{
"type": "card",
"header": {
@@ -788,7 +873,8 @@
"accept": ".jpeg, .jpg, .png, .gif",
"multiple": false,
"hideUploadButton": false,
- "fixedSize": false
+ "fixedSize": false,
+ "value":`${jx.img}`
},
{
"type": "hidden",
@@ -824,7 +910,8 @@
"name": "jxCoin",
"id": "u:99015dfd4264",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${jx.playCoin}`
},
{
"type": "input-text",
@@ -832,7 +919,8 @@
"name": "jxCash",
"id": "u:31888fb92add",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${jx.cash}`
},
{
"type": "input-text",
@@ -840,7 +928,8 @@
"name": "jxInt",
"id": "u:c42ab4593d20",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${jx.integral}`
}
],
"actions": [
@@ -860,6 +949,15 @@
"columns": [
{
"body": [
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "qwId",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${qw.id}`
+ },
{
"type": "card",
"header": {
@@ -885,7 +983,8 @@
"accept": ".jpeg, .jpg, .png, .gif",
"multiple": false,
"hideUploadButton": false,
- "fixedSize": false
+ "fixedSize": false,
+ "value":`${qw.img}`
},
{
"type": "hidden",
@@ -921,7 +1020,8 @@
"name": "sqCoin",
"id": "u:a58559426478",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${qw.playCoin}`
},
{
"type": "input-text",
@@ -929,7 +1029,8 @@
"name": "sqCash",
"id": "u:e563cc483458",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${qw.cash}`
},
{
"type": "input-text",
@@ -937,7 +1038,8 @@
"name": "sqInt",
"id": "u:688f4b7c3392",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${qw.integral}`
}
],
"actions": [
@@ -952,6 +1054,15 @@
},
{
"body": [
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "zsIId",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${zs.id}`
+ },
{
"type": "card",
"header": {
@@ -977,7 +1088,8 @@
"accept": ".jpeg, .jpg, .png, .gif",
"multiple": false,
"hideUploadButton": false,
- "fixedSize": false
+ "fixedSize": false,
+ "value":`${zs.img}`
},
{
"type": "hidden",
@@ -1013,7 +1125,8 @@
"name": "zsCoin",
"id": "u:af69b1a1d9cb",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${zs.playCoin}`
},
{
"type": "input-text",
@@ -1021,7 +1134,8 @@
"name": "zsCash",
"id": "u:8ba3c740b10c",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${zs.cash}`
},
{
"type": "input-text",
@@ -1029,7 +1143,8 @@
"name": "zsInt",
"id": "u:6d91bb154939",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${zs.integral}`
}
],
"actions": [
@@ -1043,6 +1158,8 @@
},
{
"body": [
+
+
{
"type": "card",
"header": {
@@ -1050,6 +1167,16 @@
"subTitle": ""
},
"body": [
+
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "zs2IId",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${zs2.id}`
+ },
{
"type": "input-image",
"label": "背景图：",
@@ -1068,7 +1195,8 @@
"accept": ".jpeg, .jpg, .png, .gif",
"multiple": false,
"hideUploadButton": false,
- "fixedSize": false
+ "fixedSize": false,
+ "value":`${zs2.img}`
},
{
"type": "hidden",
@@ -1104,7 +1232,8 @@
"name": "zs2Coin",
"id": "u:b29c25f053d9",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${zs2.playCoin}`
},
{
"type": "input-text",
@@ -1112,7 +1241,8 @@
"name": "zs2Cash",
"id": "u:88a44c71abb0",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${zs2.cash}`
},
{
"type": "input-text",
@@ -1120,7 +1250,8 @@
"name": "zs2Int",
"id": "u:fb82b3cf486c",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${zs2.integral}`
}
],
"actions": [
@@ -1140,6 +1271,15 @@
"columns": [
{
"body": [
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "lyIId",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${ly.id}`
+ },
{
"type": "card",
"header": {
@@ -1165,7 +1305,8 @@
"accept": ".jpeg, .jpg, .png, .gif",
"multiple": false,
"hideUploadButton": false,
- "fixedSize": false
+ "fixedSize": false,
+ "value":`${ly.img}`
},
{
"type": "hidden",
@@ -1174,7 +1315,7 @@
"id": "u:c4a543b6cda0",
"mode": "inline",
"labelClassName": "text-dark m-b",
- "value": "社区小球王"
+ "value": "绿茵密码"
},
{
"type": "hidden",
@@ -1201,7 +1342,8 @@
"name": "lyCoin",
"id": "u:d78d236c5f95",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${ly.playCoin}`
},
{
"type": "input-text",
@@ -1209,7 +1351,8 @@
"name": "lyCash",
"id": "u:20b24611e53c",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${ly.cash}`
},
{
"type": "input-text",
@@ -1217,7 +1360,8 @@
"name": "lyInt",
"id": "u:25e10253effb",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg"
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${ly.integral}`
}
],
"actions": [
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html
index 8dc7afb..d0cdc77 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html
@@ -69,15 +69,15 @@
<div class="col-sm-10">
<h2>营收数据</h2>
</br>
- <div id = "money1" style="width: 1500px" >
- <span id="totalIncome">总营收:</span>
- <span id="yearIncome">本年度营收:</span>
- <span id="monthIncome">本月度营收:</span>
- <span id="weekIncome">本周营收:</span>
- <span id="todayIncome">本日营收:</span>
- </br>
- </br>
- </div>
+ <div id = "money1" style="width: 1500px" >
+ <span id="totalIncome">总营收:</span>
+ <span id="yearIncome">本年度营收:</span>
+ <span id="monthIncome">本月度营收:</span>
+ <span id="weekIncome">本周营收:</span>
+ <span id="todayIncome">本日营收:</span>
+ </br>
+ </br>
+ </div>
<div id="main" style="width: 1280px;height:500px;"></div>
</div>
<div class="col-sm-10">
@@ -258,132 +258,6 @@
<script src="${ctxPath}/modular/system/dataStatistics/echarts.min.js"></script>
<script src="${ctxPath}/static/js/plugins/switchery/switchery.js"></script>
<script>
- function search1(){
- var time = $("#beginTime").val()
- var ajax = new $ax(Feng.ctxPath + "/data/type1", function (data) {
-
- $("#fee1").text(data.fee1)
- $("#fee2").text(data.fee2)
- $("#fee3").text(data.fee3)
- $("#fee4").text(data.fee4)
- $("#fee5").text(data.fee5)
- $("#fee7").text(data.fee7)
- $("#day").val(data.dayone)
- $("#month").val(data.monthone)
- $("#quarter").val(data.quarterone)
- $("#year").val(data.yearone)
-
-
-
-
-
- var chartDom = document.getElementById('cookieTicket');
- var myChart = echarts.init(chartDom);
- var option;
- option = {
- title: {
- text: '门票收入',
- subtext: '',
- left: 'center'
- },
- tooltip: {
- trigger: 'item'
- },
-
- series: [
- {
- name: 'Access From',
- type: 'pie',
- radius: '50%',
- data: [
- { value: data.dayone, name: '日卡' },
- { value: data.monthone, name: '月卡' },
- { value: data.quarterone, name: '季卡' },
- { value: data.yearone, name: '年卡' },
-
- ],
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ]
- };
- myChart.setOption(option);
-
- var chartDom = document.getElementById('cookieCourse');
- var myChart = echarts.init(chartDom);
- var option;
- option = {
- title: {
- text: '课程收入',
- subtext: '',
- left: 'center'
- },
- tooltip: {
- trigger: 'item'
- },
-
- series: [
- {
- name: 'Access From',
- type: 'pie',
- radius: '50%',
- data: data.courseData,
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ]
- };
- myChart.setOption(option);
-
-
- var chartDom = document.getElementById('cookieBooking');
- var myChart = echarts.init(chartDom);
- var option;
- option = {
- title: {
- text: '订场收入',
- subtext: '',
- left: 'center'
- },
- tooltip: {
- trigger: 'item'
- },
-
- series: [
- {
- name: 'Access From',
- type: 'pie',
- radius: '50%',
- data: data.siteData,
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ]
- };
- myChart.setOption(option);
-
-
- }, function (data) {
-
- });
- ajax.set("time",time);
- ajax.start();
- }
var ans = [];
var weekX = ["1周","2周","3周","4周"];
var monthX = ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"];
@@ -450,10 +324,10 @@
var year = resp.yearIncome;
var month = resp.monthIncome;
var week = resp.weekIncome;
+ console.log("周度营收")
+ console.log(year)
+ console.log(week)
var days = week[0].length;
- for (let i = 1; i <= days; i++) {
- weekX.push(i);
- }
var day = resp.dayIncome;
option = {
tooltip: {
@@ -510,11 +384,6 @@
stack: 'Total',
data: [
week[0][0], week[0][1], week[0][2], week[0][3], week[0][4]
- , week[0][5], week[0][6], week[0][7], week[0][8], week[0][9]
- , week[0][10], week[0][11], week[0][12], week[0][13], week[0][14]
- , week[0][15], week[0][16], week[0][17], week[0][18], week[0][19], week[0][20]
- , week[0][21], week[0][22], week[0][23], week[0][24], week[0][25], week[0][26]
- , week[0][27], week[0][28], week[0][29], week[0][30], week[0][31]
]
},
{
@@ -1501,7 +1370,7 @@
}
]
};
- myChart.setOption(option);
+ myChart.setOption(option);
});
$(function(){
var courseData = "${data.courseData}"
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
index ff9fa6c..08782b2 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
@@ -57,7 +57,7 @@
- gameService.save(game);
+ gameService.saveOrUpdate(game);
System.out.println("==========="+game);
return game.getId();
}
@@ -69,7 +69,7 @@
@PostMapping("/saveConfig")
public void saveConfig(@RequestBody List<TGameConfig> gameConfigList){
System.out.println("=======gameConfigList===="+gameConfigList);
- config.saveBatch(gameConfigList);
+ config.saveOrUpdateBatch(gameConfigList);
// return game.getId();
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index 5082c8b..52181c6 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -520,6 +520,15 @@
@ResponseBody
+ @PostMapping("/base/site/queryByCode")
+ public Integer queryByCode(@RequestBody String code){
+
+ return siteBookingService.queryByCode(code);
+ }
+
+
+
+ @ResponseBody
@PostMapping("/base/site/getNewAddSiteList")
public List<SiteVo> getAppUserSiteList(){
List<SiteVo> siteVos = new ArrayList<>();
diff --git a/cloud-server-other/src/main/java/com/dsh/other/mapper/SiteBookingMapper.java b/cloud-server-other/src/main/java/com/dsh/other/mapper/SiteBookingMapper.java
index b74ed6b..f5244ef 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/mapper/SiteBookingMapper.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/mapper/SiteBookingMapper.java
@@ -18,4 +18,5 @@
List<SiteBooking> listAll(@Param("query")SiteBookingQuery query, @Param("sTime")String sTime, @Param("eTime")String eTime, @Param("amount") BigDecimal amount);
+ Integer queryByCode(String code);
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/ISiteBookingService.java b/cloud-server-other/src/main/java/com/dsh/other/service/ISiteBookingService.java
index bc986b6..076bb9d 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/ISiteBookingService.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/ISiteBookingService.java
@@ -15,4 +15,6 @@
List<BillingRequestOfType> queryDatas(Integer appUserId, String monthStart, String monthEnd);
List<SiteBooking> listAll(SiteBookingQuery query);
+
+ Integer queryByCode(String code);
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteBookingServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteBookingServiceImpl.java
index 5741812..9321554 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteBookingServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteBookingServiceImpl.java
@@ -37,4 +37,9 @@
return siteBookingMapper.listAll(query,STime,ETime,query.getAmount());
}
+
+ @Override
+ public Integer queryByCode(String code) {
+ return this.baseMapper.queryByCode(code);
+ }
}
diff --git a/cloud-server-other/src/main/resources/mapper/SiteBookingMapper.xml b/cloud-server-other/src/main/resources/mapper/SiteBookingMapper.xml
index c6db7fa..f4f5300 100644
--- a/cloud-server-other/src/main/resources/mapper/SiteBookingMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/SiteBookingMapper.xml
@@ -34,4 +34,13 @@
</if>
</where>
</select>
+ <select id="queryByCode" resultType="java.lang.Integer">
+ SELECT storeId
+ from t_site_booking
+ WHERE orderNo = #{code}
+
+
+
+
+ </select>
</mapper>
--
Gitblit v1.7.1