From 91fc72d26cb93bfd29f2975d260740bc41f769ee Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 24 Oct 2023 09:28:23 +0800 Subject: [PATCH] 10/24 --- .../biz/projectaccount/ProjectAccountVo.java | 20 ++++++ .../biz/projectdaily/ProjectDailyRest.java | 54 ++------------ .../biz/projectdaily/ProjectDailyService.java | 70 +++++++++++++++++-- 3 files changed, 89 insertions(+), 55 deletions(-) diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountVo.java index 28f70e79..2b956702 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountVo.java @@ -19,6 +19,26 @@ public class ProjectAccountVo implements Query { private String bank; private String affiliateBank; private BigDecimal balance=new BigDecimal(0); + private BigDecimal wBalance=new BigDecimal(0); private String enterpriseSid; private String enterpriseName; + + public BigDecimal getBalance() { + BigDecimal count=new BigDecimal(0); + if (null==balance){ + return balance=count; + } +// balance.divide(new BigDecimal(10000),2,BigDecimal.ROUND_HALF_UP); + return balance; + } + + public BigDecimal getwBalance() { + BigDecimal count=new BigDecimal(0); + if (null==this.balance){ + return wBalance=count; + } + this.wBalance=balance.divide(new BigDecimal(10000),2,BigDecimal.ROUND_HALF_UP); + return wBalance; + } + } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java index ca5de333..8d2ada0b 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java @@ -40,13 +40,8 @@ public class ProjectDailyRest { @Autowired private ProjectDailyFilesService projectDailyFilesService; @Autowired - private MessagePushLogService messagePushLogService; - @Autowired private MessageOpenidService messageOpenidService; - @Autowired - private CrmMapper crmMapper; - @Autowired - private com.yxt.supervise.report.ds.system.systemMapper systemMapper; + @ApiOperation("查询项目监管报表信息") @PostMapping("/listPage") @@ -85,50 +80,9 @@ public class ProjectDailyRest { @PostMapping("/getProjectDaily") public ResultBean getProjectDaily(@RequestBody ProjectDailys ProjectDailys) { ResultBean rb = ResultBean.fireFail(); - if (StringUtils.isNoneBlank(ProjectDailys.getUserSid())) { - int count = crmMapper.getCountByUserSidAndProjectSid(ProjectDailys.getProjectSid(), ProjectDailys.getUserSid()); - if (count == 0) { - return rb.setMsg("无权限").setCode("410"); - } -// String openid=systemMapper.getAppletOpenidByUsersid(ProjectDailys.getUserSid()); - SysUser sysUser = systemMapper.getAppletOpenidByUsersid(ProjectDailys.getUserSid()); - if (StringUtils.isBlank(sysUser.getAppletOpenid())) { - return rb.setMsg("请先去绑定").setCode("420"); - } - MessagePushLog m = messagePushLogService. - getOne(new QueryWrapper(). - eq("projectSid", ProjectDailys.getProjectSid()). - eq("orderDate", ProjectDailys.getOrderDate())); - if (null != m) { - MessageOpenid messageOpenid = messageOpenidService.getOne(new QueryWrapper().eq("openId", sysUser.getAppletOpenid()).eq("messageSid", m.getSid())); - if (null != messageOpenid) { - messageOpenid.setState("1"); - messageOpenidService.updateById(messageOpenid); - } - } - } else if (StringUtils.isNoneBlank(ProjectDailys.getWxCode())) { - ResultBean rbJsonObject = projectDailyService.wxLogin(ProjectDailys.getWxCode(), "", ""); - JSONObject jsonObject = rbJsonObject.getData(); - String openid = jsonObject.get("openid").toString(); - String userSid = systemMapper.getUserSidByOpenid(openid); - if (StringUtils.isBlank(userSid)) { - return rb.setMsg("请先去绑定").setCode("420"); - } - int count = crmMapper.getCountByUserSidAndProjectSid(ProjectDailys.getProjectSid(), userSid); - if (count == 0) { - return rb.setMsg("无权限").setCode("410"); - } - MessagePushLog m = messagePushLogService.getOne(new QueryWrapper() - .eq("projectSid", ProjectDailys.getProjectSid()).eq("orderDate", ProjectDailys.getOrderDate())); - if (null != m) { - MessageOpenid messageOpenid = messageOpenidService.getOne(new QueryWrapper().eq("openId", openid).eq("messageSid", m.getSid())); - if (null != messageOpenid) { - messageOpenid.setState("1"); - messageOpenidService.updateById(messageOpenid); - } - } - } else if (StringUtils.isBlank(ProjectDailys.getWxCode()) && StringUtils.isBlank(ProjectDailys.getUserSid())) { - return rb.setMsg("无权限").setCode("410"); + ResultBean b=projectDailyService.ww(ProjectDailys); + if(!b.getCode().equals("200")){ + return b; } ProjectDaily pv = projectDailyService.fetchByProjectAndDay(ProjectDailys.getProjectSid(), ProjectDailys.getOrderDate()); return rb.success().setData(pv); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java index 082e915a..03c0272b 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java @@ -12,6 +12,10 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.report.api.messageopenid.MessageOpenid; +import com.yxt.supervise.report.api.messagepushlog.MessagePushLog; +import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService; +import com.yxt.supervise.report.biz.messagepushlog.MessagePushLogService; import com.yxt.supervise.report.biz.projectdailyaccount.ProjectDailyAccountDto; import com.yxt.supervise.report.biz.projectdailyaccount.ProjectDailyAccountService; import com.yxt.supervise.report.biz.wechat.WechatRest; @@ -19,7 +23,9 @@ import com.yxt.supervise.report.biz.wechat.WechatService; import com.yxt.supervise.report.ds.crm.CrmMapper; import com.yxt.supervise.report.ds.crm.ProjectInfo; import com.yxt.supervise.report.ds.crm.UserProject; +import com.yxt.supervise.report.ds.system.SysUser; import com.yxt.supervise.system.sysuser.ProjectInformationVo; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; @@ -48,6 +54,12 @@ public class ProjectDailyService extends ServiceImpl selectListPage(PagerQuery pq) { ProjectDailyQuery params = pq.getParams(); QueryWrapper wq = new QueryWrapper<>(); @@ -109,15 +121,15 @@ public class ProjectDailyService extends ServiceImpl projectDaily.getPledgeRate()) { + if (projectInfo.getBankPledgeRate() > Double.valueOf(projectDaily.getPledgeRatePercent())) { projectDaily.setState("1"); } list.add(projectDaily); } } } - map.put("creditLimitTotal",creditLimitTotal); - map.put("useLimitTotal",useLimitTotal); + map.put("creditLimitTotal",String.format("%.2f",creditLimitTotal)); + map.put("useLimitTotal",String.format("%.2f",useLimitTotal)); map.put("list",list); return map; } @@ -170,14 +182,62 @@ public class ProjectDailyService extends ServiceImpl projectDaily.getPledgeRate()) { + if (projectInfo.getBankPledgeRate() >Double.valueOf(projectDaily.getPledgeRatePercent())) { projectDaily.setState("1"); } } } return projectDaily; } - + public ResultBean ww(ProjectDailys ProjectDailys){ + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isNoneBlank(ProjectDailys.getUserSid())) { + int count = crmMapper.getCountByUserSidAndProjectSid(ProjectDailys.getProjectSid(), ProjectDailys.getUserSid()); + if (count == 0) { + return rb.setMsg("无权限").setCode("410"); + } +// String openid=systemMapper.getAppletOpenidByUsersid(ProjectDailys.getUserSid()); + SysUser sysUser = systemMapper.getAppletOpenidByUsersid(ProjectDailys.getUserSid()); + if (StringUtils.isBlank(sysUser.getAppletOpenid())) { + return rb.setMsg("请先去绑定").setCode("420"); + } + MessagePushLog m = messagePushLogService. + getOne(new QueryWrapper(). + eq("projectSid", ProjectDailys.getProjectSid()). + eq("orderDate", ProjectDailys.getOrderDate())); + if (null != m) { + MessageOpenid messageOpenid = messageOpenidService.getOne(new QueryWrapper().eq("openId", sysUser.getAppletOpenid()).eq("messageSid", m.getSid())); + if (null != messageOpenid) { + messageOpenid.setState("1"); + messageOpenidService.updateById(messageOpenid); + } + } + } else if (StringUtils.isNoneBlank(ProjectDailys.getWxCode())) { + ResultBean rbJsonObject = wxLogin(ProjectDailys.getWxCode(), "", ""); + JSONObject jsonObject = rbJsonObject.getData(); + String openid = jsonObject.get("openid").toString(); + String userSid = systemMapper.getUserSidByOpenid(openid); + if (StringUtils.isBlank(userSid)) { + return rb.setMsg("请先去绑定").setCode("420"); + } + int count = crmMapper.getCountByUserSidAndProjectSid(ProjectDailys.getProjectSid(), userSid); + if (count == 0) { + return rb.setMsg("无权限").setCode("410"); + } + MessagePushLog m = messagePushLogService.getOne(new QueryWrapper() + .eq("projectSid", ProjectDailys.getProjectSid()).eq("orderDate", ProjectDailys.getOrderDate())); + if (null != m) { + MessageOpenid messageOpenid = messageOpenidService.getOne(new QueryWrapper().eq("openId", openid).eq("messageSid", m.getSid())); + if (null != messageOpenid) { + messageOpenid.setState("1"); + messageOpenidService.updateById(messageOpenid); + } + } + } else if (StringUtils.isBlank(ProjectDailys.getWxCode()) && StringUtils.isBlank(ProjectDailys.getUserSid())) { + return rb.setMsg("无权限").setCode("410"); + } + return rb.success().setCode("200"); + } public void sendMess(String projectSid, String orderDate) { ProjectDaily projectDaily = this.fetchByProjectAndDay(projectSid, orderDate); projectDaily.setMessState(1);