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

更新Note

Browse Source 
1. 修复购物车,订单和退单后后置任务正确执行
	2. 修复佣金记录金额和详情
	3. 修复管理端 移动应用界面下订单管理数据统计不准确的问题
	4. 修复短信API升级-后台使用一号通
	5. 修复用户管理相关问题
	6. 修复核销点核销后核销地址不准确
	7. 修复资源同步云服务的问题
新增功能
	1. 秒杀
		a. 秒杀时段配置
		b. 秒杀商品维护
	2. 财务管理
		a. 申请提现
		b. 财务记录
			i. 充值记录
			ii. 资金监控
		c. 佣金记录
	3. 普通商品显示该商品正在参加的活动信息[秒杀]
This commit is contained in:
stivepeim
2020-11-05 16:21:06 +08:00
parent 912cf6403e
commit 6827148d7a
574 changed files with 45105 additions and 4899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
crmeb/src/main/resources/application-beta.yml Normal file
View File

@@ -0,0 +1,32 @@
# 配置端口
server:
port: 20001
domain:
wechat-api-url:
asyncConfig: false
asyncWeChatProgramTempList: false
spring:
profiles:
# 配置的环境
active: beta
# 数据库配置
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_test?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: youMysqlAccount
password: youMysqlPwd
redis:
host: redisPath #地址
port: 6379 #端口
password: #密码
timeout: 30000 # 连接超时时间（毫秒）
database: 0 #默认数据库
jedis:
pool:
max-active: 200 # 连接池最大连接数（使用负值表示没有限制）
max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
max-idle: 10 # 连接池中的最大空闲连接
min-idle: 0 # 连接池中的最小空闲连接
time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1

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

@@ -1,12 +1,12 @@
# 配置端口
server:
port: 8080
domain:
wechat-api-url: http://121.196.17.222:20003/ #请求微信接口中专服务器
wechat-js-api-debug: false #微信js api系列是否开启调试模式
wechat-js-api-beta: false #微信js api是否是beta版本
asyncConfig: false #是否同步config表数据到redis
asyncWeChatProgramTempList: false #是否同步小程序公共模板库
port: 20000
domain: youDomain #配合swagger使用
wechat-api-url:
wechat-js-api-debug: false
wechat-js-api-beta: false
asyncConfig: true
asyncWeChatProgramTempList: true
spring:
profiles:
@@ -16,13 +16,13 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://数据库IP:3306/crmeb_java?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: 数据库名称
password: 数据库密码
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_test?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: youMysqlAccount
password: youMysqlPwd
redis:
host: redis地址 #地址
host: redisPath #地址
port: 6379 #端口
password: redis密码
password: #密码
timeout: 30000 # 连接超时时间（毫秒）
database: 0 #默认数据库
jedis:
@@ -55,4 +55,4 @@ swagger:
enable: true #是否开启界面
check: true #是否打开验证
username: crmeb #访问swagger的账号
password: crmeb.com #访问swagger的密码
password: ZeypRDYBfM #访问swagger的密码

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

