|
@@ -110,6 +110,20 @@ public class WmScorePackageController {
|
|
|
private final StringRedisTemplate redisTemplate;
|
|
|
|
|
|
|
|
|
+ @PutMapping(value = "/p2p/amount")
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
+ public R<?> saveP2pAmount(WmScorePackage wmScorePackage) {
|
|
|
+ if (StrUtil.isBlank(wmScorePackage.getId()) || wmScorePackage.getP2pAmount() == null) {
|
|
|
+ return R.failed("参数错误");
|
|
|
+ }
|
|
|
+
|
|
|
+ WmScorePackage sp = new WmScorePackage();
|
|
|
+ sp.setId(wmScorePackage.getId());
|
|
|
+ sp.setP2pAmount(wmScorePackage.getP2pAmount());
|
|
|
+ wmScorePackageService.save(sp);
|
|
|
+ return R.ok();
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 分页查询
|
|
|
*
|
|
@@ -2437,8 +2451,8 @@ public class WmScorePackageController {
|
|
|
LocalDateTime start = null;
|
|
|
LocalDateTime end = null;
|
|
|
|
|
|
- if (StrUtil.isNotEmpty(monthStart) && StrUtil.isNotEmpty(monthEnd)){
|
|
|
- start = LocalDateTime.of( LocalDate.parse(monthStart + "-01", DatePattern.NORM_DATE_FORMATTER), LocalTime.MIN);
|
|
|
+ if (StrUtil.isNotEmpty(monthStart) && StrUtil.isNotEmpty(monthEnd)) {
|
|
|
+ start = LocalDateTime.of(LocalDate.parse(monthStart + "-01", DatePattern.NORM_DATE_FORMATTER), LocalTime.MIN);
|
|
|
LocalDate e = LocalDate.parse(monthEnd + "-01", DatePattern.NORM_DATE_FORMATTER);
|
|
|
end = LocalDateTime.of(e.with(TemporalAdjusters.lastDayOfMonth()), LocalTime.MAX);
|
|
|
|
|
@@ -2450,7 +2464,7 @@ public class WmScorePackageController {
|
|
|
.like(StrUtil.isNotEmpty(scorePackageName), WmScorePackage::getScorePackageName, scorePackageName)
|
|
|
.eq(scorePackageStatus != null, WmScorePackage::getScorePackageStatus, scorePackageStatus)
|
|
|
.eq(WmScorePackage::getSendPackageDeptId, sendDeptId)
|
|
|
- .between(start != null && end != null, WmScorePackage::getCreateTime, start, end );
|
|
|
+ .between(start != null && end != null, WmScorePackage::getCreateTime, start, end);
|
|
|
|
|
|
if (StringUtil.isEmpty(typeId)) {
|
|
|
queryWrapper.in(WmScorePackage::getTypeid, "3", "4");
|
|
@@ -2908,6 +2922,4 @@ public class WmScorePackageController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
}
|