需求 #14954

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

@@ -368,22 +368,24 @@ public class OrderServiceImpl implements OrderService {
 				+ "case when so.nOrderStatus&145 = 144 then '16' when so.nOrderStatus&145 = 128 then '8' when so.nOrderStatus&145 = 0 then '4' when so.nOrderStatus&5 = 4 then '2' else '0' end nOrderStatus, "
 				+ "case when so.nOrderStatus&145 = 144 then '已完成' when so.nOrderStatus&145 = 128 then '配送中' when so.nOrderStatus&145 = 0 then '待发货' when so.nOrderStatus&5 = 4 then '已审核' else '未审核' end sOrderStatusText "
 				+ "from tSalesOrder so where so.sSalesOrderID = ?", subOrderMap.get("sSalesOrderID"));
-		String sql = "" + "select "
-				+ "sosd.*,  PromoSalePrice=CONVERT(NUMERIC(12,2),ROUND((sosd.nSaleAmount)/sosd.nSaleQty,2)),OriginaSaleAmount=sosd.nSaleAmount+sosd.nDisAmount,ISGift = sosd.nTag&1, "
-				+ "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 "
-				+ "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),'') "
-				+ "                                     and a.nTag&1=0 "
-				+ "                                     and b.nTag&1=0 "
-				+ "                                  ) 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  = ?";
+		String sql =  "select sosd.*, PromoSalePrice=CONVERT(NUMERIC(12,2),ROUND((sosd.nSaleAmount)/sosd.nSaleQty,2)), "
+				+ " OriginaSaleAmount=sosd.nSaleAmount+sosd.nDisAmount, ISGift = sosd.nTag&1, "
+				+ " 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, "
+				+ " 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 tYWPromoMain a, tYWPromoDtl b "
+				+ " where a.sPromoPaperNO = b.sPromoPaperNO "
+				+ " and a.sPromoPaperNORuleID = b.sPromoPaperNO + isnull(convert(varchar,b.nRuleID),'') "
+				+ " and a.nTag&1=0 "
+				+ " and b.nTag&1=0 "
+				+ " ) 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 = ?";
+
 		List<Map<String, Object>> dtlList = jdbcTemplate.queryForList(sql, subOrderID);
 		Map<String, Object> deliver = jdbcTemplate.queryForMap(
 				"SELECT sum(a.nNum) nTotalCount, sum(a.nPrice * a.nNum) nTotalAmount FROM tSalesOrderDeliverSubDtl a where	a.sSubOrderID = ?",