diff --git a/pom.xml b/pom.xml index c394163c9..94a2f7150 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 0.2.0-dev + 0.2.0 4.0.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerRewardLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerRewardLogServiceImpl.java index fe30afe81..fc087c270 100644 --- a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerRewardLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerRewardLogServiceImpl.java @@ -114,8 +114,8 @@ public class CustomerRewardLogServiceImpl implements CustomerRewardLogService { } } if(channel.equals("Alipay")){ - if(cusRewardLogsMapper.takeRewardNotWechat(now,openid,DateFormatUtils.format(now,"yyyy-MM-dd")) > 0){ - JSONObject reward = cusRewardLogsMapper.findRewardByFakeOpenId(redpack_openid); + if(cusRewardLogsMapper.takeRewardNotWechat(now,fakeOpenId,DateFormatUtils.format(now,"yyyy-MM-dd")) > 0){ + JSONObject reward = cusRewardLogsMapper.findRewardByFakeOpenId(fakeOpenId); Assert.notNull(reward, "reward is null"); reward.put("openid",openid); reward.put("status",1); diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java index 1715614b0..d8f059410 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java @@ -68,9 +68,9 @@ public class CloseOrderWarningSender implements ApplicationListener recentOrders = orderMapper.listOrdersNoPage(params); - int minOrders = config.getIntValue("cheat_monitor.min_orders"); + int minOrders = config.getIntValue("cheat_monitor.mch_close_warning_min_orders"); if (recentOrders.size() < minOrders) { - logger.debug("order count:" + recentOrders.size() + " is less than min orders, skip"); + logger.debug("order count:{} is less than min orders, skip", recentOrders.size()); return; } List closed = new ArrayList<>(); @@ -88,13 +88,13 @@ public class CloseOrderWarningSender implements ApplicationListener developers = managerMapper.listDetailsByRole(null, ManagerRole.DEVELOPER.getMask()); - if(!StringUtils.isEmpty(client.getString("bd_user"))){ + if (!StringUtils.isEmpty(client.getString("bd_user"))) { String[] bds = client.getString("bd_user").split(","); if (bds.length > 0) { List ids = new LinkedList<>(); @@ -107,7 +107,6 @@ public class CloseOrderWarningSender implements ApplicationListener accounts = clientAccountMapper.listAdminAccounts(clientId); // for (JSONObject account : accounts) { @@ -131,7 +130,7 @@ public class CloseOrderWarningSender implements ApplicationListener getXlsx(Date dt, String bank) throws IOException { List logs = clearingLogMapper.findByDate(dt); + logs = logs.stream().filter(log -> log.getBooleanValue("editable")).collect(Collectors.toList()); if (logs.isEmpty()) { throw new NotFoundException(); } @@ -433,6 +434,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider @Override public List getAba(Date dt, String bank) { List logs = clearingLogMapper.findByDate(dt); + logs = logs.stream().filter(log -> log.getBooleanValue("editable")).collect(Collectors.toList()); if (logs.isEmpty()) { throw new NotFoundException(); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java index b570d7d7d..d613e73e1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java @@ -176,5 +176,4 @@ public interface TransactionMapper { List getClientOrderByTransactionTime(JSONObject params); List getLastDaytransAmount(JSONObject params); - } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java index ceb4f0a05..44511c48a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java @@ -384,4 +384,5 @@ public interface ClientManager { void switchPaymentConfigPC(String clientMoniker, HttpServletResponse response) throws IOException; void partnerCBChannelConfig(String clientMoniker, String channelKey, String channel_id); + } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 2fc26c95c..fd119646a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -306,6 +306,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid @Resource private SysChannelConfigMapper sysChannelConfigMapper; + @Resource private SmsSender smsSender; private static final String SOURCE_AGREE_FILE = "source_agree_file"; diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java index 9064d31f4..11d89c332 100644 --- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java +++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java @@ -70,6 +70,13 @@ public class RiskBusinessController { return riskEvent; } + @GetMapping(value = "events/{risk_id}/detail") + public JSONObject getRiskEventDetailWithoutTradelogs(@PathVariable("risk_id") String riskId, + @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { + JSONObject riskEvent = riskBusinessService.getRiskEventDetail(riskId); + return riskEvent; + } + @PostMapping(value = "events") public void RegisterRiskEvent(@RequestBody JSONObject params, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java b/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java index 9db9da064..febfd6e72 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java @@ -239,6 +239,7 @@ public class SignInController { String statusKey = signInStatusManager.addVerifyCode(capText); HttpUtils.setCookie(response, CommonConsts.CODE_KEY, statusKey); + HttpUtils.setCookie(response, "code_expire_time", (System.currentTimeMillis() + 150_000) + "", false); BufferedImage bi = captchaProducer.createImage(capText); ServletOutputStream out = response.getOutputStream(); @@ -352,20 +353,20 @@ public class SignInController { return signInStatusManager.customerQRCode(); } - @WechatMapping(value = "/customer_wechat_qrcode/{codeId}", method = RequestMethod.GET,oauthType = WxOauthType.USERINFO) + @WechatMapping(value = "/customer_wechat_qrcode/{codeId}", method = RequestMethod.GET, oauthType = WxOauthType.USERINFO) public ModelAndView scanCustomerQrcode(@PathVariable String codeId, @ModelAttribute(CommonConsts.WECHATINFO) JSONObject wechatUser) { signInStatusManager.scanCustomerQrcode(codeId, wechatUser.getString("openid")); return new ModelAndView("manager_bind_success"); } @RequestMapping(value = "/customer_wechat_qrcode/{codeId}/check", method = RequestMethod.GET) - public JSONObject getCustomerID(@PathVariable String codeId, HttpServletResponse response,@RequestParam(value = "pay_info",defaultValue = "false") boolean pay_info) { + public JSONObject getCustomerID(@PathVariable String codeId, HttpServletResponse response, @RequestParam(value = "pay_info", defaultValue = "false") boolean pay_info) { JSONObject result = new JSONObject(); String statusKey = signInStatusManager.getWechatCustomerId(codeId); - if(pay_info){ - result = customerPaymentInfoService.selectPaymentInfoByOpenId(statusKey); + if (pay_info) { + result = customerPaymentInfoService.selectPaymentInfoByOpenId(statusKey); } - HttpUtils.setCookie(response, "CustomerID", statusKey,false); + HttpUtils.setCookie(response, "CustomerID", statusKey, false); return result; } } diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/TradeSecureServiceHanyinImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/TradeSecureServiceHanyinImpl.java index 274c9ce2c..18bd9dc9f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/TradeSecureServiceHanyinImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/TradeSecureServiceHanyinImpl.java @@ -74,7 +74,7 @@ public class TradeSecureServiceHanyinImpl implements TradeSecureService { logger.debug("mk dir:{}", dir); command.mkdir(dir); } - String dest = dir + "/"+ file.filename(); + String dest = dir + "/" + file.filename(); logger.debug("find dir, start uploading file:{}", dest); command.put(new ByteArrayInputStream(file.content()), dest); } catch (IOException | JSchException | SftpException e) { diff --git a/src/main/ui/static/analysis/templates/cheat_monitor_risk.html b/src/main/ui/static/analysis/templates/cheat_monitor_risk.html index 909e4007c..5a450f844 100644 --- a/src/main/ui/static/analysis/templates/cheat_monitor_risk.html +++ b/src/main/ui/static/analysis/templates/cheat_monitor_risk.html @@ -304,9 +304,9 @@
商户关单率预警 （检测当日订单，触发预警，将发送告警消息于开发者，商户所属BD）
- +
- +
diff --git a/src/main/ui/static/cms/cms.js b/src/main/ui/static/cms/cms.js index 937c8ccc8..acbd8bf61 100644 --- a/src/main/ui/static/cms/cms.js +++ b/src/main/ui/static/cms/cms.js @@ -33,23 +33,31 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu "style_key":"my_select", "style_value":"" }, + { + "style_key":"my_gray", + "style_value":"" + }, { "style_key":"transaction", "style_value":"" }, { + //customers report "style_key":"statistics", "style_value":"" }, { + //Account "style_key":"marketing_account", "style_value":"" }, { + //Customer outline "style_key":"usergroup", "style_value":"" }, { + //Compliance check "style_key":"coupon", "style_value":"" },