121

src/main/java/com/egolm/shop/api/service/impl/CartQueryServiceImpl.java

@@ -894,13 +894,20 @@ public class CartQueryServiceImpl implements CartQueryService {
 			BigDecimal TotalAmount = BigDecimal.ZERO;
 			Map<String, Object> goodsFirst = GoodsList.get(0);
 			logger.info("goodsFirst-----"+GsonUtil.toJson(goodsFirst));
-			 
+			String nMinDCAmount = goodsFirst.get("nMinDCAmount")+"";
+			
+			
 			Double MinOrderAmt ;
 			try {
-				MinOrderAmt = Util.objTo(goodsFirst.get("nMinDCAmount"), Double.class);
+				if(StringUtil.isNotEmpty(nMinDCAmount)) {
+					MinOrderAmt = Util.objTo(goodsFirst.get("nMinDCAmount"), Double.class);
+				}else {
+					MinOrderAmt = Double.valueOf("0");
+					logger.info("MinOrderAmt 为null -----空值换值为: "+MinOrderAmt);
+				}
 			} catch (Exception e) {
-				MinOrderAmt = Double.valueOf(0);
-				logger.info("MinOrderAmt 为null -----换值为: "+MinOrderAmt);
+				MinOrderAmt = Double.valueOf("0");
+				logger.info("MinOrderAmt 为null -----异常换值为: "+MinOrderAmt);
 			}
 			String WMSInfo =  goodsFirst.get("sWarehouseName")+""; // 物流名称
 			String sWarehouseNO =   goodsFirst.get("sWarehouseNO")+""; // 物流名称