master
kira 6 years ago
commit 03818e25ee

@ -40,7 +40,7 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService {
}
List<JSONObject> list = new ArrayList<>();
Map<Date,JSONObject> analysisMap = new TreeMap<>();
String[] channels = {"Wechat","Bestpay","Alipay","jd","AlipayOnline","hf"};
String[] channels = {"Wechat","Bestpay","Alipay","jd","AlipayOnline","hf", "Rpay"};
for (String channel:channels){
analysisChannelCustomers(params, analysisMap, channel);
}

@ -102,7 +102,10 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
}
JSONObject res = new JSONObject();
res.put("new_partners", clientAnalysisMapper.countNewClients(params));
res.put("total_partners", clientAnalysisMapper.countClients(params));
//res.put("total_partners", clientAnalysisMapper.countClients(params));
// 统计所有的商户,包括禁用的
res.put("total_partners", clientAnalysisMapper.countClientsAll(params));
stringRedisTemplate.boundValueOps("org_commonAnalysis3"+params.getString("org_id")+params.getString("begin")).set(res.toJSONString(), 5, TimeUnit.MINUTES);
return res;
}
@ -553,7 +556,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
}
}
private JSONObject getTodayChannelCount(JSONObject params){
String[] channels = new String[]{"Bestpay","Wechat","Alipay","jd","AlipayOnline","hf"};
String[] channels = new String[]{"Bestpay","Wechat","Alipay","jd","AlipayOnline","hf", "Rpay"};
JSONObject resp = new JSONObject();
for(String channel:channels) {
params.put("channel", channel);

@ -22,6 +22,9 @@ public interface ClientAnalysisMapper {
int countClients(JSONObject params);
// 统计所有的商户,包括禁用的
int countClientsAll(JSONObject params);
@AutoSql(type = SqlType.COUNT)
@AdvanceSelect(addonWhereClause = "sub_merchant_id is not null")
int countTotalPartners();

@ -80,7 +80,7 @@ public class BDPrizeServiceImpl implements BDPrizeService {
private static BigDecimal percent = new BigDecimal(100);
private static String[] channels = new String[]{"Wechat", "Alipay", "Bestpay", "jd", "AlipayOnline","hf"};
private static String[] channels = new String[]{"Wechat", "Alipay", "Bestpay", "jd", "AlipayOnline","hf", "Rpay"};
private static Logger logger = LoggerFactory.getLogger(BDPrizeServiceImpl.class);
@Override

@ -40,6 +40,19 @@
</if>
GROUP BY a.datelist
</select>
<!--显示所有的商户,包括禁用的-->
<select id="countClientsAll" resultType="java.lang.Integer">
<![CDATA[
SELECT count(client_id)
FROM sys_clients
WHERE
create_time <= #{end} and (approve_result is null or approve_result !=0)
]]>
<if test="org_id!=null and org_ids==null">and org_id=#{org_id}</if>
<if test="org_ids!=null">and org_id in
<foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
</select>
<select id="countClients" resultType="java.lang.Integer">
<![CDATA[
SELECT count(client_id)

@ -542,6 +542,8 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
return '/static/images/jd_sign_lg.png';
case 'hf':
return '/static/images/hf_sign_lg.png';
case 'Rpay':
return '/static/images/royalpay_sign.png';
}
}
});

@ -48,6 +48,11 @@
<img src="/static/images/hf_sign_lg.png" class="channel-icon-lg">
</a>
</li>
<li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
<a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="RPAY">
<img src="/static/images/royalpay_sign.png" class="channel-icon-lg">
</a>
</li>
</ul>
</div>
</div>

@ -60,6 +60,8 @@ define(['../app','decimal'], function (app,Decimal) {
return '/static/images/jd_sign_lg.png';
case 'hf':
return '/static/images/hf_sign_lg.png';
case 'Rpay':
return '/static/images/royalpay_sign.png';
}
}
});

@ -392,6 +392,8 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
return '/static/images/jd_sign_lg.png';
case 'hf':
return '/static/images/hf_sign_lg.png';
case 'Rpay':
return '/static/images/royalpay_sign.png';
}
}
});

@ -132,6 +132,19 @@
</div>
</div>
</div>
<div class="col-xs-4" ng-if="detail.RpayDetail">
<div class="info-box" style="background: lightcyan">
<div class="info-box-icon" style=" background: bottom;">
<img uib-tooltip="HF" src="/static/images/royalpay_sign.png">
</div>
<div class="info-box-content">
<h5>Transaction: ${{detail.RpayDetail.total_amount}}</h5>
<h5>Commission: ${{detail.RpayDetail.total_prize}}</h5>
<h5>Send: ${{detail.RpayDetail.send_prize}}</h5>
<h5>Fund: ${{detail.RpayDetail.total_donation}}</h5>
</div>
</div>
</div>
</div>
<div class="box box-default" ng-if="!detail.no_record">
<div class="box-header">Details<span class="text-danger">(Red Client Moniker means received from BD User who left company.)</span></div>
@ -174,6 +187,7 @@
<img ng-if="log.channel=='Bestpay'" uib-tooltip="Bestpay" src="/static/images/bestpay_sign_lg.png">
<img ng-if="log.channel=='jd'" uib-tooltip="Bestpay" src="/static/images/jd_sign_lg.png">
<img ng-if="log.channel=='hf'" uib-tooltip="Bestpay" src="/static/images/hf_sign_lg.png">
<img ng-if="log.channel=='Rpay'" uib-tooltip="Rpay" src="/static/images/royalpay_sign.png">
</td>
</tr>
</tbody>

@ -107,6 +107,18 @@
</div>
</div>
</div>
<div class="col-xs-4" ng-if="report.RpayReport">
<div class="info-box" style="background: lightcyan">
<div class="info-box-icon" style=" background: bottom;">
<img uib-tooltip="HF" src="/static/images/royalpay_sign.png">
</div>
<div class="info-box-content">
<h5>BD Total Commission: ${{report.RpayReport.total_prize}}</h5>
<h5>BD Total Send: ${{report.RpayReport.total_send_prize}}</h5>
<h5>BD Total Fund: ${{report.RpayReport.total_donation}}</h5>
</div>
</div>
</div>
</div>
<div class="box box-default">
<div class="box-header">BD Commission</div>

@ -40,6 +40,11 @@
<img src="/static/images/hf_sign_lg.png">
</a>
</li>
<li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
<a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="Rpay Pay">
<img src="/static/images/royalpay_sign.png">
</a>
</li>
</ul>
</div>
</div>

@ -351,6 +351,8 @@
uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
<img src="/static/images/hf_sign.png"
uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
<img src="/static/images/royalpay_sign.png"
uib-tooltip="Royal Pay" ng-if="trade.channel=='Rpay'"/>
{{trade.order_id}}
</td>
<td>

Loading…
Cancel
Save