1

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

@@ -444,7 +444,7 @@ public class OrderServiceImpl implements OrderService {
 				"       ag.sGoodTypeID GoodTypeID, agp.sURL, pm.sPromoName, pm.sPromoTheme, " + 
 				"       pm.sPromoActionType sPromoType, pm.sPromoActionTypeID sPromoTypeID, " + 
 				"       BrandID = ag.sBrandID, Brand = ag.sBrand " + 
-				"from tSalesOrderSubDtl sosd left join (select a.sPromoPaperNO, a.sPromoName, a.sPromoTheme, a.sPromoActionTypeID, a.sPromoActionType, b.nGoodsID " + 
+				" from tSalesOrderSubDtl sosd left join (select a.sPromoPaperNO, a.sPromoName, a.sPromoTheme, a.sPromoActionTypeID, a.sPromoActionType, b.nGoodsID " + 
 				"                                       from tYWPromoMain a, tYWPromoDtl b " + 
 				"                                       where a.sPromoPaperNO = b.sPromoPaperNO " + 
 				"                                         and a.sPromoPaperNORuleID = b.sPromoPaperNO + isnull(convert(varchar,b.nRuleID),'') " + 
@@ -453,7 +453,7 @@ public class OrderServiceImpl implements OrderService {
 				"                                       ) pm on pm.sPromoPaperNO = sosd.sPromoPaperNO and pm.nGoodsID = sosd.nGoodsID " + 
 				"                            left join V_GetminAgentGoodsPic agp on agp.nAgentID = sosd.nAgentID and agp.nGoodsID = sosd.nGoodsID and agp.sPicTypeID = 1 " + 
 				"                            left join tAgentContractGoods ag on sosd.sAgentContractNO = ag.sAgentContractNO and sosd.nGoodsID = ag.nGoodsID " + 
-				"where sosd.sSubOrderID = ?";
+				" where sosd.sSubOrderID = ?";
 		
 		List<Map<String, Object>> dtlList = jdbcTemplate.queryForList(sql, subOrderID);
 		Map<String, Object> deliver = jdbcTemplate.queryForMap(