Browse Source

代采订单复制增加对金额的判断,为空的话不进行格式化处理

hejq 8 years ago
parent
commit
ea6c81686c

+ 12 - 4
src/main/java/com/uas/platform/b2b/service/impl/DeputyOrderServiceImpl.java

@@ -207,7 +207,9 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 			order.setDownloadstatus("未下载");
 			order.setDownloadstatus("未下载");
 			order.setSalecode(deorder.getSalecode());
 			order.setSalecode(deorder.getSalecode());
 			order.setSalepocode(deorder.getSalepocode());
 			order.setSalepocode(deorder.getSalepocode());
-			order.setOrderamount(Double.valueOf(df.format(deorder.getOrderamount())));
+			if(null != deorder.getOrderamount()) {//存在金额为空值的情况
+                order.setOrderamount(Double.valueOf(df.format(deorder.getOrderamount())));
+            }
 			order.setPaymethod(deorder.getPaymethod());
 			order.setPaymethod(deorder.getPaymethod());
 			order.setDeputyname(deorder.getDeputyname());
 			order.setDeputyname(deorder.getDeputyname());
 			if (deorder.getStatus().equals("在录入")) {
 			if (deorder.getStatus().equals("在录入")) {
@@ -218,9 +220,15 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 			order.setTervendaddress(deorder.getTervendaddress());
 			order.setTervendaddress(deorder.getTervendaddress());
 			order.setTervendor(deorder.getTervendor());
 			order.setTervendor(deorder.getTervendor());
 			order.setTervenduu(deorder.getTervenduu());
 			order.setTervenduu(deorder.getTervenduu());
-			order.setTotalamount(Double.valueOf(df.format(deorder.getTotalamount())));
-			order.setTotalpayament(Double.valueOf(df.format(deorder.getTotalpayament())));
-			order.setUsdpayment(Double.valueOf(df.format(deorder.getUsdpayment())));
+			if(null != deorder.getTotalamount()) {
+                order.setTotalamount(Double.valueOf(df.format(deorder.getTotalamount())));
+            }
+            if(null != deorder.getTotalpayament()) {
+                order.setTotalpayament(Double.valueOf(df.format(deorder.getTotalpayament())));
+            }
+            if(null != deorder.getUsdpayment()) {
+                order.setUsdpayment(Double.valueOf(df.format(deorder.getUsdpayment())));
+            }
 			order.setUsertel(deorder.getUsertel());
 			order.setUsertel(deorder.getUsertel());
 			order.setVendtel(deorder.getVendtel());
 			order.setVendtel(deorder.getVendtel());
 			order.setVenduser(deorder.getVenduser());
 			order.setVenduser(deorder.getVenduser());