Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

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

@@ -17,6 +17,7 @@ import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -174,7 +175,7 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
             params.put("settlement_fee", settleFee.getBigDecimal("settlement_fee"));
             params.put("channel", channel);
             params.put("last_update_date", new Date());
-            JSONObject sysClearData = getSystemClearingAmount(dateStr, null, channel);
+            JSONObject sysClearData = getSystemClearingAmount(dateStr, aliSettleLog, channel);
             if (sysClearData != null && sysClearData.size() > 0) {
                 params.put("sys_pay_fee", sysClearData.getBigDecimal("sys_pay_fee"));
                 params.put("sys_refund_fee", sysClearData.getBigDecimal("sys_refund_fee"));
@@ -292,22 +293,26 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
         return alipaySettleLog;
     }
 
-    public JSONObject getSystemClearingAmount(Date settle_date, SettlementLog settlementLog, String channel) throws Exception {
+    public JSONObject getSystemClearingAmount(Date settle_date, Object settlementLog, String channel) throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd 02:00:00");
         JSONObject sysLogs = new JSONObject();
         String start_date = null;
         String end_date = null;
         if (StringUtils.equals("Alipay", channel)) {
-
             JSONObject lastClearDay = estimateAnalysisMapper.findLastCleanDays(sdfClear.format(settle_date), 1);
             start_date = sdf.format(lastClearDay.getDate("date_str"));
             end_date = sdf.format(settle_date);
-            logger.info("Alipay System Settle Logs:"+start_date+"<====>" +end_date);
+            logger.info("Alipay System Settle Logs:" + start_date + "<====>" + end_date);
-
         } else if (StringUtils.equals("Wechat", channel)) {
-            start_date = sdf.format(settlementLog.getStart());
+            SettlementLog wechatSettleLog = (SettlementLog) settlementLog;
-            end_date = sdf.format(settlementLog.getEnd());
+            start_date = sdf.format(wechatSettleLog.getStart());
-            logger.info("Wechat System Settle Logs:"+start_date+"<====>" +end_date);
+            end_date = sdf.format(wechatSettleLog.getEnd());
+            logger.info("Wechat System Settle Logs:" + start_date + "<====>" + end_date);
+        } else if (StringUtils.equals("AlipayOnline", channel)) {
+            JSONObject alipayOnlineSettleLog = (JSONObject) settlementLog;
+            logger.info("AlipayOnline System Settle Logs:" + alipayOnlineSettleLog.getDate("min_time") + "<====>" + alipayOnlineSettleLog.getDate("max_time"));
+            start_date = sdf.format(alipayOnlineSettleLog.getDate("min_time"));
+            end_date = sdf.format(DateUtils.addDays(alipayOnlineSettleLog.getDate("max_time"), 1));
         } else {
             return null;
         }

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

@@ -62,7 +62,7 @@ public interface RetailAppService {
 
     JSONObject getClientCurrentRateNew(JSONObject device);
 
-    JSONObject listDailyTransactions(String dateStr, String timezone, JSONObject device);
+    JSONObject listDailyTransactions(String dateStr, String timezone, boolean thisDevOnly, JSONObject device);
 
     JSONObject getActivities(JSONObject device, String activity_page, int page, int limit);
 

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

@@ -952,7 +952,7 @@ public class RetailAppServiceImp implements RetailAppService {
     }
 
     @Override
-    public JSONObject listDailyTransactions(String dateStr, String timezone, JSONObject device) {
+    public JSONObject listDailyTransactions(String dateStr, String timezone, boolean thisDevOnly, JSONObject device) {
         try {
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
             dateFormat.setTimeZone(TimeZone.getTimeZone(timezone));
@@ -960,7 +960,7 @@ public class RetailAppServiceImp implements RetailAppService {
             String clientType = device.getString("client_type");
             DeviceRegister register = deviceSupport.findRegister(clientType);
             String devId = null;
-            if (register.includeDevId()) {
+            if (register.includeDevId() || thisDevOnly) {
                 devId = device.getString("dev_id");
             }
             Date to = DateUtils.addDays(date, 1);

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

@@ -116,7 +116,7 @@ public class RetailAppController {
 
     @RequestMapping(value = "/notice/{noticeId}", method = RequestMethod.PUT)
     public void updateNoticePartnerHasRead(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device, @PathVariable String noticeId, @RequestBody JSONObject account_param) {
-        if (!device.getString("account_id").equals(account_param.getString("account_id"))){
+        if (!device.getString("account_id").equals(account_param.getString("account_id"))) {
             throw new ForbiddenException("You have no permission");
         }
         retailAppService.updateReadStatus(device, noticeId);
@@ -200,8 +200,9 @@ public class RetailAppController {
 
     @RequestMapping(value = "/daily_transactions/date/{dateStr}", method = RequestMethod.GET)
     public JSONObject listDailyTransactions(@PathVariable String dateStr, @RequestParam(defaultValue = "Australia/Melbourne") String timezone,
+                                            @RequestParam(defaultValue = "false") boolean thisdevice,
                                             @ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
-        return retailAppService.listDailyTransactions(dateStr, timezone, device);
+        return retailAppService.listDailyTransactions(dateStr, timezone, thisdevice, device);
     }
 
     @RequestMapping(value = "/modify/retail_surcharge", method = RequestMethod.PUT)
@@ -250,11 +251,11 @@ public class RetailAppController {
     }
 
     @RequestMapping(value = "/cash_back/clean_info", method = RequestMethod.GET)
-    public JSONObject getCashbackCleanInfo(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device,@RequestParam(value = "client_id",required = false) String client_id) {
+    public JSONObject getCashbackCleanInfo(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device, @RequestParam(value = "client_id", required = false) String client_id) {
-        if (client_id==null){
+        if (client_id == null) {
-            client_id=device.getString("client_id");
+            client_id = device.getString("client_id");
         }
-        return retailAppService.getCashbackCleanInfo(device,client_id);
+        return retailAppService.getCashbackCleanInfo(device, client_id);
     }
 
     @RequestMapping(value = "/partner_signin_app_qrcode/{codeId}", method = RequestMethod.GET)
@@ -289,9 +290,10 @@ public class RetailAppController {
     public JSONObject getAd(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
         return retailAppService.getAd(device);
     }
+
     @RequestMapping(value = "/ads/{article_id}", method = RequestMethod.GET)
-    public JSONObject getAdDetail(@PathVariable String article_id,@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
+    public JSONObject getAdDetail(@PathVariable String article_id, @ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
-        return retailAppService.getAdDetail(device,article_id);
+        return retailAppService.getAdDetail(device, article_id);
     }
 
 

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

@@ -349,9 +349,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             if (bdConfig != null) {
                 params.put("bd_group", bdConfig.getString("bd_group"));
                 List<JSONObject> listGroupBds = financialBDConfigMapper.listGroupBds(bdConfig.getString("bd_group"));
-                List<Integer> bdUserId = listGroupBds.stream().map(groupBd->groupBd.getIntValue("manager_id")).collect(Collectors.toList());
+                List<String> bdUserId = listGroupBds.stream().map(groupBd->groupBd.getString("manager_id")).collect(Collectors.toList());
                 if(params.containsKey("bd_user")){
-                    if(!bdUserId.contains(params.getIntValue("bd_user"))){
+                    if(!bdUserId.contains(params.getString("bd_user"))){
                         params.remove("bd_user");
                     }
                 }

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

@@ -110,7 +110,7 @@
             </div>
         </div>
         <div class="box box-default">
-            <div class="box-header">BD Leader Commission</div>
+            <div class="box-header">BD Manager Commission</div>
             <div class="box-body table-responsive">
                 <table class="table table-bordered table-hover table-striped">
                     <thead>
@@ -138,7 +138,7 @@
             </div>
         </div>
         <!--<div class="box box-default">-->
-            <div class="box box-warning">
+            <!--<div class="box box-warning">
                 <div class="box-header">BD Manager Commission</div>
                 <div class="box-body">
                     <div class="row">
@@ -150,7 +150,7 @@
                         </div>
                     </div>
                 </div>
-            </div>
+            </div>-->
         <div class="box box-success">
                 <div class="box-header">Director Commission</div>
                 <div class="box-body">