From 6159dc58f50d3e4680779b7989bbd4d49a76bad5 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 09 五月 2025 19:13:35 +0800 Subject: [PATCH] 添加日志 --- src/main/java/com/taoke/autopay/controller/admin/AdminAgentController.java | 78 ++++++++++++++------------------------- 1 files changed, 28 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/taoke/autopay/controller/admin/AdminAgentController.java b/src/main/java/com/taoke/autopay/controller/admin/AdminAgentController.java index c2cc2c6..0124583 100644 --- a/src/main/java/com/taoke/autopay/controller/admin/AdminAgentController.java +++ b/src/main/java/com/taoke/autopay/controller/admin/AdminAgentController.java @@ -19,6 +19,7 @@ import com.taoke.autopay.exception.ChannelAgentException; import com.taoke.autopay.factory.AgentFactory; import com.taoke.autopay.factory.OrderFactory; +import com.taoke.autopay.manager.ChannelAgentManager; import com.taoke.autopay.service.ClientInfoService; import com.taoke.autopay.service.KeyOrderService; import com.taoke.autopay.service.SystemConfigService; @@ -125,40 +126,15 @@ } + @Resource + private ChannelAgentManager channelAgentManager; + @ResponseBody @RequestMapping("add") public String addAgent(AdminChannelAgentVO vo) { - // 鍒涘缓浠g悊 - ChannelAgent agent = ChannelAgent.builder() - .name(vo.getName()) - .account(vo.getAccount()) - .pwd(StringUtil.Md5(vo.getPwd())) - .alipayAccount(StringUtil.isNullOrEmpty(vo.getAlipayAccount()) ? null : vo.getAlipayAccount()) - .alipayName(StringUtil.isNullOrEmpty(vo.getAlipayName()) ? null : vo.getAlipayName()) - .status(ChannelAgent.STATUS_NOMAL) - .build(); + try { - agent = channelAgentService.addChannelAgent(agent); - // 娣诲姞璁剧疆 - ChannelAgentSettings settings = ChannelAgentSettings.builder() - .id(agent.getId()) - .startSubmitTime(StringUtil.isNullOrEmpty(vo.getStartSubmitTime()) ? null : vo.getStartSubmitTime()) - .endSubmitTime(StringUtil.isNullOrEmpty(vo.getEndSubmitTime()) ? null : vo.getEndSubmitTime()) - .maxKeyCountPerDay(StringUtil.isNullOrEmpty(vo.getMaxKeyCountPerDay()) ? null : Long.parseLong(vo.getMaxKeyCountPerDay())) - .maxPayMoneyPerDay(StringUtil.isNullOrEmpty(vo.getMaxPayMoneyPerDay()) ? null : new BigDecimal(vo.getMaxPayMoneyPerDay())) - .build(); - channelAgentSettingService.add(settings); - // 娣诲姞鍒嗘垚姣斾緥璁剧疆 - if (!StringUtil.isNullOrEmpty(vo.getShareRatioInfos())) { - JSONObject shareRatioData = JSONObject.fromObject(vo.getShareRatioInfos()); - for (Object key : shareRatioData.keySet()) { - String value = shareRatioData.optString(key.toString()); - OrderChannelEnum channel = OrderChannelEnum.valueOf(key.toString()); - if (!StringUtil.isNullOrEmpty(value)) { - channelAgentSharingRatioService.setShareRatio(ChannelAgentSharingRatio.builder().agengId(agent.getId()).orderChannel(channel).shareType(ChannelAgentSharingRatio.SHARE_TYPE_MONEY).shareValue(new BigDecimal(value)).build()); - } - } - } + ChannelAgent agent= channelAgentManager.addAgent(vo); return JsonUtil.loadTrueResult(agent); } catch (ChannelAgentException e) { return JsonUtil.loadFalseResult(e.getMessage()); @@ -176,29 +152,31 @@ .pwd(StringUtil.isNullOrEmpty(vo.getPwd()) ? null :StringUtil.Md5(vo.getPwd())) .alipayAccount(StringUtil.isNullOrEmpty(vo.getAlipayAccount()) ? null : vo.getAlipayAccount()) .alipayName(StringUtil.isNullOrEmpty(vo.getAlipayName()) ? null : vo.getAlipayName()) + .shieldedAreas(vo.getShieldedAreas()) .build(); - channelAgentService.updateSelective(agent); - // 娣诲姞璁剧疆 - ChannelAgentSettings settings = ChannelAgentSettings.builder() - .id(agent.getId()) - .startSubmitTime(StringUtil.isNullOrEmpty(vo.getStartSubmitTime()) ? null : vo.getStartSubmitTime()) - .endSubmitTime(StringUtil.isNullOrEmpty(vo.getEndSubmitTime()) ? null : vo.getEndSubmitTime()) - .maxKeyCountPerDay(StringUtil.isNullOrEmpty(vo.getMaxKeyCountPerDay()) ? null : Long.parseLong(vo.getMaxKeyCountPerDay())) - .maxPayMoneyPerDay(StringUtil.isNullOrEmpty(vo.getMaxPayMoneyPerDay()) ? null : new BigDecimal(vo.getMaxPayMoneyPerDay())) - .build(); - channelAgentSettingService.add(settings); - // 娣诲姞鍒嗘垚姣斾緥璁剧疆 - if (!StringUtil.isNullOrEmpty(vo.getShareRatioInfos())) { - JSONObject shareRatioData = JSONObject.fromObject(vo.getShareRatioInfos()); - for (Object key : shareRatioData.keySet()) { - String value = shareRatioData.optString(key.toString()); - OrderChannelEnum channel = OrderChannelEnum.valueOf(key.toString()); - if (!StringUtil.isNullOrEmpty(value)) { - channelAgentSharingRatioService.setShareRatio(ChannelAgentSharingRatio.builder().agengId(agent.getId()).orderChannel(channel).shareType(ChannelAgentSharingRatio.SHARE_TYPE_MONEY).shareValue(new BigDecimal(value)).build()); - } + channelAgentService.updateSelective(agent); + // 娣诲姞璁剧疆 + ChannelAgentSettings settings = ChannelAgentSettings.builder() + .id(agent.getId()) + .startSubmitTime(StringUtil.isNullOrEmpty(vo.getStartSubmitTime()) ? null : vo.getStartSubmitTime()) + .endSubmitTime(StringUtil.isNullOrEmpty(vo.getEndSubmitTime()) ? null : vo.getEndSubmitTime()) + .maxKeyCountPerDay(StringUtil.isNullOrEmpty(vo.getMaxKeyCountPerDay()) ? null : Long.parseLong(vo.getMaxKeyCountPerDay())) + .maxPayMoneyPerDay(StringUtil.isNullOrEmpty(vo.getMaxPayMoneyPerDay()) ? null : new BigDecimal(vo.getMaxPayMoneyPerDay())) + .creditEnable(vo.getCreditEnable() != null && vo.getCreditEnable() > 0) + .build(); + channelAgentSettingService.add(settings); + // 娣诲姞鍒嗘垚姣斾緥璁剧疆 + if (!StringUtil.isNullOrEmpty(vo.getShareRatioInfos())) { + JSONObject shareRatioData = JSONObject.fromObject(vo.getShareRatioInfos()); + for (Object key : shareRatioData.keySet()) { + String value = shareRatioData.optString(key.toString()); + OrderChannelEnum channel = OrderChannelEnum.valueOf(key.toString()); + if (!StringUtil.isNullOrEmpty(value)) { + channelAgentSharingRatioService.setShareRatio(ChannelAgentSharingRatio.builder().agengId(agent.getId()).orderChannel(channel).shareType(ChannelAgentSharingRatio.SHARE_TYPE_MONEY).shareValue(new BigDecimal(value)).build()); } } - return JsonUtil.loadTrueResult(agent); + } + return JsonUtil.loadTrueResult(agent); } -- Gitblit v1.8.0