|
|
@@ -733,11 +733,21 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
out.setPeopleCount(peopleList.size());
|
|
|
out.setFrequency(count);
|
|
|
TOrderPublicReleaseCount tOrderPublicReleaseCount = tOrderPublicReleaseCountMapper.selectByOrderNo(orderNew.getOrderNo());
|
|
|
+ //获取最大值
|
|
|
+ BigDecimal maxDuration = pushOrderMaxDuration(orderNew);
|
|
|
+ out.setMaxDuration(maxDuration.doubleValue());
|
|
|
+ out.setMaxProcess(4);
|
|
|
if (tOrderPublicReleaseCount!=null){
|
|
|
tOrderPublicReleaseCountMapper.updateByOrderNo(out);
|
|
|
}else {
|
|
|
tOrderPublicReleaseCountMapper.insert(out);
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ private BigDecimal pushOrderMaxDuration(TOrderNew orderNew) {
|
|
|
+ BigDecimal maxDuration = BigDecimal.ZERO;
|
|
|
//获取会员信息
|
|
|
List<TTaskMember> tTaskMembers = tTaskMemberMapper.selectByOrderNo(orderNew.getOrderNo());
|
|
|
int yearSum=0;
|
|
|
@@ -745,7 +755,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (tTaskMembers.isEmpty()){
|
|
|
OrderYearMaxDuration orderYearMaxDuration = new OrderYearMaxDuration();
|
|
|
orderYearMaxDuration.setYear(0);
|
|
|
- BigDecimal maxDuration = pushMaxDuration(orderNew.getTotalAmount());
|
|
|
+ maxDuration = pushMaxDuration(orderNew.getTotalAmount());
|
|
|
//需修改成判定
|
|
|
if (maxDuration.compareTo(new BigDecimal(-1))==0){
|
|
|
orderYearMaxDuration.setMaxDuration(BigDecimal.ZERO);
|
|
|
@@ -769,7 +779,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
collect = strings.stream().map(this::extractYear).collect(Collectors.toList());
|
|
|
int size = collect.size();
|
|
|
BigDecimal divide = orderNew.getTotalAmount().divide(new BigDecimal(size), RoundingMode.HALF_EVEN);
|
|
|
- BigDecimal maxDuration = pushMaxDuration(divide);
|
|
|
+ maxDuration = pushMaxDuration(divide);
|
|
|
List<OrderYearMaxDuration> maxLists = new ArrayList<>();
|
|
|
int i = 1;
|
|
|
for (Integer year : collect) {
|
|
|
@@ -796,7 +806,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
OrderYearMaxDuration orderYearMaxDuration = new OrderYearMaxDuration();
|
|
|
orderYearMaxDuration.setYear(0);
|
|
|
orderYearMaxDuration.setOrderNo(orderNew.getOrderNo());
|
|
|
- BigDecimal maxDuration = pushMaxDuration(orderNew.getTotalAmount());
|
|
|
+ maxDuration = pushMaxDuration(orderNew.getTotalAmount());
|
|
|
if (maxDuration.compareTo(new BigDecimal(-1))==0){
|
|
|
orderYearMaxDuration.setMaxDuration(BigDecimal.ZERO);
|
|
|
orderYearMaxDuration.setStatus(1);
|
|
|
@@ -816,7 +826,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ return maxDuration;
|
|
|
}
|
|
|
|
|
|
private Integer extractYear(String yearStr) {
|
|
|
@@ -2564,4 +2574,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
return valueByCode.toString();
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public void pushOrderMaxDuration() {
|
|
|
+ List<TOrderNew> tOrderNews = tOrderNewMapper.selectgetAll();
|
|
|
+ for (TOrderNew e : tOrderNews) {
|
|
|
+ pushOrderPublicReleaseCount(e);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|