diff --git a/pusong-admin/src/main/resources/application.yml b/pusong-admin/src/main/resources/application.yml index bef9285..076654f 100644 --- a/pusong-admin/src/main/resources/application.yml +++ b/pusong-admin/src/main/resources/application.yml @@ -70,7 +70,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: @profiles.active@ + active: prod # 文件上传 servlet: multipart: diff --git a/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java index a11ad08..57092f6 100644 --- a/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java @@ -80,4 +80,9 @@ public interface CacheNames { * 首页查询(回款统计与合同) */ String HOME_B = "home_queryB#60s"; + + /** + * 首页查询(成交金额) + */ + String HOME_C = "home_queryC#60s"; } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/ChannelAmountVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/ChannelAmountVo.java index 70d94ed..647d785 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/ChannelAmountVo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/ChannelAmountVo.java @@ -1,12 +1,15 @@ package com.pusong.business.domain.vo.home; import com.fasterxml.jackson.annotation.JsonFormat; +import com.pusong.business.domain.vo.PsCustomPriceVo; import lombok.Data; import java.math.BigDecimal; import java.math.RoundingMode; +import java.util.Comparator; import java.util.Date; -import java.util.Map; +import java.util.List; +import java.util.stream.Collectors; @Data public class ChannelAmountVo { @@ -28,21 +31,38 @@ public class ChannelAmountVo { /** * 各渠道成交金额 */ - private Map channelMap; + private List channelList; public void cellPer(){ //计算总金额 this.all = this.all == null? BigDecimal.ZERO: this.all; - for (String str : channelMap.keySet()){ - all = all.add(channelMap.get(str).getMoney()); + for (DataAmountVo str : channelList){ + all = all.add(str.getMoney()); } + int num = 0; + BigDecimal payMoney = BigDecimal.ZERO; + BigDecimal unpayMoney = BigDecimal.ZERO; //计算占比 if(0 == this.all.compareTo(BigDecimal.ZERO)) { - channelMap.forEach((k, v)->{v.setPer("0%");}); + channelList.forEach((v)->{v.setPer("0%");}); }else { - channelMap.forEach((k, v)->{v.setPer(v.getMoney().multiply(new BigDecimal("100.0")).divide(this.all,2, RoundingMode.HALF_UP).toPlainString()+"%");}); + for (DataAmountVo str : channelList){ + num = num + Integer.parseInt(str.getNum().replace("单","")); + payMoney = payMoney.add(str.getPayMoney()); + unpayMoney = unpayMoney.add(str.getUnPayMoney()); + str.setPer(str.getMoney().multiply(new BigDecimal("100.0")).divide(this.all,2, RoundingMode.HALF_UP).toPlainString()+"%"); + } } + DataAmountVo dataAmountVo = new DataAmountVo(); + dataAmountVo.setType("总计"); + dataAmountVo.setPer("100%"); + dataAmountVo.setNum(num+"单"); + dataAmountVo.setPayMoney(payMoney); + dataAmountVo.setUnPayMoney(unpayMoney); + dataAmountVo.setMoney(all); + channelList = channelList.stream().sorted(Comparator.comparing(DataAmountVo::getMoney).reversed()).collect(Collectors.toList()); + channelList.add(dataAmountVo); } } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/DataAmountVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/DataAmountVo.java index 2193f1f..a0c94de 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/DataAmountVo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/DataAmountVo.java @@ -6,6 +6,10 @@ import java.math.BigDecimal; @Data public class DataAmountVo { + /** + * 类型 + */ + private String type; /** * 占比 */ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java index a99ede5..522ab5a 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java @@ -48,10 +48,10 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl PsContractInfoVo info = psContractInfoService.queryContractByCode(psApproverRecord.getContractCode()); //修改回款记录状态 PsContractPay update = new PsContractPay(); - if(StringUtils.isNotBlank(psApproverRecord.getUpdateData())){ - PsContractPayBo upda = JSON.parseObject(psApproverRecord.getUpdateData(), PsContractPayBo.class); - MapstructUtils.convert(upda,update); - } +// if(StringUtils.isNotBlank(psApproverRecord.getUpdateData())){ +// PsContractPayBo upda = JSON.parseObject(psApproverRecord.getUpdateData(), PsContractPayBo.class); +// MapstructUtils.convert(upda,update); +// } update.setId(Long.valueOf(psApproverRecord.getBusinessId())); update.setPayStatus(PayStatusEnum.SUCCESS.getCode()); payService.updateById(update); diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java index 4ea9332..45a56e9 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java @@ -230,7 +230,7 @@ public class HomeServiceImpl implements HomeService { //把支付信息根据渠道分组（方便下面使用） Map> map = list.stream().collect(Collectors.groupingBy(ChannelPayInfo::getChannel, Collectors.toList())); //各渠道的支付信息 - Map channelMap = new HashMap<>(); + List channelList = new ArrayList<>(); //便利渠道，装填各个渠道信息 for (String item : configList){ DataAmountVo data = new DataAmountVo(); @@ -248,9 +248,10 @@ public class HomeServiceImpl implements HomeService { data.setMoney(money); data.setPayMoney(paymoney); data.setUnPayMoney(unpaymoney); - channelMap.put(item,data); + data.setType(item); + channelList.add(data); } - res.setChannelMap(channelMap); + res.setChannelList(channelList); //计算总金额和占比 res.cellPer(); return res; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractPayServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractPayServiceImpl.java index 40efdb0..343cc04 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractPayServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractPayServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; /** @@ -107,7 +108,7 @@ public class PsContractPayServiceImpl implements IPsContractPayService { baseMapper.insert(pay); //发起审批 ApproverService service = container.getService(ApproverTypeEnum.PAY.getCode()); - service.apply(pay.getId()+"",pay.getContractCode(),payBo.getPayDesc(), pay.getPayMode()); + service.apply(pay.getId()+"",pay.getContractCode(),payBo.getPayDesc(), pay.getMoney().setScale(2, RoundingMode.HALF_UP).toPlainString()); } /** * 添加退款记录 diff --git a/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysUserController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysUserController.java index 967c2ad..7f02c12 100644 --- a/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysUserController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysUserController.java @@ -69,8 +69,8 @@ public class SysUserController extends BaseController { * 获取登陆人下的用户列表 */ @GetMapping("/userlist") - public R> userlist(Long postId) { - return R.ok(userService.selectUserList(postId)); + public R> userlist(Long deptId) { + return R.ok(userService.selectUserList(deptId)); } /** diff --git a/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysUserService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysUserService.java index 5aba78e..e9798e0 100644 --- a/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysUserService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysUserService.java @@ -17,7 +17,7 @@ public interface ISysUserService { TableDataInfo selectPageUserList(SysUserBo user, PageQuery pageQuery); - List selectUserList(Long postId); + List selectUserList(Long deptId); /** * 根据条件分页查询用户列表 * diff --git a/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysUserServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysUserServiceImpl.java index 13598d6..237abe1 100644 --- a/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysUserServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysUserServiceImpl.java @@ -75,11 +75,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return */ @Override - public List selectUserList(Long postId) { + public List selectUserList(Long deptId) { //根据岗位id查询改为根据部门id查询 SysUserBo bo = new SysUserBo(); // bo.setPostIdQuery(postId); - bo.setDeptId(1808380345979961346l); + bo.setDeptId(deptId); return baseMapper.selectUserList( this.buildQueryWrapper(bo)); }