jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.3.2

Browse Source
This commit is contained in:
HZW
2021-02-06 17:45:04 +08:00
committed by ָ·ìdeÑô¹â
parent 247655dbdb
commit d7a4a2f9ae
165 changed files with 6754 additions and 2034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crmeb/src/main/resources/application-beta.yml
View File

@@ -2,7 +2,7 @@
server:
port: 20001
domain: #配合swagger使用 # 待部署域名
version: v1.3.1 # 当前代码版本
version: v1.3.2 # 当前代码版本
wechat-api-url:
asyncConfig: false
asyncWeChatProgramTempList: false
@@ -15,14 +15,14 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: crmeb_java_beta
password: yourPwd
url:
username:
password:
redis:
host: 127.0.0.1 #地址
host: #地址
port: 6379 #端口
password: youPwd
timeout: 30000 # 连接超时时间（毫秒）
password:
timeout: 1000 # 连接超时时间（毫秒）
database: 0 #默认数据库
jedis:
pool:

16
crmeb/src/main/resources/application-dev.yml
View File

@@ -2,7 +2,7 @@
server:
port: 20002
domain: #配合swagger使用 # 待部署域名
version: v1.3.1 # 当前代码版本
version: v1.3.2 # 当前代码版本
wechat-api-url:
asyncConfig: false
asyncWeChatProgramTempList: false
@@ -15,15 +15,15 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: crmeb_java_beta
password: yourPwd
url:
username:
password:
redis:
host: 127.0.0.1 #地址
host: #地址
port: 6379 #端口
password: youPwd
timeout: 30000 # 连接超时时间（毫秒）
database: 0 #默认数据库
password:
timeout: 1000 # 连接超时时间（毫秒）
database: 10 #默认数据库
jedis:
pool:
max-active: 200 # 连接池最大连接数（使用负值表示没有限制）

16
crmeb/src/main/resources/application-prod.yml
View File

@@ -1,8 +1,8 @@
# 配置端口
server:
port: 20000
domain: #配合swagger使用 # 待部署域名
version: v1.3.1 # 当前代码版本
domain: api.java.crmeb.net #配合swagger使用 # 待部署域名
version: v1.3.2 # 当前代码版本
wechat-api-url:
wechat-js-api-debug: false
wechat-js-api-beta: false
@@ -17,15 +17,15 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: crmeb_java_beta
password: yourPwd
url:
username:
password:
redis:
host: 127.0.0.1 #地址
port: 6379 #端口
password: youPwd
timeout: 30000 # 连接超时时间（毫秒）
database: 0 #默认数据库
password:
timeout: 1000 # 连接超时时间（毫秒）
database: 9 #默认数据库
jedis:
pool:
max-active: 200 # 连接池最大连接数（使用负值表示没有限制）

14
crmeb/src/main/resources/application.yml
View File

@@ -2,8 +2,8 @@
server:
port: 8080
domain: #配合swagger使用 # 待部署域名
version: v1.3.1 # 当前代码版本
wechat-api-url: #请求微信接口中转服务器
version: v1.3.2 # 当前代码版本
wechat-api-url: #请求微信接口中专服务器
wechat-js-api-debug: false #微信js api系列是否开启调试模式
wechat-js-api-beta: true #微信js api是否是beta版本
asyncConfig: false #是否同步config表数据到redis
@@ -31,13 +31,13 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: crmeb_java_beta
password: yourPwd
url: jdbc:mysql://127.0.0.1:3306/crmeb_java?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: root
password: root
redis:
host: 127.0.0.1 #地址
host: #地址
port: 6379 #端口
password: youPwd
password:
timeout: 30000 # 连接超时时间（毫秒）
database: 0 #默认数据库
jedis:

2
crmeb/src/main/resources/logback-spring.xml
View File

@@ -223,7 +223,7 @@
<!--</appender>-->
<!-- 日志输出级别 -->
<root level="INFO">
<!-- <appender-ref ref="STDOUT"/>-->
<appender-ref ref="STDOUT"/>
<!-- <appender-ref ref="DEBUG_FILE" />-->
<!-- <appender-ref ref="INFO_FILE" />-->
<!-- <appender-ref ref="WARN_FILE" />-->

4
crmeb/src/main/resources/mapper/finance/UserFundsMonitorMapper.xml
View File

@@ -3,9 +3,9 @@
<mapper namespace="com.zbkj.crmeb.finance.dao.UserFundsMonitorDao">
<select id="getFundsMonitor" resultType="com.zbkj.crmeb.finance.model.UserFundsMonitor" parameterType="map">
SELECT u.uid, u.nickname, u.now_money, u.brokerage_price AS brokerage,u.create_time,u.spread_uid,
IF(( Sum(b.number) ) IS NULL, 0.00, Sum(b.number)) AS total_brokerage,
IF(( Sum(b.price) ) IS NULL, 0.00, Sum(b.price)) AS total_brokerage,
IF(( Sum(e.extract_price) ) IS NULL, 0.00, Sum(e.extract_price)) AS total_extract FROM eb_user AS u
LEFT JOIN eb_user_bill AS b ON u.uid = b.uid AND b.pm = 1 AND b.`type` = 'brokerage'
LEFT JOIN eb_user_brokerage_record AS b ON u.uid = b.uid AND b.link_type = 'order' AND b.`type` = 1 AND b.`status` = 3
LEFT JOIN eb_user_extract AS e ON u.`uid` = e.uid AND e.STATUS = 1
where 1 = 1
<if test="keywords != '' and keywords != null ">

14
crmeb/src/main/resources/mapper/user/UserBillMapper.xml
View File

@@ -48,4 +48,18 @@
ORDER BY ub.id DESC,ub.create_time DESC
</select>
<select id="fundMonitoring" resultType="com.zbkj.crmeb.user.response.UserBillResponse" parameterType="map">
SELECT ub.id,ub.link_id AS linkId,ub.pm,ub.title,ub.category,ub.type,ub.number,ub.balance,ub.mark,ub.status,ub.create_time AS createTime,ub.update_time AS updateTime,u.nickname,ub.uid FROM eb_user_bill ub
LEFT JOIN eb_user u ON ub.uid = u.uid
where ub.category = 'now_money'
<if test="keywords != '' and keywords != null ">
and ( ub.uid like #{keywords} or u.nickname like #{keywords, jdbcType=VARCHAR})
</if>
<if test="startTime != '' and endTime != '' and startTime != null and endTime != null">
and (ub.create_time between #{startTime} and #{endTime})
</if>
ORDER BY ub.id DESC,ub.create_time DESC
</select>
</mapper>

5
crmeb/src/main/resources/mapper/user/UserBrokerageRecordMapper.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zbkj.crmeb.record.dao.UserBrokerageRecordDao">
</mapper>