|
@@ -39,34 +39,42 @@ public class FinanceFineServiceImpl extends ServiceImpl<FinanceFineMapper, Finan
|
|
|
|
|
|
/**
|
|
|
* 分页查询超期罚款
|
|
|
- * @param page 分页
|
|
|
+ *
|
|
|
+ * @param page 分页
|
|
|
* @param financeFineSelectDTO 查询条件dto
|
|
|
* @return Page<FinanceFineVO>
|
|
|
*/
|
|
|
@Override
|
|
|
public Page<FinanceFineVO> selectPage(Page page, FinanceFineSelectDTO financeFineSelectDTO) {
|
|
|
- List<SimplePostModel> postModelList = LoginContext.getLoginCacheUserBO().getPostList();
|
|
|
// 此处数据权限,客户经理只能查看自己的项目
|
|
|
- for (SimplePostModel postModel : postModelList) {
|
|
|
- if (postModel.getName().equals("客户经理") || postModel.getName().equals("销售代表")) {
|
|
|
- financeFineSelectDTO.setClientManagerId(LoginContext.getUserId());
|
|
|
- }
|
|
|
+ if (LoginContext.getLoginCacheUserBO().getPostList().stream()
|
|
|
+ .map(SimplePostModel::getName)
|
|
|
+ .anyMatch(name -> name.contains("客户经理") || name.contains("销售代表"))) {
|
|
|
+ financeFineSelectDTO.setClientManagerId(LoginContext.getUserId());
|
|
|
}
|
|
|
return financeFineMapper.selectPage(page, financeFineSelectDTO);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 导出查询超期罚款
|
|
|
+ *
|
|
|
* @param financeFineSelectDTO 查询条件dto
|
|
|
* @return List<FinanceFineVO>
|
|
|
*/
|
|
|
@Override
|
|
|
public List<FinanceFineVO> exportList(FinanceFineSelectDTO financeFineSelectDTO) {
|
|
|
+ // 此处数据权限,客户经理只能查看自己的项目
|
|
|
+ if (LoginContext.getLoginCacheUserBO().getPostList().stream()
|
|
|
+ .map(SimplePostModel::getName)
|
|
|
+ .anyMatch(name -> name.contains("客户经理") || name.contains("销售代表"))) {
|
|
|
+ financeFineSelectDTO.setClientManagerId(LoginContext.getUserId());
|
|
|
+ }
|
|
|
return financeFineMapper.exportList(financeFineSelectDTO);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 确认罚款金额
|
|
|
+ *
|
|
|
* @return Boolean
|
|
|
*/
|
|
|
@Override
|
|
@@ -122,7 +130,7 @@ public class FinanceFineServiceImpl extends ServiceImpl<FinanceFineMapper, Finan
|
|
|
// 没有应收款的话,罚款金额就是 standard_amount * 30% * 5%
|
|
|
if (ObjectUtil.isNotNull(assetsOrder.getStandardAmount())) {
|
|
|
fineAmount = assetsOrder.getStandardAmount().multiply(BigDecimal.valueOf(0.3)).multiply(BigDecimal.valueOf(0.05));
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
fineAmount = BigDecimal.valueOf(0);
|
|
|
}
|
|
|
}
|
|
@@ -168,7 +176,7 @@ public class FinanceFineServiceImpl extends ServiceImpl<FinanceFineMapper, Finan
|
|
|
// 没有应收款的话,罚款金额就是 standard_amount * 30% * 5%
|
|
|
if (ObjectUtil.isNotNull(majorOrder.getStandardAmount())) {
|
|
|
fineAmount = majorOrder.getStandardAmount().multiply(BigDecimal.valueOf(0.3)).multiply(BigDecimal.valueOf(0.05));
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
fineAmount = BigDecimal.valueOf(0);
|
|
|
}
|
|
|
}
|
|
@@ -197,7 +205,8 @@ public class FinanceFineServiceImpl extends ServiceImpl<FinanceFineMapper, Finan
|
|
|
/**
|
|
|
* 根据收款信息获取符合条件的罚款表信息
|
|
|
* 且已确认罚款
|
|
|
- * @param orderFundId 订单收款id
|
|
|
+ *
|
|
|
+ * @param orderFundId 订单收款id
|
|
|
* @param productionFundId 产品收款id
|
|
|
* @return FinanceFine
|
|
|
*/
|