Merge remote-tracking branch 'origin/develop' into develop

pom.xml

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

src/main/java/au/com/royalpay/payment/manage/analysis/core/BDAnalysisService.java

@@ -30,4 +30,10 @@ public interface BDAnalysisService {
      * @return bd_id, bd_name, num
      */
     List<JSONObject> approvedAnalysis(JSONObject params);
+
+    /**
+     * BD销售每日数据统计
+     * @param format
+     */
+    void generateReport(String format);
 }

src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java

@@ -3,10 +3,13 @@ package au.com.royalpay.payment.manage.analysis.core.impls;
 import au.com.royalpay.payment.manage.analysis.beans.AnalysisBean;
 import au.com.royalpay.payment.manage.analysis.core.BDAnalysisService;
 import au.com.royalpay.payment.manage.analysis.mappers.BDAnalysisMapper;
+import au.com.royalpay.payment.manage.mappers.log.StatisticsBDSalesReportMapper;
 import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
@@ -18,8 +21,12 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * Created by yishuqian on 30/09/2016.
@@ -30,6 +37,9 @@ public class BDAnalysisServiceImpl implements BDAnalysisService {
     @Resource
     private BDAnalysisMapper bdAnalysisMapper;
 
+    @Resource
+    private StatisticsBDSalesReportMapper bdSalesReportMapper;
+
 
     @Override
     public List<JSONObject> getSalesAnalysis(JSONObject jsonObject) {
@@ -38,7 +48,7 @@ public class BDAnalysisServiceImpl implements BDAnalysisService {
 
     private List<JSONObject> listSalesAnalysis(JSONObject jsonObject) {
         List<JSONObject> listCountApproved = bdAnalysisMapper.countApproved(jsonObject);
-        List<JSONObject> bdSaleList =  bdAnalysisMapper.getBDSaleList(jsonObject);
+        List<JSONObject> bdSaleList = bdSalesReportMapper.getBDSaleList(jsonObject);
         for (JSONObject countApproved : listCountApproved) {
             for (JSONObject saleList : bdSaleList) {
                 if (countApproved.getString("bd_id").equals(saleList.getString("bd_id"))) {
@@ -46,8 +56,31 @@ public class BDAnalysisServiceImpl implements BDAnalysisService {
                 }
             }
         }
+        SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+        if (sd.format(jsonObject.getDate("end")).equals(sd.format(DateUtils.addDays(new Date(), 1)))) {
+            jsonObject.put("begin", DateUtils.addDays(jsonObject.getDate("end"), -1));
+//            jsonObject.put("end", DateUtils.addDays(jsonObject.getDate("end"), -2));
+            jsonObject.put("end",jsonObject.getDate("end"));
+            List<JSONObject> todaySaleList = bdAnalysisMapper.getBDSaleList(jsonObject);
+            for (JSONObject todayBDSaleItem : todaySaleList) {
+                boolean flag = false;
+                for(JSONObject baSaleItem: bdSaleList){
+                    if (baSaleItem.getString("bd_id").equals(todayBDSaleItem.getString("bd_id"))) {
+                        BigDecimal newAmount = baSaleItem.getBigDecimal("total").add(todayBDSaleItem.getBigDecimal("total"));
+                        baSaleItem.put("total",newAmount);
+                        flag = true;
+                    }
+                }
+                if (!flag) {
+                    bdSaleList.add(todayBDSaleItem);
+                }
+            }
+        }
+
         return bdSaleList;
     }
+    //单独计算当日数据
+
 
     @Override
     public List<JSONObject> getSalesPartnersByBD(JSONObject jsonObject) {
@@ -144,6 +177,44 @@ public class BDAnalysisServiceImpl implements BDAnalysisService {
         return bdAnalysisMapper.countApproved(params);
     }
 
+    /**
+     * BD销售每日数据统计
+     * @param date
+     */
+    @Override
+    public void generateReport(String date) {
+        try {
+            Date beginTime = DateUtils.parseDate(date, new String[]{"yyyy-MM-dd"});
+            Date yesterdayEndTime = DateUtils.addDays(beginTime, 1);
+            String endDate = DateFormatUtils.format(yesterdayEndTime, "yyyy-MM-dd");
+            Date endTime = DateUtils.parseDate(endDate, new String[]{"yyyy-MM-dd"});
+            JSONObject params = new JSONObject();
+            params.put("begin", beginTime);
+            params.put("end", endTime);
+            List<JSONObject> bdSaleList = bdAnalysisMapper.getOneDayBDSaleList(params);
+            if (bdSaleList.size() != 0) {
+                for (JSONObject item : bdSaleList) {
+                    JSONObject existBDSalesReport = bdSalesReportMapper.findByBDIdAndLogDate(item.getString("bd_id"),beginTime);
+                    if(existBDSalesReport==null){
+                        JSONObject object = new JSONObject(item);
+                        object.put("log_id", UUID.randomUUID().toString());
+                        object.put("log_date", beginTime);
+                        object.put("create_time", new Date());
+                        bdSalesReportMapper.save(object);
+                    }else{
+                        existBDSalesReport.put("pay_amount",item.getString("pay_amount"));
+                        existBDSalesReport.put("refund_amount",item.getString("refund_amount"));
+                        existBDSalesReport.put("net_amount",item.getString("net_amount"));
+                        bdSalesReportMapper.update(existBDSalesReport);
+                    }
+
+                }
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+    }
+
     @Override
     public void exportPartnerExcelByBd(AnalysisBean analysisBean, HttpServletResponse httpResponse, JSONObject manager) throws IOException {
         OutputStream ous = null;
@@ -294,8 +365,6 @@ public class BDAnalysisServiceImpl implements BDAnalysisService {
         cell20.setCellValue(text20);
 
 
-
-
         for (int i = 0; i < monthTotalSale.size(); i++) {
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 2 * i + 2, 2 * i + 3));
             HSSFCell cell02 = row0.createCell(i * 2 + 2);
@@ -319,8 +388,7 @@ public class BDAnalysisServiceImpl implements BDAnalysisService {
                 BigDecimal total = monthTotalSale.get(i).getBigDecimal("total");
                 if (lastTotal.compareTo(new BigDecimal(0)) == 0 && total.compareTo(new BigDecimal(0)) != 0) {
                     rate = 100;
-              }
+                } else if (lastTotal.compareTo(new BigDecimal(0)) == 0 && total.compareTo(new BigDecimal(0)) == 0) {
-              else if (lastTotal.compareTo(new BigDecimal(0))==0 && total.compareTo(new BigDecimal(0)) ==0){
                     rate = 0;
                 } else {
                     rate = total.subtract(lastTotal).multiply(new BigDecimal(100)).divide(lastTotal, 2, BigDecimal.ROUND_DOWN).doubleValue();
@@ -359,8 +427,7 @@ public class BDAnalysisServiceImpl implements BDAnalysisService {
                     BigDecimal total = clients.get(m).getBigDecimal("month_total");
                     if (lastTotal.compareTo(new BigDecimal(0)) == 0 && total.compareTo(new BigDecimal(0)) != 0) {
                         rate = 100;
-                    }
+                    } else if (lastTotal.compareTo(new BigDecimal(0)) == 0 && total.compareTo(new BigDecimal(0)) == 0) {
-                    else if (lastTotal.compareTo(new BigDecimal(0))==0 && total.compareTo(new BigDecimal(0)) ==0){
                         rate = 0;
                     } else {
                         rate = total.subtract(lastTotal).multiply(new BigDecimal(100)).divide(lastTotal, 2, BigDecimal.ROUND_DOWN).doubleValue();

src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java

@@ -1,12 +1,19 @@
 package au.com.royalpay.payment.manage.analysis.core.impls;
 
 import au.com.royalpay.payment.manage.analysis.core.OrgAnalysisService;
+import au.com.royalpay.payment.manage.analysis.mappers.CustomerAndOrdersStatisticsMapper;
 import au.com.royalpay.payment.manage.analysis.mappers.TransactionAnalysisMapper;
+import au.com.royalpay.payment.manage.mappers.log.StatisticsBDSalesReportMapper;
 import au.com.royalpay.payment.manage.organizations.core.OrgManager;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,14 +24,52 @@ public class OrgAnalysisServiceImp implements OrgAnalysisService {
     @Resource
     private TransactionAnalysisMapper transactionAnalysisMapper;
 
+    @Resource
+    private StatisticsBDSalesReportMapper statisticsBDSalesReportMapper;
+
     @Resource
     private OrgManager orgManager;
 
+    @Resource
+    private CustomerAndOrdersStatisticsMapper customerAndOrdersStatisticsMapper;
+
     @Override
     public List<JSONObject> getSalesAnalysis(JSONObject params,JSONObject manager) {
         orgManager.checkOrgIds(manager,params);
-        List<JSONObject> OrgTransaction = transactionAnalysisMapper.getOrgTransactionAnalysis(params);
+        params.put("org_type",0);
-        return OrgTransaction;
+        List<JSONObject> OrgTransaction = statisticsBDSalesReportMapper.getPartnerAmountList(params);
+        List<JSONObject> newOrgTransaction  = new ArrayList<>();
+        OrgTransaction.forEach(item->{
+                newOrgTransaction.add(new JSONObject(){{
+                    put("org_id",item.getString("org_id"));
+                    put("org_name",item.getString("org_name"));
+                    put("amount",item.getString("clearing_amount"));
+                }}
+            );
+        });
+        //判断查询的最后一天是否是当日,若是当日,将当日数据添加至结果集内
+        SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+        if (sd.format(params.getDate("end")).equals(sd.format(DateUtils.addDays(new Date(), 1)))) {
+            params.put("begin", DateUtils.addDays(params.getDate("end"), -1));
+            params.put("end",params.getDate("end"));
+            List<JSONObject> todayOrgTransaction = transactionAnalysisMapper.getOrgTransactionAnalysis(params);
+            if(todayOrgTransaction.size()!=0){
+                for (JSONObject todayOrgTransactionItem : todayOrgTransaction) {
+                    boolean flag = false;
+                    for (JSONObject orgTransaction : newOrgTransaction) {
+                        if (orgTransaction.getString("org_id").equals(todayOrgTransactionItem.getString("org_id"))) {
+                            BigDecimal newAmount = orgTransaction.getBigDecimal("clearing_amount").add(todayOrgTransactionItem.getBigDecimal("amount"));
+                            orgTransaction.put("amount", newAmount);
+                            flag = true;
+                        }
+                    }
+                    if (!flag) {
+                        newOrgTransaction.add(todayOrgTransactionItem);
+                    }
+                }
+            }
+        }
+        return newOrgTransaction;
     }
 
     @Override

src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java

@@ -26,4 +26,7 @@ public interface BDAnalysisMapper {
     List<JSONObject> countApproved(JSONObject params);
 
     List<JSONObject> getBDSalePartnerReport(JSONObject jsonObject);
+
+    //获取指定一天销售数据
+    List<JSONObject> getOneDayBDSaleList(JSONObject params);
 }

src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java

@@ -108,6 +108,5 @@ public class ManualServiceimpl implements ManualService {
             }
 
         });
-        clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client_moniker, "tax_in_surcharge", false));
     }
 }

src/main/java/au/com/royalpay/payment/manage/dev/web/AnalysisController.java

@@ -0,0 +1,28 @@
+package au.com.royalpay.payment.manage.dev.web;
+
+import au.com.royalpay.payment.manage.analysis.core.BDAnalysisService;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@RestController
+@RequestMapping("/analysis")
+public class AnalysisController {
+
+    @Resource
+    private BDAnalysisService bdAnalysisService;
+
+
+    @GetMapping("/report/bd/sales")
+    public void reportDBSalesList(@RequestParam("date") String date) throws ParseException {
+        Date newDate = new SimpleDateFormat("yyyy-MM-dd").parse(date);
+        bdAnalysisService.generateReport(DateFormatUtils.format(newDate, "yyyy-MM-dd"));
+    }
+}

src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java

@@ -0,0 +1,29 @@
+package au.com.royalpay.payment.manage.mappers.log;
+
+import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by dulingling on 2019-08-14
+ */
+@AutoMapper(tablename = "statistics_bd_sales", pkName = "log_id")
+public interface StatisticsBDSalesReportMapper {
+
+    @AutoSql(type = SqlType.INSERT)
+    void save(JSONObject report);
+
+    List<JSONObject> getBDSaleList(JSONObject params);
+
+    List<JSONObject> getPartnerAmountList(JSONObject params);
+
+    JSONObject findByBDIdAndLogDate(@Param("bd_id") String bd_id, @Param("log_date")Date beginTime);
+
+    @AutoSql(type = SqlType.UPDATE)
+    void update(JSONObject existBDSalesReport);
+}

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -4997,7 +4997,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
             }
         }
-        clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client.getString("client_moniker"), "tax_in_surcharge", false));
         adminAccounts.forEach(o -> {
             sendClientPostponeNotify(o, expireDate);
         });
@@ -5017,7 +5016,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     public boolean postponeClientRate(int clientId, String clientMoniker, String nextYearExipryDate) {
         try {
             clientRateMapper.postponeMerchantRateByClientId(clientId);
-            clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, clientMoniker, "tax_in_surcharge", false));
             List<JSONObject> adminAccounts = clientAccountMapper.listAdminAccounts(clientId);
             adminAccounts.forEach(o -> {
                 sendClientPostponeNotify(o, nextYearExipryDate);

src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java

@@ -104,7 +104,6 @@ public class ClientContractServiceImpl implements ClientContractService {
         contract.put("confirm_time", now);
         contract.put("signatory", account.getString("display_name"));
         clientsContractMapper.update(contract);
-        clientManager.setClientTaxInSurcharge(clientAccountMapper.findById(account_id),client.getString("client_moniker"), false);
     }
 
     @Override

src/main/java/au/com/royalpay/payment/manage/task/DBSaleAnalysisTask.java

@@ -0,0 +1,34 @@
+package au.com.royalpay.payment.manage.task;
+
+import au.com.royalpay.payment.manage.analysis.core.BDAnalysisService;
+import au.com.royalpay.payment.tools.scheduler.SynchronizedScheduler;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * Created by dulingling on 2019-08-14
+ */
+@Component
+@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true")
+public class DBSaleAnalysisTask {
+
+    @Resource
+    private SynchronizedScheduler synchronizedScheduler;
+
+    @Resource
+    private BDAnalysisService bdAnalysisService;
+
+    @Scheduled(cron = "0 0 10 * * ?")
+    public void dailyReportAutoGenerateReport() {
+        synchronizedScheduler.executeProcess("manage_task:dailyReportAutoGenerateReport", 120_000, () -> {
+            Date yesterday = DateUtils.addDays(new Date(), -1);
+            bdAnalysisService.generateReport(DateFormatUtils.format(yesterday, "yyyy-MM-dd"));
+        });
+    }
+}

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

@@ -3,67 +3,41 @@
 <mapper namespace="au.com.royalpay.payment.manage.analysis.mappers.BDAnalysisMapper">
     <select id="getBDSaleList" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-            d.bd_name,
+        clinetBD.bd_name,
-            d.bd_id,
+        clinetBD.bd_id,
-            SUM(if(temp.transaction_type = 'Credit', temp.clearing_amount * d.proportion, -temp.clearing_amount * d.proportion)) total,
+        SUM(if(temp.transaction_type = 'Credit', temp.clearing_amount * clinetBD.proportion, -temp.clearing_amount * clinetBD.proportion)) total,
-            ifnull(SUM(if(temp.refund_id IS NOT NULL, if(temp.transaction_type='Debit', temp.clearing_amount, -temp.clearing_amount) * d.proportion, 0)), 0) refund_fee
+        ifnull(SUM(if(temp.refund_id IS NOT NULL, if(temp.transaction_type='Debit', temp.clearing_amount, -temp.clearing_amount) * clinetBD.proportion, 0)), 0) refund_fee
         FROM(
         SELECT
-                l.client_id,
+        trans.client_id,
-                l.clearing_amount,
+        trans.clearing_amount,
-                l.refund_id,
+        trans.refund_id,
-                l.transaction_type,
+        trans.transaction_type,
-                l.create_time
+        trans.create_time
-            FROM pmt_transactions l
+        FROM pmt_transactions AS trans
-            INNER JOIN pmt_orders o
+        WHERE (trans.transaction_type = 'Credit' OR trans.refund_id IS NOT NULL)
-            ON o.order_id = l.order_id
+        AND trans.system_generate = 0
+        AND trans.channel !='Settlement'
             <if test="begin != null">
-                AND l.create_time &gt;= #{begin}
+                AND trans.create_time &gt;= #{begin}
             </if>
             <if test="end != null">
-                AND l.create_time &lt; #{end}
+                AND trans.create_time &lt; #{end}
             </if>
-            <if test="begin_month">
+        ) AS temp
-                AND DATE_FORMAT(l.create_time, '%Y-%m') &gt;= #{begin_month}
+        INNER JOIN sys_client_bd AS clinetBD
-            </if>
+        ON temp.client_id = clinetBD.client_id
-            <if test="end_month">
+        AND clinetBD.start_date &lt;= temp.create_time
-                AND DATE_FORMAT(l.create_time, '%Y-%m') &lt;= #{end_month}
+        AND clinetBD.is_valid = '1'
-            </if>
+        AND (clinetBD.end_date IS NULL OR clinetBD.end_date > temp.create_time)
-            WHERE (l.transaction_type = 'Credit' OR l.refund_id IS NOT NULL)
+
-        ) temp
+        INNER JOIN sys_managers AS manage
-        INNER JOIN sys_client_bd d
+        ON manage.manager_id = clinetBD.bd_id
-        ON temp.client_id = d.client_id
+        <if test="org_id != null">
-        AND d.start_date &lt;= temp.create_time
+            AND manage.org_id = #{org_id}
-        AND d.is_valid = '1'
-        AND (d.end_date IS NULL OR d.end_date > temp.create_time)
-        <if test="org_id != null and org_ids == null">
-            INNER JOIN sys_managers m
-            ON m.manager_id = d.bd_id
-            AND m.org_id = #{org_id}
-        </if>
-        <if test="org_ids != null">
-            INNER JOIN sys_managers m
-            ON m.manager_id = d.bd_id
-            AND m.org_id IN
-            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">
-                #{org_id}
-            </foreach></if>
-        <if test="bd_group != null">
-            AND temp.client_id IN(
-                SELECT b.client_id
-                FROM sys_client_bd b
-                INNER JOIN financial_bd_config c
-                ON c.manager_id = b.bd_id
-                WHERE b.is_valid = 1
-                AND b.start_date &lt;= now()
-                AND (b.end_date IS NULL OR b.end_date &gt;= now())
-                AND (c.bd_group = #{bd_group} OR c.manager_id = #{bd_group})
-                <if test="bd_group_bd">
-                    AND c.manager_id = #{bd_group_bd}
-                </if>
-            )
         </if>
-        GROUP BY d.bd_id
+
+        GROUP BY clinetBD.bd_id
         ORDER BY total DESC
     </select>
 
@@ -220,4 +194,54 @@
         ORDER BY partner_counts DESC;
     </select>
 
+
+    <select id="getOneDayBDSaleList" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+        clinetBD.bd_name,
+        clinetBD.bd_id,
+        manage.org_id,
+        org.type AS org_type,
+        org.name AS org_name,
+        if(org.org_id=1,1,0) AS isOrg,
+        SUM( IF ( temp.transaction_type = 'Credit', temp.clearing_amount, 0 )) clearing_amount,
+        SUM(if(temp.transaction_type = 'Credit',temp.clearing_amount * clinetBD.proportion, -temp.clearing_amount * clinetBD.proportion)) pay_amount,
+        ifnull(SUM(if(temp.refund_id IS NOT NULL, if(temp.transaction_type='Debit', temp.clearing_amount, -temp.clearing_amount) * clinetBD.proportion, 0)), 0) refund_amount,
+        (SUM(if(temp.transaction_type = 'Credit', temp.clearing_amount * clinetBD.proportion, -temp.clearing_amount * clinetBD.proportion))) - (ifnull(SUM(if(temp.refund_id IS NOT NULL, if(temp.transaction_type='Debit', temp.clearing_amount, -temp.clearing_amount) * clinetBD.proportion, 0)), 0)) AS net_amount
+        FROM(
+            SELECT
+            trans.client_id,
+            trans.clearing_amount,
+            trans.refund_id,
+            trans.transaction_type,
+            trans.create_time
+            FROM pmt_transactions AS trans
+            WHERE (trans.transaction_type = 'Credit' OR trans.refund_id IS NOT NULL)
+            AND trans.system_generate = 0
+            AND trans.channel !='Settlement'
+            <if test="begin != null">
+                AND trans.create_time &gt;= #{begin}
+            </if>
+            <if test="end != null">
+                AND trans.create_time &lt; #{end}
+            </if>
+            )
+        AS temp
+        INNER JOIN sys_client_bd AS clinetBD
+        ON temp.client_id = clinetBD.client_id
+            AND clinetBD.start_date &lt;= temp.create_time
+            AND clinetBD.is_valid = '1'
+            AND (clinetBD.end_date IS NULL OR clinetBD.end_date > temp.create_time)
+        INNER JOIN sys_managers AS manage
+        ON manage.manager_id = clinetBD.bd_id
+          AND manage.org_id IS NOT NULL
+        INNER JOIN sys_org AS org
+        ON org.org_id = manage.org_id
+        <if test="org_id != null">
+            AND manage.org_id = #{org_id}
+        </if>
+        GROUP BY clinetBD.bd_id
+        ORDER BY pay_amount DESC
+
+    </select>
+
 </mapper>

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

@@ -716,20 +716,37 @@
 
     <select id="getOrgTransactionAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
-       SELECT o.org_id, o.name org_name,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount
+       SELECT
-        FROM pmt_transactions t
+          org.org_id,
-        INNER JOIN pmt_orders ord on ord.order_id = t.order_id
+          org.name org_name,
-        RIGHT JOIN sys_clients c on t.client_id = c.client_id and c.is_valid = 1
+          SUM(if(trans.transaction_type='Credit',trans.clearing_amount,0)) AS amount
-        RIGHT JOIN sys_org o on o.org_id = c.org_id and o.org_id != 1 and o.type=0
+        FROM pmt_transactions AS trans
-        where (t.transaction_type = 'Credit' or t.refund_id is not null)
+        RIGHT JOIN sys_clients AS clinet
-      ]]>
+          ON trans.client_id = clinet.client_id
-        <if test="begin!=null">and t.transaction_time &gt;= #{begin}</if>
+            AND clinet.is_valid = 1
-        <if test="end!=null">and t.transaction_time &lt;= #{end}</if>
+        RIGHT JOIN sys_org org
-        <if test="org_id!=null and org_ids==null">and o.org_id=#{org_id}</if>
+          ON org.org_id = clinet.org_id
-        <if test="org_ids!=null">and o.org_id in
+            AND org.org_id != 1
+            AND org.type=0
+        WHERE trans.system_generate=0
+            AND trans.channel !='Settlement'
+            AND( trans.transaction_type = 'Credit' OR trans.refund_id IS NOT NULL )
+      ]]>
+        <if test="begin!=null">
+            AND trans.transaction_time &gt;= #{begin}
+        </if>
+        <if test="end!=null">
+            AND trans.transaction_time &lt;= #{end}
+        </if>
+        <if test="org_id!=null and org_ids==null">
+            AND org.org_id=#{org_id}
+        </if>
+        <if test="org_ids!=null">
+            AND org.org_id in
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
         </if>
-        GROUP BY o.org_id order by amount desc
+        GROUP BY org.org_id
+        ORDER BY amount DESC
     </select>
 
     <select id="getPartnersAmountByOrg" resultType="com.alibaba.fastjson.JSONObject">

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

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="au.com.royalpay.payment.manage.mappers.log.StatisticsBDSalesReportMapper">
+    <select id="getBDSaleList" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            bd_id,
+            bd_name,
+            org_id,
+            org_name,
+            SUM(pay_amount) AS total,
+            SUM(refund_amount) AS refund_fee
+        FROM statistics_bd_sales
+        <where>
+            <if test="org_id != null">
+                AND org_id = #{org_id}
+            </if>
+            <if test="org_type != null">
+                AND org_type = #{org_type}
+            </if>
+            <if test="begin != null">
+                AND log_date &gt;= #{begin}
+            </if>
+            <if test="end != null">
+                AND log_date &lt; #{end}
+            </if>
+            <if test="org_ids!=null">
+                AND org.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
+            </if>
+        </where>
+        GROUP BY bd_id
+        ORDER BY total DESC
+    </select>
+
+
+    <select id="getPartnerAmountList" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+        bd_id,
+        bd_name,
+        org_id,
+        org_name,
+        SUM(clearing_amount) AS clearing_amount,
+        SUM(pay_amount) AS total,
+        SUM(refund_amount) AS refund_fee
+        FROM statistics_bd_sales
+        WHERE org_id !=1
+            <if test="org_id != null">
+                AND org_id = #{org_id}
+            </if>
+            <if test="org_type != null">
+                AND org_type = #{org_type}
+            </if>
+            <if test="begin != null">
+                AND log_date &gt;= #{begin}
+            </if>
+            <if test="end != null">
+                AND log_date &lt; #{end}
+            </if>
+            <if test="org_ids!=null">
+                AND org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
+            </if>
+        GROUP BY bd_id
+        ORDER BY total DESC
+    </select>
+
+    <select id="findByBDIdAndLogDate" resultType="com.alibaba.fastjson.JSONObject">
+      SELECT
+          log_id,
+          org_id,
+          isOrg,
+          org_name,
+          org_type,
+          bd_id,
+          bd_name,
+          log_date,
+          pay_amount,
+          refund_amount,
+          net_amount,
+          create_time,
+          clearing_amount
+       FROM statistics_bd_sales
+      WHERE bd_id = #{bd_id} AND log_date = #{log_date}
+    </select>
+
+</mapper>

src/main/ui/static/analysis/bd-sale-volume.js

@@ -76,7 +76,6 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts', './bd/analysis-b
             };
 
             $scope.loadSale = function () {
-
                 var params = angular.copy($scope.params);
                 if (params.begin) {
                     params.begin = $filter('date')(params.begin, 'yyyyMMdd');
@@ -88,6 +87,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts', './bd/analysis-b
                 } else {
                     params.end = $filter('date')(new Date(), 'yyyyMMdd');
                 }
+                params.org_id =1;
                 $http.get('/analysis/bd/sales', {params: params}).then(function (resp) {
                     $scope.sales = resp.data;
                     loadSaleChart();

src/main/ui/static/analysis/org-tranaction-analysis.js

@@ -59,6 +59,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./org/analysis-o
             $scope.showOrg = 'Organization';
             $http.get('/sys/orgs', {params: {}}).then(function (resp) {
                 $scope.orgs = resp.data;
+                $scope.orgs.splice($scope.orgs.findIndex(item => item.org_id === 1), 1)
             });
         }
 
@@ -98,6 +99,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./org/analysis-o
                 $scope.future_loading = false;
             });
         };
