需求 #17605

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

@@ -108,6 +108,7 @@ public class OrderController {
 		 @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 = "payAmount", dataType = "String", required = false, value = "订单总金额", defaultValue = "需求 #17605"), 
 		 @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 需求 #17586 base64"), 
 		 
 
@@ -125,6 +126,7 @@ public class OrderController {
 		String addrID = request.getParameter("addrID");
 		String orderMemo = request.getParameter("orderMemo");
 		String balanceAmount = request.getParameter("balanceAmount");
+		String payAmount = request.getParameter("payAmount");
 		String cargoTypeID = request.getParameter("cargoTypeID");  //货站ID
 		
 		String payDetails = request.getParameter("payDetails");
@@ -145,6 +147,7 @@ public class OrderController {
  		map.put("balanceAmount", balanceAmount); 
  		map.put("payDetails", payDetails); 
  		map.put("cargoTypeID", cargoTypeID); 
+ 		map.put("payAmount", payAmount); 
 		return orderService.submitV2(map);
 	} 
 	

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

@@ -1606,6 +1606,7 @@ public class OrderServiceImpl implements OrderService {
 			String terminalTypeID = "" + map.get("terminal");
 			String addrID = "" + map.get("addrID");
 			String orderMemo = "" + map.get("orderMemo");
+			String payAmount = "" + map.get("payAmount");
 			  
 			String balanceAmount = map.containsKey("balanceAmount")?map.get("balanceAmount")+"":"0";  //需求 #17203 
 			
@@ -1613,7 +1614,7 @@ public class OrderServiceImpl implements OrderService {
 			
 
 			String sql = "exec up_NewCreatetSalesOrder '" + shopNO + "','', '" + payID + "', '" + terminalTypeID
-					+ "', '" + addrID + "', '" + orderMemo + "', '','', '', '1', '', '', '', '', '', '','0','','' ,'','"+balanceAmount+"','"+cargoTypeID+"' ";
+					+ "', '" + addrID + "', '" + orderMemo + "', '','', '', '1', '', '', '', '', '', '','0','','' ,'','"+balanceAmount+"','"+cargoTypeID+"','"+payAmount+"' ";
 			
 			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

@@ -29,6 +29,7 @@
 		<p class="title">2.card接口调用主库</p>
 		<p class="title">3.card query再调一次过程</p>
 		<p class="title">4. submitV2 中payDetails改为base64传参，需求 #17586</p>
+		<p class="title">5. submitV2 中增加payAmount 需求 #17605</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>