需求 #14779

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

@@ -222,7 +222,7 @@ public class OrderServiceImpl implements OrderService {
 		List<Map<String, Object>> orderDtlList = new ArrayList<Map<String, Object>>();
 		if(orderMap.size() > 0) {
 			String sql2 = "select sod.*,sos.nSendQty, PromoSalePrice=CONVERT(NUMERIC(12,2),ROUND((sod.nSaleAmount)/sod.nSaleQty,2)),OriginaSaleAmount=sod.nSaleAmount+sod.nDisAmount,ISGift = sod.nTag&1,"
-			        + "   agp.sURL, pm.sPromoTheme, pm.sPromoActionType sPromoType, pm.sPromoActionTypeID sPromoTypeID "
+			        + "   agp.sURL, pm.sPromoName, pm.sPromoTheme, pm.sPromoActionType sPromoType, pm.sPromoActionTypeID sPromoTypeID "
 			      + " from tSalesOrderDtl sod left join tYWPromoMain pm on pm.sPromoPaperNO = sod.sPromoPaperNO "
 			      + "      left join V_GetminAgentGoodsPic agp on agp.nAgentID = sod.nAgentID and agp.nGoodsID = sod.nGoodsID and agp.sPicTypeID = 1"
 			      + "      left join tSalesOrderSubDtl sos on sos.sSalesOrderID = sod.sSalesOrderID  and sos.nGoodsID = sod.nGoodsID "
@@ -408,6 +408,7 @@ public class OrderServiceImpl implements OrderService {
 			      + "sosd.nSendQty - isnull(sosd.nReturnQty,0) LeftReturnQty,  ag.nSaleUnits SaleMulti, ag.sSpec sSpec,"
 			      + "ag.sGoodTypeID GoodTypeID,  "
 			      + "agp.sURL, "
+			      + "pm.sPromoName, "
 			      + "pm.sPromoTheme, "
 			      + "pm.sPromoActionType sPromoType, "
 			      + "pm.sPromoActionTypeID sPromoTypeID "