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

# Conflicts:
#	src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

pom.xml

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

src/db/modify.sql

@@ -722,3 +722,5 @@ update pmt_custom_reports set report_serial=uuid();
 
 alter pmt_custom_reports add PRIMARY key (report_serial);
 alter table sys_org add COLUMN  `state` varchar(20) DEFAULT NULL COMMENT '州 (使用标准码 NSW,QLD,WA,VIC,ACT,NT,TAS,SA)';
+
+INSERT INTO `royalpay`.`sys_configs`(`config_key`, `config_value`, `config_desc`) VALUES ('rick_interior_send_email', 'dll19920503@qq.com', '内部调用测试发送邮箱');

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,14 +3,19 @@ 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.analysis.mappers.TransactionAnalysisMapper;
+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.*;
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.omg.PortableInterceptor.SYSTEM_EXCEPTION;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -18,8 +23,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 +39,12 @@ public class BDAnalysisServiceImpl implements BDAnalysisService {
     @Resource
     private BDAnalysisMapper bdAnalysisMapper;
 
+    @Resource
+    private StatisticsBDSalesReportMapper bdSalesReportMapper;
+
+    @Resource
+    private TransactionAnalysisMapper transactionAnalysisMapper;
+
 
     @Override
     public List<JSONObject> getSalesAnalysis(JSONObject jsonObject) {
@@ -38,7 +53,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 +61,30 @@ 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",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 +181,62 @@ 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,0);
+                    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);
+                    }
+                }
+            }
+            List<JSONObject> orgSaleList= transactionAnalysisMapper.getOneDayOrgMerchantSaleList(params);
+            if (orgSaleList.size() != 0) {
+                for (JSONObject item : orgSaleList) {
+                    JSONObject existOrgSalesReport = bdSalesReportMapper.findByBDIdAndLogDate(item.getString("bd_id"),beginTime,1);
+                    if(existOrgSalesReport==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{
+                        existOrgSalesReport.put("pay_amount",item.getString("pay_amount"));
+                        existOrgSalesReport.put("refund_amount",item.getString("refund_amount"));
+                        existOrgSalesReport.put("net_amount",item.getString("net_amount"));
+                        bdSalesReportMapper.update(existOrgSalesReport);
+                    }
+
+                }
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+    }
+
     @Override
     public void exportPartnerExcelByBd(AnalysisBean analysisBean, HttpServletResponse httpResponse, JSONObject manager) throws IOException {
         OutputStream ous = null;
@@ -294,8 +387,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 +410,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 +449,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,53 @@ 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.getOneDayOrgMerchantSaleList(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("amount").add(todayOrgTransactionItem.getBigDecimal("clearing_amount"));
+                            orgTransaction.put("amount", newAmount);
+                            flag = true;
+                        }
+                    }
+                    if (!flag) {
+                        todayOrgTransactionItem.put("amount",todayOrgTransactionItem.getString("clearing_amount"));
+                        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/analysis/mappers/TransactionAnalysisMapper.java

@@ -77,6 +77,9 @@ public interface TransactionAnalysisMapper {
 
     JSONObject getClientTransaction(JSONObject params);
 
+    List<JSONObject> getWeekClientTransaction(JSONObject params);
+
+
     @CountRef(".countAreaMerchantAmountAnalysis")
     PageList<JSONObject> getAreaMerchantAmountAnalysis(JSONObject params, PageBounds pagination);
 
@@ -93,4 +96,6 @@ public interface TransactionAnalysisMapper {
      * @return
      */
     BigDecimal getCnyAmount(JSONObject params);
+
+    List<JSONObject> getOneDayOrgMerchantSaleList(JSONObject params);
 }

src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java

@@ -26,6 +26,8 @@ import javax.servlet.http.HttpServletResponse;
 public interface RetailAppService {
     JSONObject getTransactionCommonData(JSONObject device, AppQueryBean appQueryBean);
 
+    List<JSONObject> getTransactionCommonWeekData(JSONObject device, AppQueryBean appQueryBean);
+
     JSONObject getClientSettlementLog(JSONObject device, AppQueryBean appQueryBean);
 
     JSONObject getTransactionLogsByClearingDetailId(JSONObject device, int clearing_detail_id, String timezone);

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -109,7 +109,6 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Resource;
-import javax.imageio.ImageIO;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
@@ -270,6 +269,27 @@ public class RetailAppServiceImp implements RetailAppService {
         return res;
     }
 
+    @Override
+    public List<JSONObject> getTransactionCommonWeekData(JSONObject device, AppQueryBean appQueryBean) {
+        String clientType = device.getString("client_type");
+        deviceSupport.findRegister(clientType);
+        int client_id = device.getIntValue("client_id");
+        JSONObject client = clientManager.getClientInfo(client_id);
+        String timezone = client.getString("timezone");
+        if (timezone != null && !timezone.isEmpty()) {
+            appQueryBean.setTimezone(timezone);
+        }
+        JSONObject params = appQueryBean.toParams();
+        setAllClientIds(params, client_id);
+        params.put("client_id", client_id);
+        List<JSONObject> res = transactionAnalysisMapper.getWeekClientTransaction(params);
+        res.forEach(r -> {
+            r.put("date",r.getDate("date").toString());
+        });
+        res.remove(res.size() - 1);
+        return res;
+    }
+
     @Override
     public JSONObject getTradeCommonDate(JSONObject device, AppQueryBean appQueryBean) {
         String clientType = device.getString("client_type");
@@ -310,7 +330,7 @@ public class RetailAppServiceImp implements RetailAppService {
     @Override
     public JSONObject getQrcode(JSONObject device, QRCodeConfig config, int client_id) {
         JSONObject client = merchantInfoProvider.getClientInfo(client_id);
-        String url = PlatformEnvironment.getEnv().concatUrl("/api/payment/v1.0/partners/" + client.getString("client_moniker"));
+        String url = PlatformEnvironment.getEnv().concatUrl("/api/v1.0/payment/partners/" + client.getString("client_moniker"));
         if (config.isCNY()) {
             url += "_CNY";
         }

src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java

@@ -104,6 +104,12 @@ public class RetailAppController {
         return retailAppService.getTransactionCommonData(device, appQueryBean);
     }
 
+    // 查询7天的交易金额
+    @RequestMapping(value = "/common/week", method = RequestMethod.GET)
+    public List<JSONObject> getTransactionCommonWeekData(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device, AppQueryBean appQueryBean) {
+        return retailAppService.getTransactionCommonWeekData(device, appQueryBean);
+    }
+
     /**
      * 流水页今日数据
      *

src/main/java/au/com/royalpay/payment/manage/apps/core/impls/AppPermissionSupportImpl.java

@@ -19,9 +19,7 @@ import javax.annotation.Resource;
 public class AppPermissionSupportImpl implements AppPermissionSupport {
     @Resource
     private SysAppsMapper sysAppsMapper;
-    private final String signTemplate = "%s&%s&%s&%s&%s";
     private Logger logger = LoggerFactory.getLogger(getClass());
-    public static final String[] NODES_IP_ADDRESSS = new String[]{"119.28.3.196","150.109.64.108", "119.28.178.24", "119.28.24.146", "119.28.77.25"};
 
     @Override
     public JSONObject validateSign(String appid, long timestamp, String ip, String requestUri, String sign) {
@@ -41,19 +39,10 @@ public class AppPermissionSupportImpl implements AppPermissionSupport {
             throw new ForbiddenException("Timeout");
         }
         String auth = app.getString("auth_code");
-        String str = String.format(signTemplate, appid, auth, timestamp, requestUri, ip);
+        String str = String.join("&", appid, auth, timestamp + "", requestUri);
-        logger.debug("sso-str before hash:" + str);
+        logger.debug("sso-str before hash:{}", str);
         String hash = DigestUtils.sha256Hex(str).toLowerCase();
         if (!StringUtils.equals(hash, sign)) {
-            for (String nodeIp : NODES_IP_ADDRESSS) {
-                logger.error("[{}]请求的签名有误，使用节点 [{}] 签名", appid, nodeIp);
-                str = String.format(signTemplate, appid, auth, timestamp, requestUri, nodeIp);
-                logger.debug("NodeIp check sso-str before hash:" + str);
-                hash = DigestUtils.sha256Hex(str).toLowerCase();
-                if (StringUtils.equals(hash, sign)) {
-                    return app;
-                }
-            }
             throw new ForbiddenException("InvalidSign");
         }
         return app;

src/main/java/au/com/royalpay/payment/manage/apps/core/impls/SSOSupportImpl.java

@@ -58,7 +58,7 @@ public class SSOSupportImpl implements SSOSupport {
     public String cacheClient(String appid, JSONObject clientUser) {
         String code = Long.toString(System.currentTimeMillis(), 36) + RandomStringUtils.random(10, true, true);
         String cacheKey = accountCacheKey("client", appid, code);
-        logger.debug("========cacheClient,key:"+cacheKey+"========");
+        logger.debug("========cacheClient,key:{}========", cacheKey);
         stringRedisTemplate.boundValueOps(cacheKey).set(clientUser.toJSONString(), 30, TimeUnit.SECONDS);
         return code;
     }
@@ -70,7 +70,7 @@ public class SSOSupportImpl implements SSOSupport {
 
     private JSONObject getCachedAccount(String appid, String code, String type) {
         String cacheKey = accountCacheKey(type, appid, code);
-        logger.debug("========getCachedAccount,key:"+cacheKey+"========");
+        logger.debug("========getCachedAccount,key:{}========", cacheKey);
         String jsonstr = stringRedisTemplate.boundValueOps(cacheKey).get();
         stringRedisTemplate.delete(cacheKey);
         if (jsonstr != null) {
@@ -81,7 +81,7 @@ public class SSOSupportImpl implements SSOSupport {
 
     @Override
     public JSONObject getCachedClientAccount(String appid, String code) {
-        logger.debug("========getCachedClientAccount,appid:"+appid+",code:"+code+"========");
+        logger.debug("========getCachedClientAccount,appid:{},code:{}========", appid, code);
         return getCachedAccount(appid, code, "client");
     }
 

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,@Param("isOrg") int isOrg);
+
+    @AutoSql(type = SqlType.UPDATE)
+    void update(JSONObject existBDSalesReport);
+}

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

@@ -5376,7 +5376,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);
         });
@@ -5396,7 +5395,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/riskbusiness/core/impl/RiskBusinessServiceImpl.java

@@ -32,6 +32,7 @@ import au.com.royalpay.payment.tools.connections.mpsupport.exceptions.WechatExce
 import au.com.royalpay.payment.tools.device.message.AppMessage;
 import au.com.royalpay.payment.tools.device.message.AppMsgSender;
 import au.com.royalpay.payment.tools.env.PlatformEnvironment;
+import au.com.royalpay.payment.tools.env.SysConfigManager;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.exceptions.event.WechatExceptionEvent;
 import au.com.royalpay.payment.tools.locale.LocaleSupport;
@@ -134,6 +135,9 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
     private MpWechatApiProvider mpWechatApiProvider;
     private ApplicationEventPublisher publisher;
 
+    @Resource
+    private SysConfigManager sysConfigManager;
+
 
     @Resource
     public void setAppMsgSenders(AppMsgSender[] senders) {
@@ -818,9 +822,9 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
          *     如果是内部调单，密送bd与上面定义的‘emailsBccs’
          * 如果没有勾选发送商户
          *     如果不是内部调单，直接发送商户；
-         *     如果是内部调单，则自定义“"18852852189@163.com"为收件人，密送同上
+         *     如果是内部调单，则自定义sys_configs配置中KEY为"rick_interior_send_email"为收件人，密送同上
          *
-         * Arrays.asList("18852852189@139.com", "1370256381@qq.com")为本地debug模式的测试邮箱
+         * Arrays.asList(自定义sys_configs配置中KEY为"rick_interior_send_email")为本地debug模式的测试邮箱
          */
         if (isSendClient == 1) {
             ctx.setVariable("emailsTos", clientEmails);
@@ -829,7 +833,8 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
                 ctx.setVariable("emailsCcs", null);
                 if (PlatformEnvironment.getEnv().isDebug()) {
                     emailsBccs = new ArrayList<>(Arrays.asList(
-                            "18852852189@139.com", "1370256381@qq.com"
+                            sysConfigManager.getSysConfig().getString("rick_interior_send_email"),
+                            sysConfigManager.getSysConfig().getString("rick_interior_send_email")
                     ));
                 }
                 emailsBccs.addAll(bdEmails);
@@ -839,13 +844,14 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
             if (orderType == RiskOrderTypeEnum.ROYALPAY_ORDER.getOrderType().intValue()) {
                 if (PlatformEnvironment.getEnv().isDebug()) {
                     emailsBccs = new ArrayList<>(Arrays.asList(
-                            "18852852189@139.com", "1370256381@qq.com"
+                            sysConfigManager.getSysConfig().getString("rick_interior_send_email"),
+                            sysConfigManager.getSysConfig().getString("rick_interior_send_email")
                     ));
                 }
                 emailsBccs.addAll(bdEmails);
                 ctx.setVariable("emailsBccs", emailsBccs);
                 ctx.setVariable("emailsTos", Arrays.asList(
-                        "18852852189@163.com"
+                        sysConfigManager.getSysConfig().getString("rick_interior_send_email")
                 ));
             }
         }

src/main/java/au/com/royalpay/payment/manage/surchargeAccount/core/impl/SurchargeAccountServiceImpl.java

@@ -125,7 +125,7 @@ public class SurchargeAccountServiceImpl implements SurchargeAccountService {
             transaction.put("bill_id", detailId);
             transaction.put("total_surcharge", BigDecimal.ZERO);
             transaction.put("tax_amount", BigDecimal.ZERO);
-            transaction.put("amount", detail.getBigDecimal("debit_amount").negate());
+            transaction.put("amount", detail.getBigDecimal("total_surcharge").negate());
             transaction.put("post_balance", surchargeAccount.getBigDecimal("balance").add(transaction.getBigDecimal("amount")));
             transaction.put("operation", manager.getString("manager_id"));
             transaction.put("create_time", new Date());

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 1 * * ?")
+    public void dailyReportAutoGenerateReport() {
+        synchronizedScheduler.executeProcess("manage_task:dailyDBSaleReportAutoGenerateReport", 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,45 @@
 <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.org_id,
-                l.clearing_amount,
+        trans.client_id,
-                l.refund_id,
+        trans.clearing_amount,
-                l.transaction_type,
+        trans.refund_id,
-                l.create_time
+        trans.transaction_type,
-            FROM pmt_transactions l
+        trans.create_time
-            INNER JOIN pmt_orders o
+        FROM pmt_transactions AS trans
-            ON o.order_id = l.order_id
+        WHERE (trans.transaction_type = 'Credit' OR trans.refund_id IS NOT NULL)
+        AND trans.system_generate = 0
+        AND trans.channel !='Settlement'
+        AND trans.channel != 'System'
         <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">
-                AND DATE_FORMAT(l.create_time, '%Y-%m') &gt;= #{begin_month}
             </if>
-            <if test="end_month">
+        ) AS temp
-                AND DATE_FORMAT(l.create_time, '%Y-%m') &lt;= #{end_month}
+
-            </if>
+        INNER JOIN sys_org AS org
-            WHERE (l.transaction_type = 'Credit' OR l.refund_id IS NOT NULL)
+        ON org.org_id = temp.org_id
-        ) temp
+        AND org.is_valid = 1
-        INNER JOIN sys_client_bd d
+        <if test="org_id != null">
-        ON temp.client_id = d.client_id
+            AND org.org_id = #{org_id}
-        AND d.start_date &lt;= temp.create_time
-        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
+
+        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)
+
+        GROUP BY clinetBD.bd_id
         ORDER BY total DESC
     </select>
 
@@ -220,4 +198,55 @@
         ORDER BY partner_counts DESC;
     </select>
 
+
+    <select id="getOneDayBDSaleList" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+        clinetBD.bd_name,
+        clinetBD.bd_id,
+        org.org_id,
+        org.type AS org_type,
+        org.name AS org_name,
+        0 AS isOrg,
+        0 AS 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.org_id,
+        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'
+        AND trans.channel != 'System'
+        <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_org AS org
+        ON org.org_id = temp.org_id
+        AND org.is_valid = 1
+        <if test="org_id != null">
+            AND manage.org_id = #{org_id}
+        </if>
+        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)
+
+        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,25 +716,45 @@
 
     <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,-trans.clearing_amount)) 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
+            AND clinet.is_valid = 1
+        RIGHT JOIN sys_org org
+          ON org.org_id = clinet.org_id
+            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 t.transaction_time &gt;= #{begin}</if>
+        <if test="begin!=null">
-        <if test="end!=null">and t.transaction_time &lt;= #{end}</if>
+            AND trans.transaction_time &gt;= #{begin}
-        <if test="org_id!=null and org_ids==null">and o.org_id=#{org_id}</if>
+        </if>
-        <if test="org_ids!=null">and o.org_id in
+        <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">
         <![CDATA[
-       SELECT c.client_moniker,c.short_name,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount
+       SELECT
+                c.client_moniker,
+                c.short_name,
+                SUM(IF(t.transaction_type = 'Credit', t.clearing_amount,-t.clearing_amount)) AS amount
         FROM pmt_transactions t
         INNER JOIN pmt_orders ord on ord.order_id = t.order_id
         RIGHT JOIN sys_clients c on t.client_id = c.client_id and c.is_valid = 1 AND c.org_id = #{org_id}
@@ -861,6 +881,41 @@
         </if>
     </select>
 
+    <select id="getWeekClientTransaction" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+        calendar.datelist AS date,
+        IFNULL( trade_amount, 0 ) AS trade_amount
+        FROM
+        calendar
+        LEFT JOIN (
+        SELECT
+        IFNULL( sum( IF ( l.transaction_type = 'Credit', l.clearing_amount, 0 ) ), 0 ) trade_amount,
+        DATE_FORMAT( l.transaction_time, '%Y-%m-%d' ) AS queryDate
+        FROM
+        pmt_transactions l
+        WHERE
+        l.channel != 'Settlement'
+        AND l.system_generate = 0
+        <if test="client_ids!=null">
+            AND l.client_id IN
+            <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
+                #{client_id}
+            </foreach>
+        </if>
+        <if test="client_ids==null and client_id != null">
+            AND l.client_id=#{client_id}
+        </if>
+        <if test="begin!=null">AND l.transaction_time &gt;= #{begin}</if>
+        <if test="end!=null">AND l.transaction_time &lt; #{end}</if>
+        GROUP BY
+        DATE_FORMAT( l.transaction_time, '%Y-%m-%d' )
+        ) AS ticketCount ON calendar.datelist = ticketCount.queryDate
+        WHERE
+        calendar.datelist &lt;= #{end} AND calendar.datelist &gt;= #{begin}
+        ORDER BY
+        calendar.datelist
+    </select>
+
 
     <select id="getAreaMerchantAmountAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         SELECT c.client_moniker,c.short_name,c.bd_user_name,sum(if(t.transaction_type='Credit',t.clearing_amount,0))
@@ -963,5 +1018,42 @@
         LIMIT 1;
     </select>
 
+    <select id="getOneDayOrgMerchantSaleList" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+        org.org_id AS org_id,
+        org.name AS org_name,
+        org.type AS org_type,
+        1 AS isOrg,
+        SUM(IF( trans.transaction_type = 'Credit', trans.clearing_amount, - trans.clearing_amount )) AS clearing_amount,
+        0 AS pay_amount,
+        0 AS refund_amount,
+        0 AS net_amount
+        FROM
+        pmt_transactions AS trans
+        INNER JOIN sys_org AS org ON trans.org_id = org.org_id
+        AND org.is_valid = 1
+        AND org.type = 0
+        AND org.citypartner = 1
+        AND org.commission = 1
+
+        WHERE
+        trans.channel != 'Settlement'
+        AND trans.channel != 'System'
+        AND trans.system_generate = 0
+        <if test="org_id != null">
+            AND org.org_id = #{org_id}
+        </if>
+        <if test="begin != null">
+            AND trans.create_time &gt;= #{begin}
+        </if>
+        <if test="end != null">
+            AND trans.create_time &lt; #{end}
+        </if>
+
+
+        GROUP BY
+        org.org_id
+    </select>
+
 
 </mapper>

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

@@ -0,0 +1,85 @@
+<?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 isOrg = 0
+            <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>
+        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 isOrg = 1 AND 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 org_id
+        ORDER BY clearing_amount 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} AND isOrg = #{isOrg}
+    </select>
+
+</mapper>

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

@@ -17,6 +17,7 @@
                    fsad.total_surcharge,
                    fsad.credit_amount,
                    fsad.debit_amount,
+                   fsad.checkout,
                    sc.client_moniker,
                    sc.short_name,
                    sc.company_name

src/main/resources/templates/mail/risk_upload_mail.html

@@ -100,7 +100,6 @@
             <th style="border: 1.0px solid;border-collapse: collapse;">Platform Transaction ID</th>
             <th style="border: 1.0px solid;border-collapse: collapse;">Order Description</th>
             <th style="border: 1.0px solid;border-collapse: collapse;">Customer ID</th>
-            <th style="border: 1.0px solid;border-collapse: collapse;">IP</th>
             <th style="border: 1.0px solid;border-collapse: collapse;">Total Amount</th>
             <th style="border: 1.0px solid;border-collapse: collapse;">Input Amount</th>
             <th style="border: 1.0px solid;border-collapse: collapse;">Pay Amount</th>
@@ -119,7 +118,6 @@
             <td th:text="${order.system_transaction_id}" style="border: 1.0px solid;border-collapse: collapse;"></td>
             <td th:text="${order.order_description}" style="border: 1.0px solid;border-collapse: collapse;"></td>
             <td th:text="${order.customer_id}" style="border: 1.0px solid;border-collapse: collapse;"></td>
-            <td th:text="${order.customer_ip}" style="border: 1.0px solid;border-collapse: collapse;"></td>
             <td th:text="${order.total_amount}" style="border: 1.0px solid;border-collapse: collapse;"></td>
             <td th:text="${order.display_amount}" style="border: 1.0px solid;border-collapse: collapse;"></td>
             <td th:text="${order.customer_payment_amount}" style="border: 1.0px solid;border-collapse: collapse;"></td>
@@ -132,6 +130,7 @@
         </tr>
         </tbody>
     </table>
+    <p th:if="${description != null}"><span th:text="${description}"></span></p>
     <p>请查收关于被抽查的订单交易的相关信息，并在<span style="background: #FCE824"><span th:text="${reply_date}"></span>下午6：00 (悉尼时间)前</span>将所需材料直接回复该邮件，未能按时提交完整证明材料，支付渠道将被关停，请您务必配合调查。感谢。<br>
         Please find sampled transactions in attachment, and reply required materials to this email <span style="background: #FCE824">before 6:00 pm <span th:text="${reply_date_english}"></span> (AEST).</span> If you can not provide qualified materials on time, the payment channels would be suspended or restricted with amount limit. Please be sure to assist the investigation. Thanks.</p>
     <!--<p>请点击此链接上传所需材料。<a th:href="${uploadUrl}"><span th:text="${uploadUrl}"></span></a><br>-->

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

@@ -229,6 +229,18 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 });
             };
 
+            $scope.exportPartnersExcel = function () {
+                var params = angular.copy($scope.params);
+                var param_str = keys(params).map(function (key) {
+                    var value = params[key];
+                    if (angular.isDate(value)) {
+                        value = $filter('date')(value, 'yyyy-MM-ddTHH:mm:ssZ')
+                    }
+                    return key + '=' + encodeURIComponent(value)
+                }).join('&');
+                window.open('/sys/partners/exporting_excel?'+param_str)
+            };
+
             /*$scope.loadLocations = function () {
                 var params = angular.copy($scope.params);
                 $http.get('/sys/partners/merchant/list_locations', {params: params}).then(function (resp) {

src/main/ui/static/payment/partner/templates/partners.html

@@ -386,6 +386,9 @@
                                                         ng-click="loadPartners(1)"><i
                                                         class="fa fa-search"></i> Search
                                                 </button>
+                                                <button class="btn btn-primary" type="button" ng-if="'export_clients_excel'|withFunc" ng-click="exportPartnersExcel()">
+                                                    <i class="fa fa-save"></i> Export
+                                                </button>
                                                 <!-- 商户分布以及商户进件位置转移 -->
                                                 <!--<button ng-if="mapFrame" class="btn btn-primary" type="button"
                                                         ng-click="loadLocations()"><i

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

@@ -587,6 +587,8 @@ input.value:focus {
     height: 18px;
     border: 1px solid #FFFFFF;
     border-radius: 0;
+    resize: none;
+    outline: none;
     border-bottom-color: #BCBCBC;
     -webkit-appearance: none;
 }

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"));
+        }
+    }
+}