Jiaqi.xu

版本号&C类APIC类接口数值处理

...@@ -23,7 +23,7 @@ import java.util.Date; ...@@ -23,7 +23,7 @@ import java.util.Date;
23 @Slf4j 23 @Slf4j
24 public class VersionInterface { 24 public class VersionInterface {
25 //当前版本号 25 //当前版本号
26 - final String VERSION = "1.4"; 26 + final String VERSION = "1.5";
27 27
28 @ApiOperation(value = "获取当前API版本", httpMethod = "GET", notes = "ex: http://192.168.1.71:8080/version/version") 28 @ApiOperation(value = "获取当前API版本", httpMethod = "GET", notes = "ex: http://192.168.1.71:8080/version/version")
29 @GetMapping("/version") 29 @GetMapping("/version")
......
...@@ -281,9 +281,12 @@ public class ChmConsignmentDetailService { ...@@ -281,9 +281,12 @@ public class ChmConsignmentDetailService {
281 public BigDecimal bigDecimalFormat(BigDecimal num){ 281 public BigDecimal bigDecimalFormat(BigDecimal num){
282 BigDecimal bdForMat = null; 282 BigDecimal bdForMat = null;
283 if(num !=null){ 283 if(num !=null){
284 - bdForMat = num.setScale(2, BigDecimal.ROUND_HALF_UP); 284 + if(num.compareTo(BigDecimal.ZERO) == 0){
285 - if(bdForMat.compareTo(BigDecimal.ZERO) == 0){ 285 + bdForMat = new BigDecimal(0);
286 + }else if(num.compareTo(new BigDecimal("0.01"))< 1) {
286 bdForMat = new BigDecimal(0.01).setScale(2,BigDecimal.ROUND_HALF_UP); 287 bdForMat = new BigDecimal(0.01).setScale(2,BigDecimal.ROUND_HALF_UP);
288 + }else{
289 + bdForMat = num.setScale(2, BigDecimal.ROUND_HALF_UP);
287 } 290 }
288 } 291 }
289 return bdForMat; 292 return bdForMat;
......