feat:租赁合同新增审批记录
* cc_20250512_uploadRentContract: (100 commits squashed)
- fix:计划闭店时间修改
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- feat:新签调整
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
- fix:闭店信息新增初审、复审、终审时间字段;闭店管理列表新增返回字段
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- feat:招商
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
- feat:招商
- feat:招商
- feat:招商
- fix:删除字段
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- feat:招商
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak
- feat:数据同步 名称新增MX 等前缀
- feat:上海魔盒未来食品有限公司
- fix:修改查询逻辑
- Merge branch 'cc_20260428_store_report' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- feat:id
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak
- Merge branch 'cc_20260507_smz' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
- Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak
- feat:翻新
- feat:用户列表为空
- Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak
- feat:用户列表为空
- Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak
- feat:RenewalRenovateApprovalVO
- Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak
- feat:招商副总裁
- Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
- feat:招商副总裁审核
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- feat:费用单调整
- feat:招商经理
- feat:招商经理
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- feat:费用调整
- Merge branch 'master' into cc_20260226_fix
- fix:bug修复
- fix:未开业门店试营业日期
- Merge branch 'cc_20260508_open_store_req' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- feat:新增审批
- fix:开业日期报备不同步门店状态
- Merge branch 'cc_20260508_open_store_req' into cc_20250514_common_bak
- fix:字段名称修改
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- fix:闭店中止新增审批记录
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- feat:费用调整单
- feat:招商大区总审核 或者 分部内勤审核 其他状态不能审核
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- feat:调整单
- feat:SHOP_SUB_STAGE_STATUS_150_5
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- fix:试营业测试接口
- Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak
- Merge branch 'master' into cc_20250514_common_bak
- feat:page
- feat:自动分账
- Merge branch 'master' into cc_20250514_common_bak
- fix:私域二维码门店绑定关系缓存改为7天
- Merge branch 'cc_20260226_fix' into cc_20250514_common_bak
- feat:getAuthRegionIdAndSubRegionIdExcludeStoreByUserId 优化开店管理查询
- Merge branch 'cc_20260509_fix' into cc_20250514_common_bak
- fix:修改门店开业日期判断条件修改
- Merge branch 'cc_20260508_open_store_req' into cc_20250514_common_bak
- feat:填写添加门店
- feat:建店代办处理
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- Merge branch 'cc_20260508_adjustment' into cc_20250514_common_bak
- feat:userAuthMappingService
- feat:addShopDecorationLog
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- feat:待采购确认 审批流程
- feat:问题修复
- Merge branch 'cc_20260511_fix' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- feat:问题修复
- feat:问题修复
- feat:流水查询条件
- Merge branch 'master' into cc_20260508_adjustment
- feat:费用流水筛选条件
- fix:歇业管理逻辑修改
- Merge branch 'cc_20260508_adjustment' into cc_20250514_common_bak
- feat:getAdjustAmount
- Merge branch 'cc_20260511_close_up_modify' into cc_20260408_close_up
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/closeup/CloseUpPlatformEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/closeup/CloseUpPlatformDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/closeup/CloseUpPlatformMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpApplyFormMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpApplyFormDO.java
#	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpPlatformDO.java
#	coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/CloseUpService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
#	coolstore-partner-web/src/main/resources/application-ab.properties
#	coolstore-partner-web/src/main/resources/application-local.properties
#	coolstore-partner-web/src/main/resources/application-online.properties
#	coolstore-partner-web/src/main/resources/application-test.properties
- fix:合并冲突
- Merge branch 'cc_20260408_close_up' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- fix:合并冲突
- Merge branch 'cc_20260508_adjustment' into cc_20250514_common_bak
- Merge branch 'master' into cc_20260408_close_up
- fix:火码歇业时机修改
- Merge branch 'cc_20260408_close_up' into cc_20250514_common_bak
- feat:租赁合同新增审批记录
- Merge branch 'master' into cc_20250512_uploadRentContract
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
- feat:merge冲突
- feat:merge冲突
Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/128
283 lines
11 KiB
XML
283 lines
11 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
<groupId>com.coolstore</groupId>
|
|
<artifactId>coolstore-partner-manage</artifactId>
|
|
<packaging>pom</packaging>
|
|
<version>1.0.0</version>
|
|
<modules>
|
|
<module>coolstore-partner-web</module>
|
|
<module>coolstore-partner-common</module>
|
|
<module>coolstore-partner-dao</module>
|
|
<module>coolstore-partner-model</module>
|
|
<module>coolstore-partner-service</module>
|
|
</modules>
|
|
|
|
<parent>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<artifactId>spring-boot-starter-parent</artifactId>
|
|
<version>2.2.6.RELEASE</version>
|
|
</parent>
|
|
|
|
<properties>
|
|
<maven.compiler.source>8</maven.compiler.source>
|
|
<maven.compiler.target>8</maven.compiler.target>
|
|
<spring-cloud.version>Hoxton.SR4</spring-cloud.version>
|
|
<spring-cloud-alibaba.version>2.2.0.RELEASE</spring-cloud-alibaba.version>
|
|
</properties>
|
|
|
|
<dependencyManagement>
|
|
<dependencies>
|
|
|
|
<dependency>
|
|
<groupId>com.coolstore</groupId>
|
|
<artifactId>coolstore-partner-common</artifactId>
|
|
<version>1.0.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.coolstore</groupId>
|
|
<artifactId>coolstore-zxjp-web</artifactId>
|
|
<version>1.0.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.coolstore</groupId>
|
|
<artifactId>coolstore-partner-service</artifactId>
|
|
<version>1.0.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.coolstore</groupId>
|
|
<artifactId>coolstore-partner-model</artifactId>
|
|
<version>1.0.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.coolstore</groupId>
|
|
<artifactId>coolstore-partner-dao</artifactId>
|
|
<version>1.0.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<artifactId>spring-boot-starter-jdbc</artifactId>
|
|
<version>3.0.2</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.github.pagehelper</groupId>
|
|
<artifactId>pagehelper-spring-boot-starter</artifactId>
|
|
<version>1.4.6</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<artifactId>spring-boot-starter-test</artifactId>
|
|
<version>2.4.5</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.commons</groupId>
|
|
<artifactId>commons-lang3</artifactId>
|
|
<version>3.12.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>mysql</groupId>
|
|
<artifactId>mysql-connector-java</artifactId>
|
|
<version>8.0.18</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.projectlombok</groupId>
|
|
<artifactId>lombok</artifactId>
|
|
<version>1.18.6</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.alibaba</groupId>
|
|
<artifactId>fastjson</artifactId>
|
|
<version>1.2.60</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.commons</groupId>
|
|
<artifactId>commons-collections4</artifactId>
|
|
<version>4.1</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.commons</groupId>
|
|
<artifactId>commons-pool2</artifactId>
|
|
<version>2.8.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>redis.clients</groupId>
|
|
<artifactId>jedis</artifactId>
|
|
<version>2.8.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.github.xiaoymin</groupId>
|
|
<artifactId>knife4j-spring-boot-starter</artifactId>
|
|
<version>2.0.4</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.slf4j</groupId>
|
|
<artifactId>slf4j-api</artifactId>
|
|
<version>1.7.30</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>xerces</groupId>
|
|
<artifactId>xercesImpl</artifactId>
|
|
<version>2.11.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.shiro</groupId>
|
|
<artifactId>shiro-core</artifactId>
|
|
<version>1.2.3</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.aliyun.openservices</groupId>
|
|
<artifactId>ons-client</artifactId>
|
|
<version>1.8.8.3.Final</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>cn.hutool</groupId>
|
|
<artifactId>hutool-all</artifactId>
|
|
<version>5.8.16</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.aliyun</groupId>
|
|
<artifactId>tea-openapi</artifactId>
|
|
<version>0.0.19</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.aliyun</groupId>
|
|
<artifactId>ons20190214</artifactId>
|
|
<version>1.0.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.google.guava</groupId>
|
|
<artifactId>guava</artifactId>
|
|
<version>20.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.aliyun</groupId>
|
|
<artifactId>ons20190214</artifactId>
|
|
<version>1.0.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.aliyun</groupId>
|
|
<artifactId>tea-openapi</artifactId>
|
|
<version>0.0.19</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.aliyun.oss</groupId>
|
|
<artifactId>aliyun-sdk-oss</artifactId>
|
|
<version>3.13.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<artifactId>spring-boot-starter-data-redis</artifactId>
|
|
<version>3.0.4</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.xuxueli</groupId>
|
|
<artifactId>xxl-job-core</artifactId>
|
|
<version>2.3.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.aliyun</groupId>
|
|
<artifactId>dytnsapi20200217</artifactId>
|
|
<version>1.0.28</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.aliyun</groupId>
|
|
<artifactId>ocr20191230</artifactId>
|
|
<version>1.0.26</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.aspectj</groupId>
|
|
<artifactId>aspectjrt</artifactId>
|
|
<version>1.9.5</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.aspectj</groupId>
|
|
<artifactId>aspectjweaver</artifactId>
|
|
<version>1.9.5</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.cloud</groupId>
|
|
<artifactId>spring-cloud-dependencies</artifactId>
|
|
<version>${spring-cloud.version}</version>
|
|
<type>pom</type>
|
|
<scope>import</scope>
|
|
</dependency>
|
|
<!-- excel工具 -->
|
|
<dependency>
|
|
<groupId>com.alibaba</groupId>
|
|
<artifactId>easyexcel</artifactId>
|
|
<version>2.2.6</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.poi</groupId>
|
|
<artifactId>poi-ooxml</artifactId>
|
|
<version>3.17</version>
|
|
</dependency>
|
|
<!-- ELK接入 -->
|
|
<dependency>
|
|
<groupId>com.github.danielwegener</groupId>
|
|
<artifactId>logback-kafka-appender</artifactId>
|
|
<version>0.2.0-RC2</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>com.github.wechatpay-apiv3</groupId>
|
|
<artifactId>wechatpay-java</artifactId>
|
|
<version>0.2.11</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.aliyun</groupId>
|
|
<artifactId>alibabacloud-dysmsapi20170525</artifactId>
|
|
<version>2.0.24</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.bouncycastle</groupId>
|
|
<artifactId>bcprov-jdk15on</artifactId>
|
|
<version>1.70</version>
|
|
</dependency>
|
|
<!-- XML处理 -->
|
|
<!-- 二维码生成 -->
|
|
<dependency>
|
|
<groupId>com.google.zxing</groupId>
|
|
<artifactId>core</artifactId>
|
|
<version>3.4.1</version>
|
|
</dependency>
|
|
</dependencies>
|
|
</dependencyManagement>
|
|
|
|
|
|
<build>
|
|
<pluginManagement>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.jacoco</groupId>
|
|
<artifactId>jacoco-maven-plugin</artifactId>
|
|
<version>0.8.2</version>
|
|
<executions>
|
|
<execution>
|
|
<id>prepare-agent</id>
|
|
<goals>
|
|
<goal>prepare-agent</goal>
|
|
</goals>
|
|
</execution>
|
|
<execution>
|
|
<id>prepare-agent-integration</id>
|
|
<goals>
|
|
<goal>prepare-agent-integration</goal>
|
|
</goals>
|
|
</execution>
|
|
<execution>
|
|
<id>jacoco-site</id>
|
|
<goals>
|
|
<goal>report</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
</plugins>
|
|
</pluginManagement>
|
|
</build>
|
|
|
|
</project> |