处理汇率的bug

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/BankTransferServiceImpl.java

@@ -288,7 +288,9 @@ public class BankTransferServiceImpl implements BankTransferService {
         bankTransfer.setTransferTime(new Date());
         bankTransfer.setTranferCreateTime(new Date());
         bankTransfer.setBuyername(user.getUserName());
-        bankTransfer.setBuyerentername(user.getEnterprise().getEnName());
+		if (user.getEnterprise() != null) {
+			bankTransfer.setBuyerentername(user.getEnterprise().getEnName());
+		}
         bankTransfer.setOrderid(order);
 		if (com.uas.platform.b2c.core.constant.Type.PAIDTOVENDOR.name().equals(bankTransfer.getType())) {// 付款类型为分期付款
 			if (orderIds.length > 1)

src/main/java/com/uas/platform/b2c/fa/settlement/service/impl/ExchangeRateServiceImpl.java

@@ -6,6 +6,7 @@ import com.uas.platform.b2c.fa.settlement.dao.ExchangeRateDao;
 import com.uas.platform.b2c.fa.settlement.model.ExchangeRate;
 import com.uas.platform.b2c.fa.settlement.service.ExchangeRateService;
 import com.uas.platform.b2c.trade.support.ResultMap;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -58,7 +59,10 @@ public class ExchangeRateServiceImpl implements ExchangeRateService {
     @Override
     public ResultMap getExchangeRate(String type) {
         List<ExchangeRate> exchangeRates = exchangeRateDao.findByFromCurrency(type);
-        return ResultMap.success(exchangeRates);
+        if (CollectionUtils.isNotEmpty(exchangeRates)) {
+            return ResultMap.success(exchangeRates.get(0));
+        }
+        return ResultMap.success(null);
     }
 
     /**