Commit 8b836712 authored by 张永's avatar 张永

1

parent fa24b17c
...@@ -322,7 +322,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -322,7 +322,7 @@ public class OrderServiceImpl implements OrderService {
List<Map<String, Object>> subList = jdbcTemplate.queryForList(sql, salesOrderId); List<Map<String, Object>> subList = jdbcTemplate.queryForList(sql, salesOrderId);
if(subList.size() > 0) { if(subList.size() > 0) {
List<String> subIds = subList.stream().map(o-> (String)o.get("sSubOrderID")).collect(Collectors.toList()); List<String> subIds = subList.stream().map(o-> (String)o.get("sSubOrderID")).collect(Collectors.toList());
String sql2 = "select sosd.*,PromoSalePrice=CONVERT(NUMERIC(12,2),ROUND((sosd.nSaleAmount-sosd.nDisAmount)/sosd.nSaleQty,2)),RealSaleAmount=sosd.nSaleAmount-sosd.nDisAmount,ISGift = sosd.nTag&1," + String sql2 = "select sosd.*,PromoSalePrice=CONVERT(NUMERIC(12,2),ROUND((sosd.nSaleAmount-sosd.nDisAmount)/sosd.nSaleQty,2)),RealSaleAmount=sosd.nSaleAmount-sosd.nDisAmount,ISGift = sosd.nTag&1,"
+ " agp.sURL, pm.sPromoTheme, pm.sPromoActionType sPromoType, pm.sPromoActionTypeID sPromoTypeID " + " agp.sURL, pm.sPromoTheme, pm.sPromoActionType sPromoType, pm.sPromoActionTypeID sPromoTypeID "
+ " from tSalesOrderSubDtl sosd left join tYWPromoMain pm on pm.sPromoPaperNO = sosd.sPromoPaperNO left join V_GetminAgentGoodsPic agp on agp.nAgentID = sosd.nAgentID and agp.nGoodsID = sosd.nGoodsID and agp.sPicTypeID = 1" + " from tSalesOrderSubDtl sosd left join tYWPromoMain pm on pm.sPromoPaperNO = sosd.sPromoPaperNO left join V_GetminAgentGoodsPic agp on agp.nAgentID = sosd.nAgentID and agp.nGoodsID = sosd.nGoodsID and agp.sPicTypeID = 1"
+ " where sosd.sSubOrderID in (" + StringUtil.join("', '", "'", "'", subIds) + ")"; + " where sosd.sSubOrderID in (" + StringUtil.join("', '", "'", "'", subIds) + ")";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment