Merge branch 'develop'

master
taylor.dang 5 years ago
commit 0e18f4a342

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId>
<version>1.0.34</version>
<version>1.0.35</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

@ -13,21 +13,21 @@
l.clearing_amount,
l.refund_id,
l.transaction_type,
o.create_time
l.create_time
FROM pmt_transactions l
INNER JOIN pmt_orders o
ON o.order_id = l.order_id
<if test="begin != null">
AND o.create_time &gt;= #{begin}
AND l.create_time &gt;= #{begin}
</if>
<if test="end != null">
AND o.create_time &lt; #{end}
AND l.create_time &lt; #{end}
</if>
<if test="begin_month">
AND DATE_FORMAT(o.create_time, '%Y-%m') &gt;= #{begin_month}
AND DATE_FORMAT(l.create_time, '%Y-%m') &gt;= #{begin_month}
</if>
<if test="end_month">
AND DATE_FORMAT(o.create_time, '%Y-%m') &lt;= #{end_month}
AND DATE_FORMAT(l.create_time, '%Y-%m') &lt;= #{end_month}
</if>
WHERE (l.transaction_type = 'Credit' OR l.refund_id IS NOT NULL)
) temp
@ -220,4 +220,4 @@
ORDER BY partner_counts DESC;
</select>
</mapper>
</mapper>

@ -145,6 +145,19 @@
</div>
</div>
</div>
<div class="col-xs-4" ng-if="detail.LakalaPayDetail">
<div class="info-box" style="background: lightcyan">
<div class="info-box-icon" style=" background: bottom;">
<img uib-tooltip="lakalaPay" src="/static/images/lakalapay_sign_lg.png">
</div>
<div class="info-box-content">
<h5>Transaction: ${{detail.LakalaPayDetail.total_amount}}</h5>
<h5>Commission: ${{detail.LakalaPayDetail.total_prize}}</h5>
<h5>Send: ${{detail.LakalaPayDetail.send_prize}}</h5>
<h5>Fund: ${{detail.LakalaPayDetail.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>
@ -196,4 +209,4 @@
</table>
</div>
</div>
</section>
</section>

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

Loading…
Cancel
Save