处理批量修改在售产品时，美金价格不存在的情况。

处理买家批量导入时，没有批次号等信息问题。

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2c.prod.commodity.service.impl;
 
+import com.uas.platform.b2c.common.account.service.EnterpriseService;
 import com.uas.platform.b2c.common.base.dao.CommonDao;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.constant.IntegerConstant;
@@ -57,6 +58,7 @@ import com.uas.platform.b2c.prod.store.service.StoreInService;
 import com.uas.platform.b2c.trade.order.StringConstant.Currency;
 import com.uas.platform.b2c.trade.presale.model.TradeDeliveryDelayTime;
 import com.uas.platform.b2c.trade.presale.service.TradeDeliveryDelayTimeService;
+import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.b2c.trade.util.BoundedExecutor;
 import com.uas.platform.core.exception.IllegalOperatorException;
@@ -173,6 +175,9 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 	@Autowired
 	private InOutboundDetailService inOutboundDetailService;
 
+	@Autowired
+	private EnterpriseService enterpriseService;
+
 	/**
 	 * 控制任务提交速度的线程池
 	 */
@@ -462,6 +467,13 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		if (rowNum > ModifyConstant.EXCEL_MAX_ROW) {
 			throw new IllegalOperatorException("您上传的信息超过2000条，请拆分成2000以再在上传");
 		}
+		ResultMap currencyResultMap = enterpriseService.getCurrencyByRegisterAddress();
+		String currency = "";
+		if (currencyResultMap.getCode() == CodeType.OK.code()) {
+			currency = (String) currencyResultMap.getData();
+		} else {
+			throw new IllegalOperatorException(currencyResultMap.getMessage());
+		}
 		List<ReleaseProductByBatch> batchList = new ArrayList<>(rowNum);
 		List<ReleaseProductByBatch> repeatBatchList = new ArrayList<>(rowNum);
 		String batch = createNumberService.getTimeNumber("product$goods", 8, rowNum);
@@ -471,6 +483,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		for (int r = 2; r <= rowNum; r++) {
 			Row row = sheet.getRow(r);
 			ReleaseProductByBatch aBatch = new ReleaseProductByBatch();
+			aBatch.setCurrency(currency);
 			Object skuObj = readWorkBookCell(row.getCell(ModifyConstant.SKU_CODE), Cell.CELL_TYPE_STRING,
 					r, ModifyConstant.SKU_CODE);
 			aBatch.setBatchCodeByExcel(skuObj);

src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseProductServiceImpl.java

@@ -18,6 +18,7 @@ import com.uas.platform.b2c.prod.commodity.model.Goods;
 import com.uas.platform.b2c.prod.commodity.model.GoodsHistory;
 import com.uas.platform.b2c.prod.commodity.model.ProductPrivate;
 import com.uas.platform.b2c.prod.commodity.model.ReleaseProductByBatch;
+import com.uas.platform.b2c.prod.commodity.service.GoodsService;
 import com.uas.platform.b2c.prod.commodity.service.ProductService;
 import com.uas.platform.b2c.prod.commodity.service.ReleaseProductByBatchService;
 import com.uas.platform.b2c.prod.commodity.type.ProductConstant;
@@ -78,6 +79,9 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
     @Autowired
     private GoodsHistoryDao goodsHistoryDao;
 
+    @Autowired
+    private GoodsService goodsService;
+
     /**
      * 物料服务访问路径
      */
@@ -391,6 +395,7 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
                     ProductConstant.DEFAULT_MAX_DELIVERY, ProductConstant.DEFAULT_MIN_DELIVERY, ProductConstant.DEFAULT_MIN_BUYQTY,
                     ProductConstant.DEFAULT_MIN_PACKQTY, Status.NO_SHELVE.value());
             goods = productService.bindProductToGoods(goods, product);
+            goodsService.setGoodsDefault(goods);
             finalGoodsList.add(goods);
             ProductPrivate productPrivate;
             List<ProductPrivate> privates = productPrivateDao.findByPrId(product.getId());