代采增加币别，费率

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7380 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/service/impl/DeputyOrderServiceImpl.java

@@ -1,5 +1,17 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
 import com.uas.platform.b2b.dao.DeputyOrderDao;
 import com.uas.platform.b2b.dao.DeputyOrderItemDao;
 import com.uas.platform.b2b.dao.VendorDao;
@@ -12,17 +24,6 @@ import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.b2b.temporary.model.DeputyOrderInfo;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Status;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @Service
 public class DeputyOrderServiceImpl implements DeputyOrderService {
@@ -100,6 +101,8 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 					if (rate != null) {
 						Double purcprice = info.getUnitprice() + info.getUnitprice() * vendorRate();
 						info.setPurcprice(purcprice);
+					} else {
+						info.setPurcprice(Double.valueOf(0));
 					}
 					if (info.getProdcode() != null) {
 						modelMap.put("total", total);
@@ -168,7 +171,7 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		order.setEntrystatus(deorder.getEntrystatus());
 		order.setDeputyuu(Long.valueOf(10041166));// TODO 以后需要添加其他中间商
 		order.setRate(vendorRate());
-		order.setCurrency("USD");
+		order.setCurrency(deorder.getCurrency());
 		int i = 1;
 		if (order.getId() == null) {// 新增
 			List<DeputyOrderItem> items = new ArrayList<DeputyOrderItem>();