Commit b63337a9 authored by maliang's avatar maliang

类属性修改

parent 689bfe51
......@@ -149,8 +149,18 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
Double totalAdvertAmountC = baseSettlement.getTotalAdvertAmount();
Double totalAmount = settlement.getTotalAmount();
Double totalAdvertAmount =settlement.getTotalAdvertAmount();
settlement.setBookRadio(Double.valueOf( df.format( totalAmount/totalAmountC ) ));
settlement.setBookAdRadio(Double.valueOf( df.format( totalAdvertAmount/totalAdvertAmountC ) ));
if(totalAmountC!=0.0){
settlement.setBookRadio(Double.valueOf( df.format( totalAmount/totalAmountC ) ));
}else {
settlement.setBookRadio(0.0);
}
if(totalAdvertAmountC!=0.0){
settlement.setBookAdRadio(Double.valueOf( df.format( totalAdvertAmount/totalAdvertAmountC ) ));
}else {
settlement.setBookAdRadio(0.0);
}
}
}
}
......@@ -164,7 +174,8 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
Double count1=0.0;
Double totalAdvertAmount = baseSettlement.getTotalAdvertAmount();
//扣量算法
if(type==1){
if(type.equals(1)){
JSONObject jsonObject = JSONObject.parseObject(context);
Set<String> keySet = jsonObject.keySet();
ArrayList<Integer> list1 = new ArrayList<>();
......
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