+        $scope.chooseToday()
         $scope.chooseOrgId = function (org) {
             if (org == 'all') {
                 delete $scope.params.org_id;

src/main/ui/static/analysis/templates/bd_sale_analysis.html

@@ -68,19 +68,6 @@
                                                     <a role="button" class="btn btn-default btn-sm"
                                                        ng-click="thisYear()">This Year</a>
                                                 </div>
-                                                <div uib-dropdown ng-if="orgs" class="btn-group">
-
-                                                    <button id="single-button" type="button" class="btn btn-default"
-                                                            uib-dropdown-toggle ng-disabled="disabled">
-                                                        {{showOrg}} <span class="caret"></span>
-                                                    </button>
-                                                    <ul class="dropdown-menu" uib-dropdown-menu
-                                                        aria-labelledby="single-button">
-                                                        <li><a ng-click="chooseOrg('all')">All</a></li>
-                                                        <li ng-repeat="org in orgs"><a ng-click="chooseOrg(org)">{{org.name}}</a>
-                                                        </li>
-                                                    </ul>
-                                                </div>
                                                 <button class="btn btn-success" type="button" ng-click="loadSale()">
                                                     <i class="fa fa-search"></i>
                                                 </button>

src/main/ui/static/analysis/templates/org_sale_analysis.html

@@ -60,10 +60,6 @@
                                         <a role="button" class="btn btn-default btn-sm" ng-click="lastMonth()">Last
                                             Month</a>
                                     </div>
-                                    <div class="btn-group">
-                                        <a role="button" class="btn btn-default btn-sm" ng-click="thisYear()">This
-                                            Year</a>
-                                    </div>
                                     <div uib-dropdown ng-if="orgs" class="btn-group">
                                         <button id="single-button" type="button" class="btn btn-default"
                                                 uib-dropdown-toggle ng-disabled="disabled">

src/main/ui/static/payment/partner/partner-manage.js

@@ -3751,7 +3751,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.uploadAgreementFile = function (file) {
             if (file != null) {
                 if (file.size > 10 * 1024 * 1024) {
-                    commonDialog.alert({title: 'Error', content: '文件大小不能超过5MB，请压缩后重试', type: 'error'})
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过10MB，请压缩后重试', type: 'error'})
                 } else {
                     $scope.agreementFileProgress = {value: 0};
                     Upload.upload({

src/main/ui/static/templates/alipay/v4/payment.js

@@ -261,7 +261,7 @@ $(function () {
     });
 
     $('#key_P').click(function () {
-        dataCache.remark = $('.remark-textarea').val();
+        dataCache.remark = $('.remark-textarea-new').val();
         if (window.requireRemark) {
             if (!dataCache.remark) {
                 var config = {
@@ -275,7 +275,7 @@ $(function () {
     });
 
     $('#key_P').bind('touchstart', function () {
-        dataCache.remark = $('.remark-textarea').val();
+        dataCache.remark = $('.remark-textarea-new').val();
         if (window.requireRemark) {
             if (!dataCache.remark) {
                 return;

src/main/ui/static/templates/payment/v4/payment.css

@@ -16,6 +16,7 @@
     margin-top: 15px;
     margin-bottom: 15px;
 }
+
 body {
     -webkit-touch-callout: auto;
     -webkit-user-select: auto;
@@ -30,12 +31,14 @@ body {
 div, span, p, ul, li {
     box-sizing: border-box;
 }
+
 .warning-sm {
     color: red;
     font-size: 10px;
     transform-origin: left;
     transform: scale(0.8);
 }
+
 .weui_grid {
     padding: 7px;
     height: 53px;
@@ -169,7 +172,7 @@ input.value:focus {
     right: 0;
     bottom: 0;
     overflow-x: hidden;
-    background-color: #fbf9fe;
+    background-color: #FFFFFF;
 }
 
 .new_year {
@@ -181,6 +184,7 @@ input.value:focus {
     z-index: -1;
     border-radius: 0 0 25px 25px;
 }
+
 .bankpay {
     text-align: center;
     padding: 20px;
@@ -194,6 +198,7 @@ input.value:focus {
         color: #FFFFFF;
     }
 }
+
 .row {
     width: 100%;
     padding: 0 30px;
@@ -466,8 +471,9 @@ input.value:focus {
 #coupon-box-toggle {
     padding: 0 20px;
     margin-bottom: 10px;
+    margin-top: 15px;
     text-align: right;
-    color: #30af69;
+    color: #FF7E28;
     font-size: 12px;
     cursor: pointer;
 }
@@ -535,7 +541,7 @@ input.value:focus {
 .coupons-container .coupon-box-title > .title {
     float: left;
     display: block;
-    color: #0BB20C;
+    color: #FF7E28;
 }
 
 .coupons-container .coupon-box-title > #close-coupon-box {
@@ -571,6 +577,25 @@ input.value:focus {
     -webkit-appearance: none;
 }
 
+.remark-textarea-new {
+    background-color: #FFFFFF;
+    box-shadow: none;
+    font-size: 13px;
+    width: calc(100% - 40px);
+    margin: 0 20px;
+    padding: 10px 0;
+    height: 18px;
+    border: 1px solid #FFFFFF;
+    border-radius: 0;
+    border-bottom-color: #BCBCBC;
+    -webkit-appearance: none;
+}
+
+.remark-textarea-new::-webkit-input-placeholder {
+    font-size: 13px;
+    color: #BCBCBC;
+}
+
 .remark-textarea::-webkit-input-placeholder {
     font-size: 13px;
     color: #BCBCBC;
@@ -614,6 +639,7 @@ input.value:focus {
     cursor: pointer;
     margin: 11px;
 }
+
 input::-webkit-input-placeholder {
     font-size: 50px;
     color: #FFFFFF;
@@ -633,3 +659,13 @@ input::-webkit-input-placeholder{
     padding-left: 10px;
     padding-top: 20px;
 }
+
+.advertisement {
+    display: flex;
+    justify-content: center;
+    margin-top: 10px;
+}
+
+.arrow-color {
+    color: #FF7E28;
+}

src/main/ui/static/templates/payment/v4/payment.js

@@ -253,7 +253,7 @@ $(function () {
     });
 
     $('#key_P').click(function () {
-        dataCache.remark = $('.remark-textarea').val();
+        dataCache.remark = $('.remark-textarea-new').val();
         if (window.requireRemark) {
             if (!dataCache.remark) {
                 var config = {
@@ -267,7 +267,7 @@ $(function () {
     });
 
     $('#key_P').bind('touchstart', function () {
-        dataCache.remark = $('.remark-textarea').val();
+        dataCache.remark = $('.remark-textarea-new').val();
         if (window.requireRemark) {
             if (!dataCache.remark) {
                 return;

src/test/java/au/com/royalpay/payment/manage/task/DBAnalysisTaskTest.java

@@ -0,0 +1,28 @@
+package au.com.royalpay.payment.manage.task;
+
+import au.com.royalpay.payment.manage.analysis.core.BDAnalysisService;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class DBAnalysisTaskTest {
+
+    @Resource
+    private BDAnalysisService bdAnalysisService;
+
+    @Test
+    public void test(){
+        for (int i = 1;i<=365;i++){
+            Date yesterday = DateUtils.addDays(new Date(), -i);
+            bdAnalysisService.generateReport(DateFormatUtils.format(yesterday, "yyyy-MM-dd"));
+        }
+    }
+}