认款

SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java

@@ -49,6 +49,7 @@ import javax.validation.Valid;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 import org.springframework.util.CollectionUtils;
@@ -214,7 +215,7 @@ public class CollectionController {
                     List<PoundlistEntity> poundlist1 = new ArrayList<>();
                     for (PoundlistEntity pound : poundlist){
                         if (pound.getSalesPrice()!=null && pound.getSettlement()!=null) {
-                            amount = amount.add(pound.getSalesPrice().multiply(pound.getSettlement()));
+                            amount = amount.add(pound.getSalesPrice().multiply(pound.getSettlement())).setScale(2, RoundingMode.HALF_UP);
                             if (amount.compareTo(sum) < 1) {
                                 poundlist1.add(pound);
                             }else{
@@ -235,8 +236,8 @@ public class CollectionController {
                     collectionEntity.setStatus("2");
                     collectionEntity.setBusinessDate(new Date());
                     collectionService.updateById(collectionEntity);
-                    return ActionResult.success("认款成功");
                 }
+                return ActionResult.success("认款成功");
             }
         }
         return ActionResult.fail("请选择一条数据");