@@ -30,13 +30,13 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://数据库IP:3306/crmeb_java?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: 数据库名称
password: 数据库密码
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_test?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: youMysqlAccount
password: youMysqlPwd
redis:
host: redis地址 #地址
host: redisPath #地址
port: 6379 #端口
password: redis密码
password: #密码
timeout: 30000 # 连接超时时间（毫秒）
database: 0 #默认数据库
jedis:
@@ -60,7 +60,7 @@ logging:
# mybatis 配置
mybatis-plus:
mapper-locations: classpath*:mapper/*/*Mapper.xml #xml扫描，多个目录用逗号或者分号分隔（告诉 Mapper 所对应的 XML 文件位置）
# 配置slq打印日志
# 配置sql打印日志
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
global-config:

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

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

10
crmeb/src/main/resources/mapper/article/ArticleMapper.xml
View File

@@ -1,5 +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.article.dao.ArticleDao">
</mapper>
<?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.article.dao.ArticleDao">
</mapper>

10
crmeb/src/main/resources/mapper/category/CategoryMapper.xml
View File

@@ -1,5 +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.category.dao.CategoryDao">
</mapper>
<?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.category.dao.CategoryDao">
</mapper>

10
crmeb/src/main/resources/mapper/express/ExpressMapper.xml
View File

@@ -1,5 +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.express.dao.ExpressDao">
</mapper>
<?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.express.dao.ExpressDao">
</mapper>

10
crmeb/src/main/resources/mapper/express/ShippingTemplatesMapper.xml
View File

@@ -1,5 +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.express.dao.ShippingTemplatesDao">
</mapper>
<?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.express.dao.ShippingTemplatesDao">
</mapper>

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

@@ -2,20 +2,20 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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,
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(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_extract AS e ON u.`uid` = e.uid AND e.STATUS = 1
where 1 = 1
<if test="keywords != '' and keywords != null ">
and ( u.uid like #{keywords, jdbcType=VARCHAR} or u.nickname like #{keywords, jdbcType=VARCHAR})
and ( u.uid like #{keywords} or u.nickname like #{keywords, jdbcType=VARCHAR})
</if>
<if test="max != null and max > 0">
and #{max, jdbcType=DECIMAL} >= now_money
and #{max, jdbcType=DECIMAL} >= u.brokerage_price
</if>
<if test="min != null and min > 0">
and now_money >= #{min, jdbcType=DECIMAL}
and u.brokerage_price >= #{min, jdbcType=DECIMAL}
</if>
GROUP BY u.uid
order by total_brokerage ${sort}

7
crmeb/src/main/resources/mapper/finance/UserRechargeMapper.xml
View File

@@ -1,11 +1,16 @@
<?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.finance.dao.UserRechargeDao">
<!-- 根据类型获取该类型充值金额-->
<select id="getSumByType" resultType="java.math.BigDecimal" parameterType="string">
select sum(price) as price from eb_user_recharge
<if test="type != null and type != '' ">
where recharge_type = #{type, jdbcType=VARCHAR}
</if>
</select>
<!-- 获取退款总额-->
<select id="getSumByRefund" resultType="java.math.BigDecimal">
select sum(refund_price) as price from eb_user_recharge
where refund_price > 0
</select>
</mapper>

5
crmeb/src/main/resources/mapper/store/StoreSeckillMangerMapper.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.kill.seckill.dao.StoreSeckillMangerDao">
</mapper>

5
crmeb/src/main/resources/mapper/store/StoreSeckillMapper.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.kill.seckill.dao.StoreSeckillDao">
</mapper>

10
crmeb/src/main/resources/mapper/system/SystemAdminMapper.xml
View File

@@ -1,5 +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.system.dao.SystemAdminDao">
</mapper>
<?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.system.dao.SystemAdminDao">
</mapper>

10
crmeb/src/main/resources/mapper/system/SystemConfigMapper.xml
View File

@@ -1,5 +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.system.dao.SystemConfigDao">
</mapper>
<?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.system.dao.SystemConfigDao">
</mapper>

10
crmeb/src/main/resources/mapper/system/SystemStoreStaffMapper.xml
View File

@@ -1,5 +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.system.dao.SystemStoreStaffDao">
</mapper>
<?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.system.dao.SystemStoreStaffDao">
</mapper>

10
crmeb/src/main/resources/mapper/system/SystemUserLevelMapper.xml
View File

@@ -1,5 +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.system.dao.SystemUserLevelDao">
</mapper>
<?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.system.dao.SystemUserLevelDao">
</mapper>

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

@@ -1,4 +1,25 @@
<?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.user.dao.UserBillDao">
<select id="getListAdmin" 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 1 = 1 and ub.category not in ("exp", "integral")
<if test="keywords != '' and keywords != null ">
and ( ub.id like #{keywords} or ub.uid like #{keywords} or ub.link_id like #{keywords, jdbcType=VARCHAR} or ub.title like #{keywords, jdbcType=VARCHAR} or u.nickname like #{keywords, jdbcType=VARCHAR})
</if>
<if test="type != '' and type != null">
and ub.type = #{type, jdbcType=VARCHAR}
</if>
<if test="category != '' and category != null">
and ub.category = #{category, 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>

2
crmeb/src/main/resources/mapper/user/UserMapper.xml
View File

@@ -6,7 +6,7 @@
</update>
<select id="getSpreadPeopleList" resultType="com.zbkj.crmeb.front.response.UserSpreadPeopleItemResponse" parameterType="map">
SELECT u.nickname, u.avatar, u.create_time AS `time`, u.spread_count AS childCount, u.pay_count AS orderCount, p.numberCount AS numberCount FROM eb_user AS u
SELECT u.nickname, u.avatar, DATE_FORMAT(u.create_time, '%Y-%m-%d %H:%i:%s') AS `time`, u.spread_count AS childCount, u.pay_count AS orderCount, p.numberCount AS numberCount FROM eb_user AS u
LEFT JOIN (
SELECT IF((sum(pay_price) = NULL), 0.00, sum(pay_price)) AS numberCount, o.uid as o_uid FROM eb_store_order as o WHERE is_del = 0 AND is_system_del = 0
<if test="userIdList != null and userIdList !='' ">

10
crmeb/src/main/resources/mapper/wechat/WechatQrcodeMapper.xml
View File

@@ -1,5 +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.wechat.dao.WechatQrcodeDao">
</mapper>
<?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.wechat.dao.WechatQrcodeDao">
</mapper>

10
crmeb/src/main/resources/mapper/wechat/WechatReplyMapper.xml
View File

@@ -1,5 +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.wechat.dao.WechatReplyDao">
</mapper>
<?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.wechat.dao.WechatReplyDao">
</mapper>