Merge branch '8/3' into develop

src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java

@@ -28,6 +28,8 @@ import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -79,6 +81,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 Logger logger = LoggerFactory.getLogger(BDPrizeServiceImpl.class);
 
     @Override
     public void generateRecord(String month) {
@@ -121,14 +124,16 @@ public class BDPrizeServiceImpl implements BDPrizeService {
             List<JSONObject> trades = transactionMapper.listTransactionsForBDPrize(now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1, channel);
             List<Integer> clientsWithBDAway = clientBDMapper.clientsWithBDAway();
             List<JSONObject> rateConfig = getRateConfig();
-            BDPrizeCalculator calculator = new BDPrizeCalculatorDefaultImpl(trades, now.getTime()).clientBDMapper(clientBDMapper)
+            BDPrizeCalculator calculator = new BDPrizeCalculatorDefaultImpl(trades, now.getTime()).clientBDMapper(clientBDMapper).transactionMapper(transactionMapper)
                     .clientsWithBDAwayDeterminor(new DefaultClientWithBDAwayDeterminor(clientsWithBDAway)).rateConfig(rateConfig);
             calculator.calculate();
-            List<JSONObject> report = calculator.getReport();
+            List<JSONObject> report = calculator.getReport(now.get(Calendar.YEAR),now.get(Calendar.MONTH) + 1);
+            logger.info("======calculator.report=========="+channel+"===="+report.toString());
             for (JSONObject log : report) {
                 log.put("record_id", record.getString("record_id"));
                 log.put("channel", channel);
                 log.remove("prize_log_id");
+                logger.info("=========financialBDPrizeLogMapper.save======="+log.toString());
                 financialBDPrizeLogMapper.save(log);
                 List<JSONObject> details = (List<JSONObject>) log.get("details");
                 for (JSONObject detail : details) {

src/main/java/au/com/royalpay/payment/manage/bdprize/support/BDPrizeCalculator.java

@@ -11,5 +11,5 @@ public interface BDPrizeCalculator {
 
     void calculate();
 
-    List<JSONObject> getReport();
+    List<JSONObject> getReport(int year,int month);
 }

src/main/java/au/com/royalpay/payment/manage/bdprize/support/impls/BDPrizeCalculatorDefaultImpl.java

@@ -9,16 +9,20 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import au.com.royalpay.payment.manage.mappers.payment.TransactionMapper;
 import com.alibaba.fastjson.JSONObject;
 
 import au.com.royalpay.payment.manage.bdprize.support.BDPrizeCalculator;
 import au.com.royalpay.payment.manage.mappers.system.ClientBDMapper;
 import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Created by yixian on 2017-02-08.
  */
 public class BDPrizeCalculatorDefaultImpl implements BDPrizeCalculator {
+    private static Logger logger = LoggerFactory.getLogger(BDPrizeCalculator.class);
     private final List<JSONObject> tradeLogs;
     private final Date month;
     private ClientBDMapper clientBDMapper;
@@ -27,6 +31,7 @@ public class BDPrizeCalculatorDefaultImpl implements BDPrizeCalculator {
     private Map<String, JSONObject> bdMap = new HashMap<>();
     private Map<Integer, Map<Integer, List<JSONObject>>> rateConfigMap = new HashMap<>();
     private Map<String, BigDecimal> bdTotalMap = new HashMap<>();
+    private TransactionMapper transactionMapper;
 
     public BDPrizeCalculatorDefaultImpl(List<JSONObject> tradeLogs, Date month) {
         this.tradeLogs = tradeLogs;
@@ -38,6 +43,11 @@ public class BDPrizeCalculatorDefaultImpl implements BDPrizeCalculator {
         return this;
     }
 
+    public BDPrizeCalculatorDefaultImpl transactionMapper(TransactionMapper transactionMapper) {
+        this.transactionMapper = transactionMapper;
+        return this;
+    }
+
     public BDPrizeCalculatorDefaultImpl clientsWithBDAwayDeterminor(DefaultClientWithBDAwayDeterminor clientWithBDAwayDeterminor) {
         this.clientsWithBDAwayDeterminor = clientWithBDAwayDeterminor;
         return this;
@@ -47,15 +57,15 @@ public class BDPrizeCalculatorDefaultImpl implements BDPrizeCalculator {
         for (JSONObject rateCfgItem : rateConfig) {
             int level = rateCfgItem.getIntValue("bd_level");
             int kpiRange = rateCfgItem.getIntValue("kpi_range");
-            Map<Integer, List<JSONObject>> rates = rateConfigMap.get(level);
+            Map<Integer, List<JSONObject>> levelRates = rateConfigMap.get(level);
-            if (rates == null) {
+            if (levelRates == null) {
-                rates = new HashMap<>();
+                levelRates = new HashMap<>();
-                rateConfigMap.put(level, rates);
+                rateConfigMap.put(level, levelRates);
             }
-            List<JSONObject> rate = rates.get(kpiRange);
+            List<JSONObject> rate = levelRates.get(kpiRange);
             if (rate == null) {
                 rate = new ArrayList<>();
-                rates.put(kpiRange, rate);
+                levelRates.put(kpiRange, rate);
             }
             rate.add(rateCfgItem);
         }
@@ -73,7 +83,7 @@ public class BDPrizeCalculatorDefaultImpl implements BDPrizeCalculator {
     }
 
     @Override
-    public List<JSONObject> getReport() {
+    public List<JSONObject> getReport(int year,int month1) {
         List<JSONObject> report = new ArrayList<>();
         for (Map.Entry<String, Map<String, JSONObject>> resultItem : results.entrySet()) {
             JSONObject log = new JSONObject();
@@ -86,15 +96,8 @@ public class BDPrizeCalculatorDefaultImpl implements BDPrizeCalculator {
             log.put("total_amount", 0);
             log.put("total_prize", 0);
             log.put("total_donation", 0);
-            BigDecimal totalAmount = log.getBigDecimal("total_amount");
+            BigDecimal totalAmount = transactionMapper.TotalAmountForBDPrize(year,month1,bd.getString("bd_id"));
             List<JSONObject> details = new ArrayList<>();
-            for (Map.Entry<String, JSONObject> detail : resultItem.getValue().entrySet()) {
-                JSONObject detailItem = detail.getValue();
-                BigDecimal totalTransaction = detailItem.getBigDecimal("total_transaction");
-                BigDecimal coefficient = detailItem.getBigDecimal("coefficient");
-                BigDecimal realTransaction = totalTransaction.multiply(coefficient).setScale(2,BigDecimal.ROUND_DOWN);
-                totalAmount = totalAmount.add(realTransaction);
-            }
             for (Map.Entry<String, JSONObject> detail : resultItem.getValue().entrySet()) {
                 JSONObject detailItem = detail.getValue();
                 int clientId = detailItem.getIntValue("client_id");
@@ -102,6 +105,7 @@ public class BDPrizeCalculatorDefaultImpl implements BDPrizeCalculator {
                 BigDecimal totalTransaction = detailItem.getBigDecimal("total_transaction");
                 BigDecimal coefficient = detailItem.getBigDecimal("coefficient");
                 int prizeLevel = getKpiPrizeLevel(totalAmount,log.getBigDecimal("kpi_amount"));
+                logger.debug("-------->bd kpi level:"+bd.getString("bd_name")+"---level:"+prizeLevel+",kpi:"+log.getBigDecimal("kpi_amount")+",trans:"+totalAmount+",client_id:"+clientId);
                 BigDecimal bdRate = getNewRate(bdLevel, prizeLevel, detailItem.getIntValue("client_source"), detailItem.getBigDecimal("rate_value"));
                 BigDecimal prizeValue = totalTransaction.multiply(coefficient).multiply(bdRate).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_DOWN);
                 BigDecimal donation = BigDecimal.ZERO;
@@ -222,8 +226,8 @@ public class BDPrizeCalculatorDefaultImpl implements BDPrizeCalculator {
 
     private BigDecimal getNewRate(int bdLevel, int kpiRange, int clientSource, BigDecimal clientRate) {
         BigDecimal prizeRate = BigDecimal.ZERO;
-        Map<Integer, List<JSONObject>> rates = rateConfigMap.get(bdLevel);
+        Map<Integer, List<JSONObject>> levelRates = rateConfigMap.get(bdLevel);
-        List<JSONObject> rate = rates.get(kpiRange);
+        List<JSONObject> rate = levelRates.get(kpiRange);
         for (JSONObject rateCfg : rate) {
             if (rateCfg.getBigDecimal("rate_from").compareTo(clientRate) <= 0 && rateCfg.getBigDecimal("rate_to").compareTo(clientRate) >= 0) {
                 prizeRate= rateCfg.getBigDecimal("prize_rate");

src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java

@@ -93,6 +93,8 @@ public interface TransactionMapper {
 
     List<JSONObject> listTransactionsForBDPrize(@Param("year") int year, @Param("month") int month, @Param("channel") String channel);
 
+    BigDecimal TotalAmountForBDPrize(@Param("year") int year, @Param("month") int month, @Param("bd_id") String bd_id);
+
     BigDecimal TotalAmountForBDLeaderPrize(@Param("year") int year, @Param("month") int month, @Param("bd_group") String bd_group);
     BigDecimal TotalAmountForSydneyGMPrize(@Param("year") int year, @Param("month") int month);
 

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml

@@ -502,6 +502,24 @@
         ORDER BY trade_date ASC, o.client_id ASC
     </select>
 
+    <select id="TotalAmountForBDPrize" resultType="java.math.BigDecimal">
+        <![CDATA[
+select  sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,-temp.clearing_amount*d.proportion))
+        total    FROM
+        (SELECT l.client_id,l.clearing_amount,l.refund_id,l.transaction_type,o.create_time FROM pmt_transactions l
+        INNER JOIN pmt_orders o
+        ON o.order_id = l.order_id
+        and year(o.create_time) = #{year} AND month(o.create_time) = #{month}
+        where (l.transaction_type='Credit' or l.refund_id is not null)
+        ) temp
+        INNER JOIN sys_client_bd d ON temp.client_id = d.client_id AND d.start_date <= temp.create_time and
+        d.is_valid = '1'
+        AND (d.end_date is null or d.end_date > temp.create_time)
+        and d.bd_id=#{bd_id}
+]]>
+
+    </select>
+
     <select id="TotalAmountForBDLeaderPrize" resultType="java.math.BigDecimal">
        SELECT
         ifnull(sum(t.total),0)

src/main/ui/static/config/bdprize/templates/bd_prize_detail.html

@@ -80,6 +80,19 @@
                 </div>
             </div>
         </div>
+        <div class="col-xs-4" ng-if="detail.AlipayOnlineDetail">
+            <div class="info-box" style="background: lightcyan">
+                <div class="info-box-icon" style="    background: bottom;">
+                    <img uib-tooltip="AliOnline" src="/static/images/alipay_online.png">
+                </div>
+                <div class="info-box-content">
+                    <h5>Transaction: ${{detail.AlipayOnlineDetail.total_amount}}</h5>
+                    <h5>Commission: ${{detail.AlipayOnlineDetail.total_prize}}</h5>
+                    <h5>Send: ${{detail.AlipayOnlineDetail.send_prize}}</h5>
+                    <h5>Fund: ${{detail.AlipayOnlineDetail.total_donation}}</h5>
+                </div>
+            </div>
+        </div>
         <div class="col-xs-4" ng-if="detail.BestpayDetail">
             <div class="info-box" style="background: lightcyan">
                 <div class="info-box-icon" style="    background: bottom;">
@@ -93,6 +106,32 @@
                 </div>
             </div>
         </div>
+        <div class="col-xs-4" ng-if="detail.jdDetail">
+            <div class="info-box" style="background: lightcyan">
+                <div class="info-box-icon" style="    background: bottom;">
+                    <img uib-tooltip="JD" src="/static/images/jd_sign_lg.png">
+                </div>
+                <div class="info-box-content">
+                    <h5>Transaction: ${{detail.jdDetail.total_amount}}</h5>
+                    <h5>Commission: ${{detail.jdDetail.total_prize}}</h5>
+                    <h5>Send: ${{detail.jdDetail.send_prize}}</h5>
+                    <h5>Fund: ${{detail.jdDetail.total_donation}}</h5>
+                </div>
+            </div>
+        </div>
+        <div class="col-xs-4" ng-if="detail.hfDetail">
+            <div class="info-box" style="background: lightcyan">
+                <div class="info-box-icon" style="    background: bottom;">
+                    <img uib-tooltip="HF" src="/static/images/hf_sign_lg.png">
+                </div>
+                <div class="info-box-content">
+                    <h5>Transaction: ${{detail.hfDetail.total_amount}}</h5>
+                    <h5>Commission: ${{detail.hfDetail.total_prize}}</h5>
+                    <h5>Send: ${{detail.hfDetail.send_prize}}</h5>
+                    <h5>Fund: ${{detail.hfDetail.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>
@@ -131,7 +170,10 @@
                     <td>
                         <img ng-if="log.channel=='Alipay'" uib-tooltip="Alipay" src="/static/images/alipay_sign_lg.png">
                         <img ng-if="log.channel=='Wechat'" uib-tooltip="Wechat" src="/static/images/wechatpay_sign_lg.png">
+                        <img ng-if="log.channel=='AlipayOnline'" uib-tooltip="Bestpay" src="/static/images/alipay_online.png">
                         <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">
                     </td>
                 </tr>
                 </tbody>

src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html

@@ -59,6 +59,18 @@
                     </div>
                 </div>
             </div>
+            <div class="col-xs-4" ng-if="report.AlipayOnlineReport">
+                <div class="info-box" style="background: lightcyan">
+                    <div class="info-box-icon" style="    background: bottom;">
+                        <img uib-tooltip="AliOnline" src="/static/images/alipay_online.png">
+                    </div>
+                    <div class="info-box-content">
+                        <h5>BD Total Commission: ${{report.AlipayOnlineReport.total_prize}}</h5>
+                        <h5>BD Total Send: ${{report.AlipayOnlineReport.total_send_prize}}</h5>
+                        <h5>BD Total Fund: ${{report.AlipayOnlineReport.total_donation}}</h5>
+                    </div>
+                </div>
+            </div>
             <div class="col-xs-4" ng-if="report.BestpayReport">
                 <div class="info-box" style="background: lightcyan">
                     <div class="info-box-icon" style="    background: bottom;">
@@ -71,6 +83,30 @@
                     </div>
                 </div>
             </div>
+            <div class="col-xs-4" ng-if="report.jdReport">
+                <div class="info-box" style="background: lightcyan">
+                    <div class="info-box-icon" style="    background: bottom;">
+                        <img uib-tooltip="JD" src="/static/images/jd_sign_lg.png">
+                    </div>
+                    <div class="info-box-content">
+                        <h5>BD Total Commission: ${{report.jdReport.total_prize}}</h5>
+                        <h5>BD Total Send: ${{report.jdReport.total_send_prize}}</h5>
+                        <h5>BD Total Fund: ${{report.jdReport.total_donation}}</h5>
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-4" ng-if="report.hfReport">
+                <div class="info-box" style="background: lightcyan">
+                    <div class="info-box-icon" style="    background: bottom;">
+                        <img uib-tooltip="HF" src="/static/images/hf_sign_lg.png">
+                    </div>
+                    <div class="info-box-content">
+                        <h5>BD Total Commission: ${{report.hfReport.total_prize}}</h5>
+                        <h5>BD Total Send: ${{report.hfReport.total_send_prize}}</h5>
+                        <h5>BD Total Fund: ${{report.hfReport.total_donation}}</h5>
+                    </div>
+                </div>
+            </div>
         </div>
         <div class="box box-default">
             <div class="box-header">BD Commission</div>