Skip to content

L
lwby_copyright_book_data
Commit d3c83d99 authored by maliang's avatar maliang
Browse files
Options

上传bug修复

parent 9d598e22
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 30 deletions
src/main/java/com/boot/security/server/service/impl/CopyrightBookServiceImpl.java
View file @ d3c83d99
......@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
......@@ -135,11 +136,11 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
}
}
baseSettlement.setTotalAdvertAmount( Double.valueOf(df.format(count1)) );
baseSettlement.setTotalAmount( Double.valueOf(df.format(count2)) );
baseSettlement.setSettlementAdAmount( Double.valueOf(df.format(count3)) );
baseSettlement.setSettlementAmount(Double.valueOf(df.format(count4)));
baseSettlement.setCountSettlement(Double.valueOf(df.format(count5)));
baseSettlement.setTotalAdvertAmount( Double.valueOf(getDecimal(count1)) );
baseSettlement.setTotalAmount( Double.valueOf(getDecimal(count2)) );
baseSettlement.setSettlementAdAmount( Double.valueOf(getDecimal(count3)) );
baseSettlement.setSettlementAmount(Double.valueOf(getDecimal(count4)));
baseSettlement.setCountSettlement(Double.valueOf(getDecimal(count5)));
}
......@@ -315,24 +316,24 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
}
count=Double.valueOf(df.format(count));
count=Double.valueOf(getDecimal(count));
baseSettlement.setTotalAmount(count);
baseSettlement.setSettlementAmount(Double.valueOf(df.format(count*0.5)));
baseSettlement.setSettlementAmount(Double.valueOf(getDecimal(count*0.5)));
count=Double.valueOf(df.format(count1));
count=Double.valueOf(getDecimal(count1));
Integer id = baseSettlement.getCopyrightId();
if(id==3219||id==3230||id==3254||id==3253){
count=Double.valueOf(df.format(baseSettlement.getTotalAmount()+count));
count=Double.valueOf(getDecimal(baseSettlement.getTotalAmount()+count));
baseSettlement.setTotalAmount(count);
baseSettlement.setSettlementAmount(Double.valueOf(df.format(count*0.5)));
baseSettlement.setSettlementAmount(Double.valueOf(getDecimal(count*0.5)));
baseSettlement.setTotalAdvertAmount(0d);
baseSettlement.setSettlementAdAmount(0d);
}else {
baseSettlement.setTotalAdvertAmount(count);
baseSettlement.setSettlementAdAmount(Double.valueOf(df.format(count*0.5)));
baseSettlement.setSettlementAdAmount(Double.valueOf(getDecimal(count*0.5)));
}
baseSettlement.setCountSettlement(Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount())));
baseSettlement.setCountSettlement(Double.valueOf(getDecimal(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount())));
}
Map<Integer, List<BaseSettlement>> collect = baseSettlements.stream().collect(Collectors.groupingBy(BaseSettlement::getCopyrightId));
return collect;
......@@ -508,33 +509,39 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
}
count=Double.valueOf(df.format(count));
count=Double.valueOf(getDecimal(count));
baseSettlement.setTotalAmount(count);
baseSettlement.setSettlementAmount(Double.valueOf(df.format(count*0.5)));
baseSettlement.setSettlementAmount(Double.valueOf(getDecimal(count*0.5)));
count=Double.valueOf(df.format(count1));
count=Double.valueOf(getDecimal(count1));
Integer id = baseSettlement.getCopyrightId();
if(id==3219||id==3230||id==3254||id==3253){
count=Double.valueOf(df.format(baseSettlement.getTotalAmount()+count));
count=Double.valueOf(getDecimal(baseSettlement.getTotalAmount()+count));
baseSettlement.setTotalAmount(count);
baseSettlement.setSettlementAmount(Double.valueOf(df.format(count*0.5)));
baseSettlement.setSettlementAmount(Double.valueOf(getDecimal(count*0.5)));
baseSettlement.setTotalAdvertAmount(0d);
baseSettlement.setSettlementAdAmount(0d);
}else {
baseSettlement.setTotalAdvertAmount(count);
baseSettlement.setSettlementAdAmount(Double.valueOf(df.format(count*0.5)));
baseSettlement.setSettlementAdAmount(Double.valueOf(getDecimal(count*0.5)));
}
baseSettlement.setCountSettlement(Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount())));
baseSettlement.setCountSettlement(Double.valueOf(getDecimal(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount())));
}
Integer count = copyrightDao.selectBookDetailCount(baseSettlementList,bookId,bookName,startTime,endTime);
return PageTableHandler.getJSONObject(baseSettlements,count);
}
public static Double getDecimal(Double f){
BigDecimal bg = new BigDecimal(f);
Double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
return f1;
//BigDecimal bg = new BigDecimal(f);
//Double f1 = bg.setScale(2, RoundingMode.HALF_EVEN).doubleValue();
return Double.valueOf(String.format("%.2f",f));
}
public static void main(String[] args) {
System.out.println(getDecimal(8.655));
}
@Override
public String getAllCopyright() {
......@@ -622,25 +629,25 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
}
count=Double.valueOf(df.format(count));
count=Double.valueOf(getDecimal(count));
baseSettlement.setTotalAmount(count);
baseSettlement.setSettlementAmount(Double.valueOf(df.format(count*0.5)));
baseSettlement.setSettlementAmount(Double.valueOf(getDecimal(count*0.5)));
count=Double.valueOf(df.format(count1));
count=Double.valueOf(getDecimal(count1));
Integer id = baseSettlement.getCopyrightId();
if(id==3219||id==3230||id==3254||id==3253){
count=Double.valueOf(df.format(baseSettlement.getTotalAmount()+count));
count=Double.valueOf(getDecimal(baseSettlement.getTotalAmount()+count));
baseSettlement.setTotalAmount(count);
baseSettlement.setSettlementAmount(Double.valueOf(df.format(count*0.5)));
baseSettlement.setSettlementAmount(Double.valueOf(getDecimal(count*0.5)));
baseSettlement.setTotalAdvertAmount(0d);
baseSettlement.setSettlementAdAmount(0d);
}else {
baseSettlement.setTotalAdvertAmount(count);
baseSettlement.setSettlementAdAmount(Double.valueOf(df.format(count*0.5)));
baseSettlement.setSettlementAdAmount(Double.valueOf(getDecimal(count*0.5)));
}
baseSettlement.setCountSettlement(Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount())));
baseSettlement.setCountSettlement(Double.valueOf(getDecimal(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount())));
if(baseSettlement.getStatus().equals(0)){
schema+=Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount()));
schema+=Double.valueOf(getDecimal(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount()));
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment