msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 商户活跃度查询逻辑

Browse Source
master
todking 6 years ago
parent f286a18c8c
commit a3a9a1c499
7 changed files with 89 additions and 7 deletions
Show Stats Download Patch File Download Diff File

63
src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ClientRatesAnalysisServiceImpl.java
Unescape View File

@ -3,21 +3,28 @@ package au.com.royalpay.payment.manage.analysis.core.impls;
import au.com.royalpay.payment.manage.analysis.beans.ClientRateQueryBean;
import au.com.royalpay.payment.manage.analysis.core.ClientRatesAnalysisService;
import au.com.royalpay.payment.manage.analysis.mappers.ClientRatesAnalysisMapper;
import au.com.royalpay.payment.manage.analysis.mappers.CustomerAndOrdersStatisticsMapper;
import au.com.royalpay.payment.manage.mappers.log.ClientReviewLogMapper;
import au.com.royalpay.payment.manage.mappers.system.ClientBDMapper;
import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
import au.com.royalpay.payment.manage.mappers.system.OrgMapper;
import au.com.royalpay.payment.manage.merchants.core.ClientManager;
import au.com.royalpay.payment.manage.organizations.core.OrgManager;
import au.com.royalpay.payment.tools.exceptions.BadRequestException;
import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.miemiedev.mybatis.paginator.domain.Order;
import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.RequestParam;
import java.text.ParseException;
import java.util.ArrayList;
@ -45,8 +52,15 @@ public class ClientRatesAnalysisServiceImpl implements ClientRatesAnalysisServic
@Resource
private OrgManager orgManager;
@Resource
private OrgMapper orgMapper;
@Resource
private ClientBDMapper clientBDMapper;
@Resource
private CustomerAndOrdersStatisticsMapper customerAndOrdersStatisticsMapper;
@Override
public JSONObject listAnalysisOfBDUsers(JSONObject manager, String orgId, String orgId2,Date beginDate, Date endDate) {
public JSONObject listAnalysisOfBDUsers(JSONObject manager, String orgId, String orgId2, Date beginDate, Date endDate) {
JSONObject params = new JSONObject();
if (orgId != null) {
params.put("org_id", orgId);
@ -58,11 +72,46 @@ public class ClientRatesAnalysisServiceImpl implements ClientRatesAnalysisServic
if (ManagerRole.BD_LEADER.hasRole(manager.getIntValue("role"))) {
params.put("bd_group", manager.getString("manager_id"));
}
params.put("begin", DateFormatUtils.format(beginDate,"yyyy-MM-dd"));
params.put("end", DateFormatUtils.format(endDate,"yyyy-MM-dd"));
orgManager.checkOrgIds(manager,params);
params.put("begin", DateFormatUtils.format(beginDate, "yyyy-MM-dd"));
params.put("end", DateFormatUtils.format(endDate, "yyyy-MM-dd"));
orgManager.checkOrgIds(manager, params);
JSONObject result = new JSONObject();
List<JSONObject> bdAnalysis = clientRatesAnalysisMapper.analysisRatesForBDUsers(params);
// 原 数据直接查询
// List<JSONObject> bdAnalysis = clientRatesAnalysisMapper.analysisRatesForBDUsers(params);
// result.put("bds", bdAnalysis);
// 新 数据查询
// 根据时间查询所有的商户交易量
List<JSONObject> clientOrders = customerAndOrdersStatisticsMapper.findByTime(params);
// 查询所有的组织
PageBounds sort = new PageBounds(Order.formString("sort_no.asc"));
List<JSONObject> orgList = orgMapper.listOrgs(0, sort);
List<JSONObject> bdAnalysis = new ArrayList<>();
// 查询组织下所有的bd
for (JSONObject org : orgList) {
List<JSONObject> bds = managerMapper.findBdById(org.getString("org_id"));
for (JSONObject bd : bds) {
// 查出bd下的所有的商户，不为null的 set进 bdAnalysis
List<JSONObject> clients = clientBDMapper.findTotalClientByBdId(bd.getString("manager_id"));
// 遍历商户 查看商户交易量
if (!clients.isEmpty()) {
for (JSONObject client : clients) {
int i = 0;
for (JSONObject clientOrder : clientOrders) {
if (client.getString("client_id").equals(clientOrder.getString("client_id"))) {
// 判断交易量
if (clientOrder.getInteger("order_count") != 0) {
bd.put("trade_clients", i++);
}
}
}
}
bd.put("total_clients", clients.size());
bdAnalysis.add(bd);
}
}
}
result.put("bds", bdAnalysis);
result.put("total", clientRatesAnalysisMapper.analysisTotal(params));
return result;
@ -151,7 +200,7 @@ public class ClientRatesAnalysisServiceImpl implements ClientRatesAnalysisServic
params.put("client_ids", clientIds);
// result.put("total", clientRatesAnalysisMapper.analysisTotal(params));
List<JSONObject> clients = analysisClientRates(params,query);
List<JSONObject> clients = analysisClientRates(params, query);
result.put("clients", clients);
@ -165,7 +214,7 @@ public class ClientRatesAnalysisServiceImpl implements ClientRatesAnalysisServic
client.put("sleep_days_limited", Math.min(client.getIntValue("sleep_days"), 30));
List<JSONObject> events = new ArrayList<>();
for (ClientRateAnalysisEventLoader loader : eventLoaders) {
loader.loadEvents(client, events,query);
loader.loadEvents(client, events, query);
}
client.put("events", events);
}

2
src/main/java/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.java
Unescape View File

@ -74,4 +74,6 @@ public interface CustomerAndOrdersStatisticsMapper {
int countEnableChannel(JSONObject params);
int countEnableAlipay(JSONObject params);
List<JSONObject> findByTime(JSONObject params);
}

1
src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientBDMapper.java
Unescape View File

@ -40,4 +40,5 @@ public interface ClientBDMapper {
List<JSONObject> listBDByOrgId(@Param("org_id") int org_id);
List<JSONObject> findTotalClientByBdId(@Param("bd_id")String manager_id);
}

2
src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.java
Unescape View File

@ -70,4 +70,6 @@ public interface ManagerMapper {
@Select("select wx_openid from sys_managers where is_valid=1 AND (role & 256 > 0 OR role & 4 > 0) AND (org_id = 1 or org_id is null) AND wx_openid IS NOT NULL")
List<String> listDevAndBdOpenId();
List<JSONObject> findBdById(@Param("org_id")String org_id);
}

15
src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
Unescape View File

@ -743,4 +743,19 @@
)
</if>
</select>
<select id="findByTime" resultType="com.alibaba.fastjson.JSONObject">
SELECT
client_id, sum( o.orders ) order_count
FROM
statistics_customer_order o
WHERE
o.date &lt;= #{end}
AND o.date &gt;= #{begin}
AND client_id != 0
GROUP BY
o.client_id
</select>
</mapper>

6
src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientBDMapper.xml
Unescape View File

@ -80,4 +80,10 @@
WHERE sysm.org_id = #{org_id}
AND sysm.is_valid = 1)
</select>
<select id="findTotalClientByBdId" resultType="com.alibaba.fastjson.JSONObject">
select client_id from sys_client_bd where bd_id = #{bd_id} and is_valid =1
</select>
</mapper>

7
src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml
Unescape View File

@ -102,5 +102,12 @@
]]>
</select>
<select id="findBdById" resultType="com.alibaba.fastjson.JSONObject">
<![CDATA[
SELECT manager_id,display_name
FROM sys_managers
WHERE org_id = #{org_id} AND is_valid = 1
]]>
</select>
</mapper>

Write Preview
Loading…
Cancel
Save