V1.1.7

8fd412bc · 张永 · d84bef4b · 8fd412bc · 8fd412bc · 8fd412bc
Commit 8fd412bc authored Jan 11, 2024 by 张永
Hide whitespace changes
Inline Side-by-side

Showing with 33 additions and 9 deletions

pom.xml pom.xml +1 -1

OrderServiceImpl.java ...ava/com/egolm/shop/api/service/impl/OrderServiceImpl.java +29 -7

redmine.html src/main/resources/templates/redmine.html +3 -1

No files found.
--- a/pom.xml
+++ b/pom.xml
@@ -207,7 +207,7 @@
 				</executions>
 				<configuration>
 					<repository>dockerhub.linkfern.com/b2c/shopapi</repository>
-					<tag>V1.1.6</tag>
+					<tag>V1.1.7</tag>
 					<buildArgs>
 						<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
 					</buildArgs>

--- a/src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java
@@ -331,7 +331,7 @@ public class OrderServiceImpl implements OrderService {
 					"where sod.sSalesOrderID = ? "; 
 			orderDtlList = jdbcTemplate.queryForList(sql2, salesOrderId);
 		}
-		Map<String, Object> payMap = new HashMap<String,Object>();
+	/*	Map<String, Object> payMap = new HashMap<String,Object>();
 		try {
 			String sqlPay = "select sPayTypeID, sPayType, nPayAmount, sOutTradeNO, sTransTraceNO, dPayDateTime, sStatusID = case when nTag&2=2 then '1' else '0' end, sStatus = case when nTag&2=2 then '已付款' else '未付款' end "
 					+ ", create_time = replace(convert(varchar(10),dCreateDate,120),'-','') + replace(convert(varchar(10),dCreateDate,108),':','') " 
@@ -340,9 +340,25 @@ public class OrderServiceImpl implements OrderService {
 			payMap = jdbcTemplate.queryForMap(sqlPay, salesOrderId);
 			payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"));
 		} catch (Exception e) { 
-		}
+		}*/
+		
+		List<Map<String, Object>> payList = new ArrayList<Map<String, Object>>();
+		try {
+			String sqlPay = "select sPayTypeID, sPayType, nPayAmount, sOutTradeNO, sTransTraceNO, dPayDateTime, sStatusID = case when nTag&2=2 then '1' else '0' end, sStatus = case when nTag&2=2 then '已付款' else '未付款' end "
+					+ ", create_time = replace(convert(varchar(10),dCreateDate,120),'-','') + replace(convert(varchar(10),dCreateDate,108),':','') " 
+					+ "from tSalesOrderPay "
+			              + "where sSalesOrderID = ? ";
+			payList = jdbcTemplate.queryForList(sqlPay, salesOrderId);
+			if(payList != null && payList.size()>0) {
+				for(int i =0;i<payList.size();i++) {
+					Map<String, Object>  payMap = payList.get(i);
+					payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"));
+				}
+			}
+		} catch (Exception e) { 
+		} 
 		
-		return Rjx.jsonOk().set("payData", payMap).set("list", orderMap).set("detail", orderDtlList).toJson();
+		return Rjx.jsonOk().set("payData", payList).set("list", orderMap).set("detail", orderDtlList).toJson();
 	}

 	@Override
@@ -519,18 +535,24 @@ public class OrderServiceImpl implements OrderService {
 		String sql3 = "select sSubOrderID, nOrderMoney, sAocOrderID, sAocOrderNumber, nOrderNum, nPickupNum, sExpressNO, sExpressName from tSalesOrderDeliverSub where nTag&1 = 0 and  sSubOrderID = ?";
 		List<Map<String, Object>> deliverSubList = jdbcTemplate.queryForList(sql3, subOrderID);
 		
-		Map<String, Object> payMap = new HashMap<String,Object>();
+		List<Map<String, Object>> payList = new ArrayList<Map<String, Object>>();
 		try {
 			String sqlPay = "select sPayTypeID, sPayType, nPayAmount, sOutTradeNO, sTransTraceNO, dPayDateTime, sStatusID = case when nTag&2=2 then '1' else '0' end, sStatus = case when nTag&2=2 then '已付款' else '未付款' end "
 			              + "from tSalesOrderPay "
 			              + "where sSalesOrderID = ? ";
-			payMap = jdbcTemplate.queryForMap(sqlPay, subOrderMap.get("sSalesOrderID"));
-			payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"));
+			payList = jdbcTemplate.queryForList(sqlPay, subOrderMap.get("sSalesOrderID"));
+			if(payList != null && payList.size()>0) {
+				for(int i =0;i<payList.size();i++) {
+					Map<String, Object>  payMap = payList.get(i);
+					payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"));
+				}
+			}
+			
 		} catch (Exception e) { 
 		}
 		
 		
-		return Rjx.jsonOk().set("deliver", deliver).set("deliverList", deliverSubList).set("order", orderMap).set("payData", payMap)
+		return Rjx.jsonOk().set("deliver", deliver).set("deliverList", deliverSubList).set("order", orderMap).set("payData", payList)
 				.set("subOrder", subOrderMap).set("list", dtlList).toJson();
 	}


--- a/src/main/resources/templates/redmine.html
+++ b/src/main/resources/templates/redmine.html
@@ -24,7 +24,9 @@
 </head>
 <body>
 	<div id="app">
-	 <el-divider content-position="left">V1.1.6 2024-1-4</el-divider>
+			<el-divider content-position="left">V1.1.7 2024-1-11</el-divider>
+			 <p class="title">1.订单详情返回payData改为多条返回</p> 
+	     <el-divider content-position="left">V1.1.6 2024-1-4</el-divider>
         <p class="title">1.Bug #16271 增加了处理非当前经销商的数据，但是用户无法知道商品为啥被删掉了</p> 
         <p class="title">1.需求 #16303 订单详情显示重复商品BUG</p> 
 	    <el-divider content-position="left">V1.1.5 2023-12-25</el-divider>