1：注释更新标准上架的信息代码。

2：修改字符串比较相等的方式。

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

@@ -454,29 +454,29 @@ public class GoodsServiceImpl implements GoodsService {
 		Goods goods = findGoodsByBatchCode(batchCode);
 		if (goods == null) {
 			GoodsHistory history = goodsHistoryDao.findNewByBatchCode(batchCode);
-			if(history.getSourceId() == null) {
-				productStandardPutOnInfoService.updateAvailableQty(history.getStandprodid(), number);
-			}
+//			if(history.getSourceId() == null) {
+//				productStandardPutOnInfoService.updateAvailableQty(history.getStandprodid(), number);
+//			}
 		}else {
 			//更新相应标准上架和标准产品信息
-			ResultMap resultMap = productStandardPutOnInfoService.updateOnSaleQty(goods, NumberUtil.add(goods.getReserve(), number));
-			if(resultMap.getCode() != CodeType.OK.code()) {
-				return resultMap;
+//			ResultMap resultMap = productStandardPutOnInfoService.updateOnSaleQty(goods, NumberUtil.add(goods.getReserve(), number));
+//			if(resultMap.getCode() != CodeType.OK.code()) {
+//				return resultMap;
+//			}
+			Double reserve = goods.getReserve() + number;
+			goods.setReserve(reserve);
+			// 检查是否大于最小发货量
+			if (reserve.doubleValue() >= goods.getMinBuyQty().doubleValue()) {
+				goods.setStatus(Status.AVAILABLE.value());
 			}
-		}
-		Double reserve = goods.getReserve() + number;
-		goods.setReserve(reserve);
-		// 检查是否大于最小发货量
-		if (reserve.doubleValue() >= goods.getMinBuyQty().doubleValue()) {
-			goods.setStatus(Status.AVAILABLE.value());
-		}
 
-		goodsDao.modifyReserve(goods.getBatchCode(), goods.getUuid(), goods.getReserve(), goods.getStatus().intValue());
-		// 每次批次保存同时保存一遍历史信息
-		GoodsHistory goodsHistory = goodsHistoryService.initByGoods(goods, GoodsHistory.OperateType.ReleaseReserve);
-		goodsHistoryService.save(goodsHistory);
-		// 更新器件属性的库存
-		updateComponentTradeInfos(goods.getUuid());
+			goodsDao.modifyReserve(goods.getBatchCode(), goods.getUuid(), goods.getReserve(), goods.getStatus().intValue());
+			// 每次批次保存同时保存一遍历史信息
+			GoodsHistory goodsHistory = goodsHistoryService.initByGoods(goods, GoodsHistory.OperateType.ReleaseReserve);
+			goodsHistoryService.save(goodsHistory);
+			// 更新器件属性的库存
+			updateComponentTradeInfos(goods.getUuid());
+		}
 		return ResultMap.success(goods);
 	}
 

src/main/java/com/uas/platform/b2c/trade/presale/service/impl/CartServiceImpl.java

@@ -18,7 +18,6 @@ import com.uas.platform.b2c.prod.product.component.modal.Component;
 import com.uas.platform.b2c.prod.product.component.service.ComponentService;
 import com.uas.platform.b2c.prod.store.dao.StoreInDao;
 import com.uas.platform.b2c.prod.store.model.StoreIn;
-import com.uas.platform.b2c.trade.order.StringConstant.Currency;
 import com.uas.platform.b2c.trade.presale.dao.CartDao;
 import com.uas.platform.b2c.trade.presale.model.Cart;
 import com.uas.platform.b2c.trade.presale.service.CartService;
@@ -440,7 +439,7 @@ public class CartServiceImpl implements CartService {
 		}else {
 			cart.setNumber(commodity);
 		}
-		cart.setCurrencyName(Currency.USD.equals(commodity.getCurrencyName())? "USD" : "RMB");
+		cart.setCurrencyName(commodity.getCurrencyName() == "USD" ? "USD" : "RMB");
 		cart.setReturnInWeek(commodity.getReturnInWeek());
 		cart.setSupply(commodity.getOriginal());
 		cart.setPack(commodity.getPackaging());