全新UI视觉体验,移动端API优化降低重复调用,提高并发6倍,修复N多Bug

This commit is contained in:
stivepeim
2021-06-11 17:41:16 +08:00
parent 0b9f28fa52
commit b76840e10f
582 changed files with 35633 additions and 28276 deletions

View File

@@ -4,9 +4,11 @@
<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.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
-- IF(( Sum(e.extract_price) ) IS NULL, 0.00, Sum(e.extract_price)) AS total_extract
(SELECT if(Sum( e.extract_price ) IS NULL, 0.00, Sum( e.extract_price ) ) from eb_user_extract e where e.uid = u.uid and e.`status` = 1 ) AS total_extract
FROM eb_user AS u
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
-- 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} or u.nickname like #{keywords, jdbcType=VARCHAR})

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.payComponent.brand.dao.PayComponentBrandDao">
</mapper>

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.payComponent.cat.dao.PayComponentCatDao">
</mapper>

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.payComponent.product.dao.PayComponentDraftProductDao">
</mapper>

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.payComponent.product.dao.PayComponentProductAuditInfoDao">
</mapper>

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.payComponent.product.dao.PayComponentProductInfoDao">
</mapper>

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.payComponent.product.dao.PayComponentProductDao">
</mapper>

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.payComponent.product.dao.PayComponentProductSkuAttrDao">
</mapper>

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.payComponent.product.dao.PayComponentProductSkuDao">
</mapper>

View File

@@ -1,5 +1,15 @@
<?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.store.dao.StoreProductRelationDao">
<select id="getUserList" resultType="com.zbkj.crmeb.front.response.UserRelationResponse" parameterType="java.lang.Integer">
-- SELECT r.id,r.product_id as productId,r.create_time as createTime,p.store_name as storeName,p.image,p.price
SELECT r.id,r.product_id,r.create_time,p.store_name,p.image,p.price
FROM eb_store_product_relation r
INNER JOIN eb_store_product p ON r.product_id = p.id And p.is_show = 1
where r.`type` = 'collect'
<if test="uid != '' and type != null">
and r.uid = #{uid}
</if>
ORDER BY r.id DESC
</select>
</mapper>

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.UserIntegralRecordDao">
</mapper>

View File

@@ -6,7 +6,7 @@
</update>
<select id="getSpreadPeopleList" resultType="com.zbkj.crmeb.front.response.UserSpreadPeopleItemResponse" parameterType="map">
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
SELECT u.nickname, u.avatar, DATE_FORMAT(u.spread_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 !='' ">
@@ -22,4 +22,68 @@
</if>
ORDER BY ${sortKey} ${sortValue}
</select>
<select id="findAdminList" resultType="com.zbkj.crmeb.user.model.User" parameterType="Map">
SELECT u.* FROM eb_user AS u
<if test='userType != null and userType != "" and userType == "wechat"'>
INNER JOIN eb_user_token AS ut on u.uid = ut.uid and ut.type = 1
</if>
<if test='userType != null and userType != "" and userType == "routine"'>
INNER JOIN eb_user_token AS ut on u.uid = ut.uid and ut.type = 2
</if>
where 1 = 1
<if test="isPromoter != null and isPromoter !='' or isPromoter == 0 ">
and u.is_promoter = ${isPromoter}
</if>
<if test="groupId != null and groupId !='' ">
and u.group_id in (${groupId})
</if>
<if test="tagIdSql != null and tagIdSql !='' ">
and ${tagIdSql}
</if>
<if test="level != null and level !='' ">
and u.level in (${level})
</if>
<if test="sex != null and sex !='' or sex == 0">
and u.sex = ${sex}
</if>
<if test="country != null and country !='' ">
and u.country = #{country}
</if>
<if test="addres != null and addres !='' ">
and u.addres like '%${addres}'
</if>
<if test="payCount != null and payCount !='' or payCount == 0 ">
<if test="payCount &lt;= 0">
and u.pay_count = 0
</if>
<if test="payCount > 0">
and u.pay_count >= ${payCount}
</if>
</if>
<if test="status != null and status !='' or status == 0 ">
and u.`status` = ${status}
</if>
<if test="startTime != null and startTime != '' and accessType != null and accessType != ''">
<choose>
<when test="accessType = 1">
and create_time between #{startTime} and #{endTime}
and create_time = last_login_time
</when>
<when test="accessType = 2">
and last_login_time between #{startTime} and #{endTime}
</when>
<when test="accessType = 3">
and last_login_time not between #{startTime} and #{endTime}
</when>
<otherwise>
and create_time between #{startTime} and #{endTime}
</otherwise>
</choose>
</if>
<if test="keywords != '' and keywords != null ">
and ( u.phone like #{keywords, jdbcType=VARCHAR} or u.nickname like "%"#{keywords, jdbcType=VARCHAR}"%" or u.mark like #{keywords, jdbcType=VARCHAR})
</if>
ORDER BY u.uid desc
</select>
</mapper>