需求 #17557

pom.xml

@@ -209,7 +209,7 @@
 				</executions>
 				<configuration>
 					<repository>dockerhub.linkfern.com/b2c/shopapi</repository>
-					<tag>V1.1.7.8.6</tag>
+					<tag>V1.1.7.8.7</tag>
 					<buildArgs>
 						<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
 					</buildArgs>

src/main/java/com/egolm/shop/api/OrderController.java

@@ -102,6 +102,7 @@ public class OrderController {
 		 @ApiImplicitParam(paramType = "query", name = "payTypeID", dataType = "String", required = true, value = "订单付款类型", defaultValue = "1"),    
 		 @ApiImplicitParam(paramType = "query", name = "addrID", dataType = "String", required = true, value = "收货人地址ID", defaultValue = ""),     
 		 @ApiImplicitParam(paramType = "query", name = "orderMemo", dataType = "String", required = true, value = "订单备注", defaultValue = ""),   
+		 @ApiImplicitParam(paramType = "query", name = "cargoTypeID", dataType = "String", required = false, value = "货站ID", defaultValue = "需求 #17557"),   
 		 @ApiImplicitParam(paramType = "query", name = "balanceAmount", dataType = "String", required = false, value = "分账余额", defaultValue = "需求 #17203"), 
 		 @ApiImplicitParam(paramType = "query", name = "payDetails", dataType = "String", required = false, value = "付款详情JSON格式 [{\"PayTypeID\" : \"120\",\"PayType\" : \"微信支付\",\"PayAmount\" : 100.00,\"PayPoint\" : 0.00,\"PayCardNO\" : \"800001000184\"},{\"PayTypeID\" : \"81\",\"PayType\" : \"优惠券\",\"PayAmount\" : 100.00,\"PayPoint\" : 0.00,\"PayCardNO\" : \"800001000184\"}]", defaultValue = "需求 #17402"), 
 		 
@@ -120,6 +121,7 @@ public class OrderController {
 		String addrID = request.getParameter("addrID");
 		String orderMemo = request.getParameter("orderMemo");
 		String balanceAmount = request.getParameter("balanceAmount");
+		String cargoTypeID = request.getParameter("cargoTypeID");  //货站ID
 		
 		String payDetails = request.getParameter("payDetails");
  		if(StringUtil.isNotUndefinedAndNull(balanceAmount)) {
@@ -137,6 +139,7 @@ public class OrderController {
  		map.put("orderMemo", orderMemo);
  		map.put("balanceAmount", balanceAmount); 
  		map.put("payDetails", payDetails); 
+ 		map.put("cargoTypeID", cargoTypeID); 
 		return orderService.submitV2(map);
 	} 
 	

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

@@ -337,7 +337,7 @@ public class OrderServiceImpl implements OrderService {
 					"                                                    and b.nGoodsID = pm.nGoodsID\r\n" + 
 					"                                                  for xml path('')),1,1,''))), \r\n" + 
 					"       pm.sPromoTheme, pm.sPromoActionType sPromoType, pm.sPromoActionTypeID sPromoTypeID,   \r\n" + 
-					"       BrandID = ag.sBrandID, Brand = ag.sBrand   \r\n" + 
+					"       BrandID = ag.sBrandID, Brand = ag.sBrand ,CargoTypeID = ssos.sCargoTypeID ,CargoType = ssos.sCargoType  ,ExpressTel = esd.sTel   \r\n" + 
 					"from tSalesOrderDtl sod join tAgentGoods ag on sod.nAgentID = ag.nAgentID and sod.nGoodsID = ag.nGoodsID   \r\n" + 
 					"                   left join (select distinct a.sPromoPaperNO, sPromoName='', a.sPromoTheme, a.sPromoActionTypeID, a.sPromoActionType, b.nGoodsID                                                                  \r\n" + 
 					"                                                  from tYWPromoMain a, tYWPromoDtl b   \r\n" + 
@@ -352,6 +352,8 @@ public class OrderServiceImpl implements OrderService {
 					"                                                and sos.nGoodsID = sod.nGoodsID   \r\n" + 
 					"												 and sos.nIdx = sod.nIdx  \r\n" + 
 					"                                                and (sos.nTag&1 = sod.nTag&1 or sos.nTag&1-1 = sod.nTag&1-1)   \r\n" + 
+					"  					left join tSalesOrderSub ssos on ssos.sSalesOrderID = sod.sSalesOrderID   \r\n" +
+					"  					left join tExpressSendDtl esd on esd.sSubOrderID  =  ssos.sSubOrderID  "+
 					"where sod.sSalesOrderID = ? "; 
 			orderDtlList = readJdbcTemplate.queryForList(sql2, salesOrderId);
 		}
@@ -1597,10 +1599,12 @@ public class OrderServiceImpl implements OrderService {
 			  
 			String balanceAmount = map.containsKey("balanceAmount")?map.get("balanceAmount")+"":"0";  //需求 #17203 
 			
+			String cargoTypeID = map.containsKey("cargoTypeID")?map.get("cargoTypeID")+"":"";// 货站ID
+			
 			String payDetails = map.get("payDetails")+""; //付款详情
 
 			String sql = "exec up_NewCreatetSalesOrder '" + shopNO + "','', '" + payID + "', '" + terminalTypeID
-					+ "', '" + addrID + "', '" + orderMemo + "', '','', '', '1', '', '', '', '', '', '','0','','' ,'','"+balanceAmount+"' ";
+					+ "', '" + addrID + "', '" + orderMemo + "', '','', '', '1', '', '', '', '', '', '','0','','' ,'','"+balanceAmount+"','"+cargoTypeID+"' ";
 			
 			List<Map<String, Object>> commitMap = jdbcTemplate.executeMutil(sql).getDatas().get(0);
 			logger.info("提交订单V2:{}, 提交结果: {}",GsonUtil.toJson(map),GsonUtil.toJson(commitMap));

src/main/resources/templates/redmine.html

@@ -24,6 +24,8 @@
 </head>
 <body>
 	<div id="app">
+			<el-divider content-position="left">V1.1.7.8.7 2024-10-31</el-divider>
+		<p class="title">1.订货端-订单详情展示【物流电话】、确认订单页-增加【货站】返回-服务  需求 #17557</p>
 		<el-divider content-position="left">V1.1.7.8.6 2024-10-15</el-divider>
 		<p class="title">1.订货端-售后/退款：AgentID参数过滤 需求 #17488</p>
 		<el-divider content-position="left">V1.1.7.8.5 2024-9-25</el-divider>