|
@@ -362,8 +362,8 @@
|
|
parameterType="com.hcloud.microserver.h5.facade.carbon.forms.CustomerCarbonValRankForm"
|
|
parameterType="com.hcloud.microserver.h5.facade.carbon.forms.CustomerCarbonValRankForm"
|
|
resultType="com.hcloud.microserver.h5.facade.carbon.forms.CustomerCarbonValRankForm">
|
|
resultType="com.hcloud.microserver.h5.facade.carbon.forms.CustomerCarbonValRankForm">
|
|
SELECT obj.* from (SELECT @rownum := @rownum + 1 AS rank,tmp.t_customer_id AS customerId,tmp.carbonVal
|
|
SELECT obj.* from (SELECT @rownum := @rownum + 1 AS rank,tmp.t_customer_id AS customerId,tmp.carbonVal
|
|
- ,IFNULL(c.customer_name,c.nick_name) AS customerName,c.head_image AS headImage
|
|
|
|
- FROM (SELECT @rownum := 0) r,(SELECT a.t_customer_id,SUM(a.carbon_val) AS carbonVal
|
|
|
|
|
|
+ ,IFNULL(c.customer_name,c.nick_name) AS customerName,c.head_image AS headImage,tmp.create_time
|
|
|
|
+ FROM (SELECT @rownum := 0) r,(SELECT a.t_customer_id,SUM(a.carbon_val) AS carbonVal,b.create_time
|
|
FROM t_customer_carbon_val a
|
|
FROM t_customer_carbon_val a
|
|
INNER JOIN t_customer_info b ON b.guid = a.t_customer_id
|
|
INNER JOIN t_customer_info b ON b.guid = a.t_customer_id
|
|
WHERE a.`status` = 1
|
|
WHERE a.`status` = 1
|
|
@@ -377,11 +377,12 @@
|
|
GROUP BY t_customer_id
|
|
GROUP BY t_customer_id
|
|
) tmp
|
|
) tmp
|
|
LEFT JOIN t_customer_info c ON tmp.t_customer_id = c.guid
|
|
LEFT JOIN t_customer_info c ON tmp.t_customer_id = c.guid
|
|
- ORDER BY tmp.carbonVal DESC,CONVERT(c.nick_name USING GBK) DESC
|
|
|
|
|
|
+ ORDER BY tmp.carbonVal DESC,tmp.create_time ASC
|
|
) obj WHERE 1 = 1
|
|
) obj WHERE 1 = 1
|
|
<if test="customerId != null and isCurrCustomerRank != null and isCurrCustomerRank == true">
|
|
<if test="customerId != null and isCurrCustomerRank != null and isCurrCustomerRank == true">
|
|
AND obj.CustomerId = #{customerId}
|
|
AND obj.CustomerId = #{customerId}
|
|
</if>
|
|
</if>
|
|
|
|
+ ORDER BY obj.rank ASC
|
|
</select>
|
|
</select>
|
|
<select id="selectCarbonAmountByCustomerId" resultType="java.math.BigDecimal">
|
|
<select id="selectCarbonAmountByCustomerId" resultType="java.math.BigDecimal">
|
|
SELECT
|
|
SELECT
|