From f5c9ee78f74eca2241c3f0b7705c24359bf7d6bf Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期二, 10 十月 2023 18:09:24 +0800 Subject: [PATCH] 10.11 --- cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java | 3 cloud-server-other/src/main/java/com/dsh/other/entity/OperatorUser.java | 36 ++++++ .idea/workspace.xml | 113 ++++-------------- cloud-server-other/src/main/java/com/dsh/other/service/IOperatorUserService.java | 17 ++ cloud-server-account/pom.xml | 13 ++ cloud-server-other/src/main/java/com/dsh/other/entity/Store.java | 4 cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 25 +++- cloud-server-account/src/main/java/com/dsh/account/entity/OperatorUser.java | 36 ++++++ cloud-server-other/src/main/java/com/dsh/other/service/impl/TOperatorUserServiceImpl.java | 29 ++++ cloud-server-other/src/main/java/com/dsh/other/mapper/TOperatorUserMapper.java | 27 ++++ 10 files changed, 208 insertions(+), 95 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2808ca5..2c58527 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -26,58 +26,13 @@ </component> <component name="ChangeListManager"> <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.8"> - <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-account/src/main/java/com/dsh/account/controller/FinanceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.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/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/pom.xml" 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/mapper/RechargeRecordsMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/mapper/RechargeRecordsMapper.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/model/IncomeQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/model/IncomeQuery.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.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-account/src/main/resources/mapper/RechargeRecordsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml" 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/model/CompetitionQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionQuery.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/CourseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java" 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/controller/CoursePackagePaymentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/entity/TAppUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/entity/TAppUser.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/model/RegisterOrderQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/model/RegisterOrderQuery.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/course/feignClient/account/FinanceClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/FinanceClient.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionQuery.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java" 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/model/IncomeQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IncomeQuery.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RegisterOrderQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RegisterOrderQuery.java" 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/dataStatistics/platformIncome.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html" 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/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" /> + <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java" afterDir="false" /> </list> - <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> @@ -126,23 +81,23 @@ <option name="hideEmptyMiddlePackages" value="true" /> <option name="showLibraryContents" value="true" /> </component> - <component name="PropertiesComponent"> - <property name="RequestMappingsPanelOrder0" value="0" /> - <property name="RequestMappingsPanelOrder1" value="1" /> - <property name="RequestMappingsPanelWidth0" value="75" /> - <property name="RequestMappingsPanelWidth1" value="75" /> - <property name="WebServerToolWindowFactoryState" value="false" /> - <property name="aspect.path.notification.shown" value="true" /> - <property name="nodejs_package_manager_path" value="npm" /> - <property name="project.structure.last.edited" value="Project" /> - <property name="project.structure.proportion" value="0.0" /> - <property name="project.structure.side.proportion" value="0.2" /> - <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Confirmation" /> - </component> + <component name="PropertiesComponent"><![CDATA[{ + "keyToString": { + "git-widget-placeholder": "master", + "node.js.selected.package.tslint": "(autodetect)" + } +}]]></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" /> + </key> <key name="MoveFile.RECENT_KEYS"> <recent name="D:\JavaTool\PlayPai1\cloud-server-management\src\main\webapp\static\modular\system\tStudent" /> <recent name="D:\JavaTool\PlayPai1\cloud-server-parent" /> @@ -158,29 +113,12 @@ <recent name="com.dsh.guns.modular.system.service" /> <recent name="com.dsh.other.mapper" /> </key> - <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" /> - </key> </component> <component name="RunDashboard"> <option name="configurationTypes"> <set> <option value="SpringBootApplicationConfigurationType" /> </set> - </option> - <option name="ruleStates"> - <list> - <RuleState> - <option name="name" value="ConfigurationTypeDashboardGroupingRule" /> - </RuleState> - <RuleState> - <option name="name" value="StatusDashboardGroupingRule" /> - </RuleState> - </list> </option> </component> <component name="RunManager" selected="Spring Boot.GatewayApplication"> @@ -223,8 +161,8 @@ </configuration> <configuration name="AccountApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> <module name="mb-cloud-account" /> - <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.AccountApplication" /> <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" /> + <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.AccountApplication" /> <method v="2"> <option name="Make" enabled="true" /> </method> @@ -239,8 +177,8 @@ </configuration> <configuration name="ActivityApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> <module name="mb-cloud-activity" /> - <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ActivityApplication" /> <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" /> + <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ActivityApplication" /> <method v="2"> <option name="Make" enabled="true" /> </method> @@ -254,16 +192,16 @@ </configuration> <configuration name="CompetitionApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> <module name="mb-cloud-competition" /> - <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CompetitionApplication" /> <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" /> + <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CompetitionApplication" /> <method v="2"> <option name="Make" enabled="true" /> </method> </configuration> <configuration name="CourseApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> <module name="mb-cloud-course" /> - <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CourseApplication" /> <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" /> + <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CourseApplication" /> <method v="2"> <option name="Make" enabled="true" /> </method> @@ -276,10 +214,10 @@ </method> </configuration> <configuration name="ManagementApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> - <module name="mb-cloud-management" /> - <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ManagementApplication" /> <option name="ENABLE_JMX_AGENT" value="false" /> + <module name="mb-cloud-management" /> <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" /> + <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ManagementApplication" /> <method v="2"> <option name="Make" enabled="true" /> </method> @@ -298,7 +236,6 @@ </method> </configuration> <list> - <item itemvalue="Application.BigDecimalToChineseWords" /> <item itemvalue="JUnit.AccountApplicationTests.contextLoads" /> <item itemvalue="Spring Boot.ManagementApplication" /> <item itemvalue="Spring Boot.GatewayApplication" /> @@ -308,6 +245,7 @@ <item itemvalue="Spring Boot.AuthApplication" /> <item itemvalue="Spring Boot.CourseApplication" /> <item itemvalue="Spring Boot.CompetitionApplication" /> + <item itemvalue="应用程序.BigDecimalToChineseWords" /> </list> <recent_temporary> <list> @@ -336,7 +274,7 @@ </serviceView> </option> </component> - <component name="SpellCheckerSettings" BundledDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="应用程序级" UseSingleDictionary="true" /> + <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="false" /> <component name="SvnConfiguration"> <configuration>C:\Users\luo\AppData\Roaming\Subversion</configuration> </component> @@ -713,7 +651,6 @@ <servers /> </component> <component name="TypeScriptGeneratedFilesManager"> - <option name="version" value="1" /> <option name="exactExcludedFiles"> <list> <option value="$PROJECT_DIR$/cloud-server-management/node_modules/zrender/index.js" /> @@ -726,9 +663,7 @@ <map> <entry key="MAIN"> <value> - <State> - <option name="COLUMN_ORDER" /> - </State> + <State /> </value> </entry> </map> diff --git a/cloud-server-account/pom.xml b/cloud-server-account/pom.xml index 16fac21..c114885 100644 --- a/cloud-server-account/pom.xml +++ b/cloud-server-account/pom.xml @@ -15,6 +15,19 @@ <description>账户</description> <dependencies> <!--日志处理--> + + <dependency> + <groupId>com.github.binarywang</groupId> + <artifactId>wx-java-pay-spring-boot-starter</artifactId> + <version>4.4.0</version> + <exclusions> + <exclusion> + <artifactId>guava</artifactId> + <groupId>com.google.guava</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>cn.mb.cloud</groupId> <artifactId>mb-cloud-common-log</artifactId> diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/OperatorUser.java b/cloud-server-account/src/main/java/com/dsh/account/entity/OperatorUser.java new file mode 100644 index 0000000..f67651c --- /dev/null +++ b/cloud-server-account/src/main/java/com/dsh/account/entity/OperatorUser.java @@ -0,0 +1,36 @@ +package com.dsh.account.entity; + +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 lombok.Data; + +import java.math.BigDecimal; + +@TableName("t_operator_user") +@Data +public class OperatorUser { + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + @TableField(value = "userId") + private Integer userId; + @TableField(value = "alipay") + private String alipay; + @TableField(value = "alipayProportion") + private String alipayProportion; + @TableField(value = "alipayNum") + private String alipayNum; + @TableField(value = "wechat") + private String wechat; + @TableField(value = "wechatProportion") + private String wechatProportion; + @TableField(value = "wechatNum") + private String wechatNum; + @TableField(value = "alipayType") + private Integer alipayType; + @TableField(value = "wechatType") + private Integer wechatType; + @TableField(value = "operatorId") + private Integer operatorId; +} 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 11c4ef3..002a5a5 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 @@ -1,5 +1,6 @@ package com.dsh.account.feignclient.other; +import com.dsh.account.entity.OperatorUser; import com.dsh.account.feignclient.competition.model.BillingDataRequestVo; import com.dsh.account.feignclient.other.model.SiteBooking; import com.dsh.account.model.BillingRequestOfType; @@ -27,4 +28,6 @@ List<SiteVo> getAppUserSiteList(); @PostMapping("/base/site/queryByCode") Integer queryByCode(@RequestBody String code); + @PostMapping("/base/site/queryOperator") + OperatorUser queryOperator(@RequestBody List<Integer> stores); } 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 52181c6..380617c 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 @@ -5,9 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.dsh.other.entity.Site; -import com.dsh.other.entity.SiteBooking; -import com.dsh.other.entity.SiteType; +import com.dsh.other.entity.*; import com.dsh.other.feignclient.account.CityManagerClient; import com.dsh.other.feignclient.activity.UserCouponClient; import com.dsh.other.feignclient.activity.model.QueryUserCouponByIdAndUserId; @@ -19,9 +17,7 @@ import com.dsh.other.model.dto.siteDto.TSiteDTO; import com.dsh.other.model.vo.siteVo.ExpireSiteSearchVO; import com.dsh.other.model.vo.siteVo.SiteSearchVO; -import com.dsh.other.service.ISiteBookingService; -import com.dsh.other.service.ISiteService; -import com.dsh.other.service.ISiteTypeService; +import com.dsh.other.service.*; import com.dsh.other.util.PayMoneyUtil; import com.dsh.other.util.ResultUtil; import com.dsh.other.util.TokenUtil; @@ -527,6 +523,23 @@ } + @Autowired + private StoreService service; + + @Autowired + private IOperatorUserService operatorUserService; + + @ResponseBody + @PostMapping("/base/site/queryOperator") + public OperatorUser queryOperator(@RequestBody List<Integer> stores){ + + Store one = service.getOne(new QueryWrapper<Store>().in("id", stores)); + OperatorUser o = operatorUserService.getById(one.getOperatorId()); + + return o; + } + + @ResponseBody @PostMapping("/base/site/getNewAddSiteList") diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/OperatorUser.java b/cloud-server-other/src/main/java/com/dsh/other/entity/OperatorUser.java new file mode 100644 index 0000000..0bb145e --- /dev/null +++ b/cloud-server-other/src/main/java/com/dsh/other/entity/OperatorUser.java @@ -0,0 +1,36 @@ +package com.dsh.other.entity; + +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 lombok.Data; + +import java.math.BigDecimal; + +@TableName("t_operator_user") +@Data +public class OperatorUser { + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + @TableField(value = "userId") + private Integer userId; + @TableField(value = "alipay") + private String alipay; + @TableField(value = "alipayProportion") + private String alipayProportion; + @TableField(value = "alipayNum") + private String alipayNum; + @TableField(value = "wechat") + private String wechat; + @TableField(value = "wechatProportion") + private String wechatProportion; + @TableField(value = "wechatNum") + private String wechatNum; + @TableField(value = "alipayType") + private Integer alipayType; + @TableField(value = "wechatType") + private Integer wechatType; + @TableField(value = "operatorId") + private Integer operatorId; +} diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java index 6f60e0b..e3d3f7a 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java +++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java @@ -131,6 +131,10 @@ private Integer state; + @TableField("operatorId") + private Integer operatorId; + + @Override protected Serializable pkVal() { return this.id; diff --git a/cloud-server-other/src/main/java/com/dsh/other/mapper/TOperatorUserMapper.java b/cloud-server-other/src/main/java/com/dsh/other/mapper/TOperatorUserMapper.java new file mode 100644 index 0000000..c7536a1 --- /dev/null +++ b/cloud-server-other/src/main/java/com/dsh/other/mapper/TOperatorUserMapper.java @@ -0,0 +1,27 @@ +package com.dsh.other.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.dsh.other.entity.OperatorUser; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * 运营商商户 Mapper 接口 + * </p> + */ +public interface TOperatorUserMapper extends BaseMapper<OperatorUser> { + + List<Map<String, Object>> listAll(@Param("page")Page<Map<String, Object>> page, + @Param("province") String province, + @Param("city")String city, + @Param("userName")String userName, + @Param("phone") String phone, + @Param("platform")Integer platform, + @Param("type")Integer type, + @Param("state")Integer state); + +} diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/IOperatorUserService.java b/cloud-server-other/src/main/java/com/dsh/other/service/IOperatorUserService.java new file mode 100644 index 0000000..5d1e87a --- /dev/null +++ b/cloud-server-other/src/main/java/com/dsh/other/service/IOperatorUserService.java @@ -0,0 +1,17 @@ +package com.dsh.other.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.dsh.other.entity.OperatorUser; + + +import java.util.List; +import java.util.Map; + +/** + * 运营商商户 服务类 + */ +public interface IOperatorUserService extends IService<OperatorUser> { + + List<Map<String, Object>> listAll(Page<Map<String, Object>> page, String province, String city, String userName, String phone, Integer platform, Integer type, Integer state); +} diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/TOperatorUserServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/TOperatorUserServiceImpl.java new file mode 100644 index 0000000..a24ddee --- /dev/null +++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/TOperatorUserServiceImpl.java @@ -0,0 +1,29 @@ +package com.dsh.other.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import com.dsh.other.entity.OperatorUser; +import com.dsh.other.mapper.TOperatorUserMapper; +import com.dsh.other.service.IOperatorUserService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * <p> + * 学员信息 服务实现类 + * </p> + * + * @author stylefeng + * @since 2023-09-12 + */ +@Service +public class TOperatorUserServiceImpl extends ServiceImpl<TOperatorUserMapper, OperatorUser> implements IOperatorUserService { + + @Override + public List<Map<String, Object>> listAll(Page<Map<String, Object>> page, String province, String city, String userName, String phone, Integer platform, Integer type, Integer state) { + return this.baseMapper.listAll(page,province,city,userName,phone,platform,type,state); + } +} -- Gitblit v1.7.1