Fedex / iClear-api

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
d40f5570 2 parents 638aa190 b5f58c8a

Merge remote-tracking branch 'origin/master-weblogic' into master-weblogic

Inline Side-by-side
Showing 2 changed files with 11 additions and 8 deletions
...@@ -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;
......
...@@ -81,17 +81,17 @@ public class FedexService { ...@@ -81,17 +81,17 @@ public class FedexService {
81 //运单号-->提单号 81 //运单号-->提单号
82 fedexMawb.setBillNo(fedexc.getConsignmentCode()); 82 fedexMawb.setBillNo(fedexc.getConsignmentCode());
83 //经营单位 --> 消费使用/生产销售单位名称 83 //经营单位 --> 消费使用/生产销售单位名称
84 - fedexMawb.setOwnerName(fedexc.getOperateUnitName()); 84 + fedexMawb.setOwnerName(fedexc.getSender());
85 //经营单位海关编码 --> 消费使用/生产销售单位代码 85 //经营单位海关编码 --> 消费使用/生产销售单位代码
86 - fedexMawb.setOwnerCode(fedexc.getOperateUnitCode()); 86 + fedexMawb.setOwnerCode(fedexc.getShipperCustomsCode());
87 //经营单位社会信用证代码 --> 消费使用/生产销售单位单位统一编码 87 //经营单位社会信用证代码 --> 消费使用/生产销售单位单位统一编码
88 - fedexMawb.setOwnerCodeScc(fedexc.getOperateSCC()); 88 + fedexMawb.setOwnerCodeScc(fedexc.getShipperSCC());
89 //发件人 --> 境内收发货人名称 89 //发件人 --> 境内收发货人名称
90 - fedexMawb.setTradeName(fedexc.getSender()); 90 + fedexMawb.setTradeName(fedexc.getOperateUnitName());
91 //发件人海关编码 --> 境内收发货人编号 91 //发件人海关编码 --> 境内收发货人编号
92 - fedexMawb.setTradeCode(fedexc.getShipperCustomsCode()); 92 + fedexMawb.setTradeCode(fedexc.getOperateUnitCode());
93 //发件人社会信用证代码 --> 生产核销单位统一信用代码---报关形式类型 93 //发件人社会信用证代码 --> 生产核销单位统一信用代码---报关形式类型
94 - fedexMawb.setTradeCodeScc(fedexc.getShipperSCC()); 94 + fedexMawb.setTradeCodeScc(fedexc.getOperateSCC());
95 95
96 fedexMawb.setEanNo(fedexc.getEanNo()); 96 fedexMawb.setEanNo(fedexc.getEanNo());
97 //明细 97 //明细
......