From f385c488a04bcb717ab6cbaee2f0101b1033be76 Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Thu, 1 Mar 2018 12:10:28 +0800 Subject: [PATCH 1/4] fix bd String --- .../manage/bdprize/core/BDPrizeService.java | 2 +- .../bdprize/core/impls/BDPrizeServiceImpl.java | 6 +++--- .../manage/bdprize/web/BDPrizeController.java | 4 ++-- .../financial/FinancialBDPrizeLogMapper.java | 6 +++--- .../manage/merchants/beans/PartnerQuery.java | 14 +++++--------- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/BDPrizeService.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/BDPrizeService.java index f4f27fd87..b9e1225d8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/BDPrizeService.java +++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/BDPrizeService.java @@ -21,7 +21,7 @@ public interface BDPrizeService { JSONObject findReport(String month) throws Exception; - JSONObject getBDReport(String month, int managerId); + JSONObject getBDReport(String month, String managerId); List getRateConfig(); diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java index 7a50584cd..8c8e53b1a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java @@ -246,7 +246,7 @@ public class BDPrizeServiceImpl implements BDPrizeService { } @Override - public JSONObject getBDReport(String month, int managerId) { + public JSONObject getBDReport(String month, String managerId) { try { Date mon = DateUtils.parseDate(month, new String[]{"yyyy-MM"}); month = DateFormatUtils.format(mon, "yyyy-MM"); @@ -281,13 +281,13 @@ public class BDPrizeServiceImpl implements BDPrizeService { JSONObject totalDetail = financialBDPrizeLogMapper.findByReportAndBDTotal(report.getString("record_id"), managerId); log.putAll(totalDetail); + JSONObject bdInfo = managerMapper.findById(managerId); - if (ManagerRole.BD_LEADER.hasRole(managerId)) { + if (ManagerRole.BD_LEADER.hasRole(bdInfo.getIntValue("role"))) { JSONObject groupPrizeLog = financialBDPrizeLogMapper.findByReportAndGroup(report.getString("record_id"), managerId); log.put("group_prize", groupPrizeLog); } - JSONObject bdInfo = managerMapper.findById(String.valueOf(managerId)); if (bdInfo == null) { log.put("leftCompany", true); } diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/web/BDPrizeController.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/web/BDPrizeController.java index 1cf9e141c..5efff9290 100644 --- a/src/main/java/au/com/royalpay/payment/manage/bdprize/web/BDPrizeController.java +++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/web/BDPrizeController.java @@ -45,13 +45,13 @@ public class BDPrizeController { } @ManagerMapping(value = "/records/{month}/bd_users/{managerId}", method = RequestMethod.GET, role = ManagerRole.FINANCIAL_STAFF) - public JSONObject getBDUserReportDetail(@PathVariable String month, @PathVariable int managerId) { + public JSONObject getBDUserReportDetail(@PathVariable String month, @PathVariable String managerId) { return bdPrizeService.getBDReport(month, managerId); } @ManagerMapping(value = "/records/{month}/bd_user_detail", method = RequestMethod.GET, role = ManagerRole.BD_USER) public JSONObject getBDUserReportDetailForBD(@PathVariable String month, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { - return bdPrizeService.getBDReport(month, manager.getIntValue("manager_id")); + return bdPrizeService.getBDReport(month, manager.getString("manager_id")); } @ManagerMapping(value = "/config/rates", method = RequestMethod.GET, role = {ManagerRole.BD_USER, ManagerRole.FINANCIAL_STAFF, ManagerRole.ADMIN}) diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java index 0b3bc168d..adb0bc5a1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java @@ -30,21 +30,21 @@ public interface FinancialBDPrizeLogMapper { @AutoSql(type = SqlType.SELECT) @AdvanceSelect(addonWhereClause = "prize_type=0") - List findByReportAndBD(@Param("record_id") String recordId, @Param("manager_id") int managerId); + List findByReportAndBD(@Param("record_id") String recordId, @Param("manager_id") String managerId); @Select("SELECT prize_log_id,record_id,manager_id,bd_name,bd_level,SUM(total_amount) total_amount, " + "SUM(total_prize) total_prize,SUM(total_donation) total_donation, SUM(send_prize) send_prize, " + "SUM(hold_prize) hold_prize,last_punish,prize_type FROM financial_bd_prize_log fbpl " + "where fbpl.prize_type = 0 and fbpl.record_id = #{record_id} and fbpl.manager_id = #{manager_id} " + "GROUP BY fbpl.manager_id") - JSONObject findByReportAndBDTotal(@Param("record_id") String recordId, @Param("manager_id") int managerId); + JSONObject findByReportAndBDTotal(@Param("record_id") String recordId, @Param("manager_id") String managerId); @Select("SELECT prize_log_id,record_id,manager_id,bd_name,bd_level,SUM(total_amount) total_amount," + "SUM(total_prize) total_prize,SUM(total_donation) total_donation, SUM(send_prize) send_prize," + "SUM(hold_prize) hold_prize,last_punish,prize_type FROM financial_bd_prize_log fbpl " + "where fbpl.prize_type = 1 and fbpl.manager_id = #{manager_id} " + "GROUP BY fbpl.manager_id ") - JSONObject findByReportAndGroup(@Param("record_id") String recordId, @Param("manager_id") int managerId); + JSONObject findByReportAndGroup(@Param("record_id") String recordId, @Param("manager_id") String managerId); @AutoSql(type = SqlType.DELETE) void clearLogsOfReport(@Param("record_id") String recordId); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java index 44643a4bc..b6f442486 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java @@ -23,7 +23,7 @@ public class PartnerQuery { private String sub_merchant_id; private String org_id; private String org_ids; - private Integer bd; + private String bd; private String business_structure; private String industry; private Integer clean_day; @@ -243,14 +243,6 @@ public class PartnerQuery { this.org_id = org_id; } - public Integer getBd() { - return bd; - } - - public void setBd(Integer bd) { - this.bd = bd; - } - public void setOnlyMe(boolean onlyMe) { this.onlyMe = onlyMe; } @@ -452,4 +444,8 @@ public class PartnerQuery { public void setOrg_ids(String org_ids) { this.org_ids = org_ids; } + + public void setBd(String bd) { + this.bd = bd; + } } From ef2e90efbe3c8f241c2b5b3f0a412007c84ce49f Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Thu, 1 Mar 2018 12:34:13 +0800 Subject: [PATCH 2/4] fix bd String --- .../manage/bdprize/core/BDPrizeService.java | 2 +- .../core/impls/BDPrizeServiceImpl.java | 20 +++++++++---------- .../manage/bdprize/web/BDPrizeController.java | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/BDPrizeService.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/BDPrizeService.java index b9e1225d8..3277fd49e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/BDPrizeService.java +++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/BDPrizeService.java @@ -29,7 +29,7 @@ public interface BDPrizeService { List listBDLevels(); - void updateBDLevel(int bdId, JSONObject info, JSONObject manager); + void updateBDLevel(String bdId, JSONObject info, JSONObject manager); List listBDLeaderAndManager(String month); diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java index 8c8e53b1a..92fd431be 100644 --- a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java @@ -282,15 +282,16 @@ public class BDPrizeServiceImpl implements BDPrizeService { JSONObject totalDetail = financialBDPrizeLogMapper.findByReportAndBDTotal(report.getString("record_id"), managerId); log.putAll(totalDetail); JSONObject bdInfo = managerMapper.findById(managerId); - - if (ManagerRole.BD_LEADER.hasRole(bdInfo.getIntValue("role"))) { - JSONObject groupPrizeLog = financialBDPrizeLogMapper.findByReportAndGroup(report.getString("record_id"), managerId); - log.put("group_prize", groupPrizeLog); - } - if (bdInfo == null) { log.put("leftCompany", true); + }else { + if (ManagerRole.BD_LEADER.hasRole(bdInfo.getIntValue("role"))) { + JSONObject groupPrizeLog = financialBDPrizeLogMapper.findByReportAndGroup(report.getString("record_id"), managerId); + log.put("group_prize", groupPrizeLog); + } } + + return log; } @@ -323,11 +324,10 @@ public class BDPrizeServiceImpl implements BDPrizeService { } @Override - public void updateBDLevel(int bdId, JSONObject info, JSONObject manager) { - String bdIdStr = String.valueOf(bdId); - JSONObject config = financialBDConfigMapper.getBdConfig(bdIdStr); + public void updateBDLevel(String bdId, JSONObject info, JSONObject manager) { + JSONObject config = financialBDConfigMapper.getBdConfig(bdId); if (config == null) { - JSONObject bdUser = managerMapper.findById(bdIdStr); + JSONObject bdUser = managerMapper.findById(bdId); if (bdUser == null || !ManagerRole.BD_USER.hasRole(bdUser.getIntValue("role"))) { throw new BadRequestException("BD User Not exists"); } diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/web/BDPrizeController.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/web/BDPrizeController.java index 5efff9290..bc5485c30 100644 --- a/src/main/java/au/com/royalpay/payment/manage/bdprize/web/BDPrizeController.java +++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/web/BDPrizeController.java @@ -70,7 +70,7 @@ public class BDPrizeController { } @ManagerMapping(value = "/config/bd_levels/{bdId}", method = RequestMethod.PUT, role = {ManagerRole.FINANCIAL_STAFF, ManagerRole.ADMIN}) - public void updateBDLevel(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable int bdId, @RequestBody JSONObject info) { + public void updateBDLevel(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String bdId, @RequestBody JSONObject info) { bdPrizeService.updateBDLevel(bdId, info,manager); } From 82707c9d85e5f7e2a2eec0777361e6025494327e Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Thu, 1 Mar 2018 13:19:44 +0800 Subject: [PATCH 3/4] update --- .../citypartner/core/impls/CityPartnerPrizeServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java index f1947df3b..93df8be8e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java @@ -318,6 +318,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { orgIds.forEach((p)->{ generateAgent(monthStr,p); }); + generateReferrer(monthStr); }; new Thread(task).start(); } From 1c538488b9a4c26fb6ea10c285e07c72c893e8ce Mon Sep 17 00:00:00 2001 From: yixian Date: Thu, 1 Mar 2018 14:25:45 +0800 Subject: [PATCH 4/4] retail query daily transactions can choose dev only transactions --- .../appclient/core/RetailAppService.java | 2 +- .../core/impls/RetailAppServiceImp.java | 4 ++-- .../appclient/web/RetailAppController.java | 18 ++++++++++-------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java index 9c0ec74d3..ac99a87ba 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java +++ b/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); diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index c55d4b6a7..1c7edd376 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/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); diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java index c5c985f3c..368ed4069 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java +++ b/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) { - if (client_id==null){ - client_id=device.getString("client_id"); + public JSONObject getCashbackCleanInfo(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device, @RequestParam(value = "client_id", required = false) String client_id) { + if (client_id == null) { + 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) { - return retailAppService.getAdDetail(device,article_id); + public JSONObject getAdDetail(@PathVariable String article_id, @ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) { + return retailAppService.getAdDetail(device, article_id); }