需求 #14923

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

@@ -67,7 +67,7 @@ public class OrderController {
 	
 	@ApiOperation("订单正式提交(JSON格式)")
 	@ApiImplicitParams({
-		@ApiImplicitParam(paramType = "query", name="data", dataType = "String", required = false, value = "JSON格式", defaultValue = "{\"shopNO\": \"00029975\",\"terminal\": \"wechat\",\"langID\": \"936\",\"payTypeID\":1,\"addrID\":\"111111\",\"orderMemo\":\"备注\",\"couponNO\":\"\",\"couponTypeID\":\"\", \"bankType\": \"xxx\", 'bankAccount': 'xxx', 'bankAccountName': 'xxx', 'revBankType': 'xxx', 'revBankAccount': 'xxx', 'revBankAccountNo': 'xxx', 'formId': 'xxx', 'email': 'xxx', 'salesmanNo': 'xxx'}"),
+		@ApiImplicitParam(paramType = "query", name="data", dataType = "String", required = false, value = "JSON格式", defaultValue = "{\"shopNO\": \"00029975\",\"terminal\": \"wechat\",\"langID\": \"936\",\"payTypeID\":1,\"addrID\":\"111111\",\"orderMemo\":\"备注\",\"couponNO\":\"\",\"couponTypeID\":\"\", \"bankType\": \"xxx\", 'bankAccount': 'xxx', 'bankAccountName': 'xxx', 'revBankType': 'xxx', 'revBankAccount': 'xxx', 'revBankAccountNo': 'xxx', 'formId': 'xxx', 'email': 'xxx', 'salesmanNo': 'xxx','onlinePayTypeID':'xxx','payCardNO':'PayCardNO'}"),
 		 @ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"),  
 		 @ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"), 
  	})

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

@@ -124,6 +124,8 @@ public class OrderServiceImpl implements OrderService {
 			String revBankAccountNo = submitObj.getString("revBankAccountNo");
 			String email = submitObj.getString("email");
 			String salesmanNo = submitObj.getString("salesmanNo");
+			String onlinePayTypeID = submitObj.getString("onlinePayTypeID");  //需求 #14923
+			String payCardNO = submitObj.getString("payCardNO");
 			bankAccountName = StringUtil.isBlank(bankAccountName) ? "" : bankAccountName;
 			revBankType = StringUtil.isBlank(revBankType) ? "" : revBankType;
 			revBankAccount = StringUtil.isBlank(revBankAccount) ? "" : revBankAccount;
@@ -133,12 +135,15 @@ public class OrderServiceImpl implements OrderService {
 					+ "', '" + addrID + "', '" + orderMemo + "', '" + couponNO + "','" + couponTypeID + "', '', '1', '"
 					+ (bankType == null ? "" : bankType) + "', '" + (bankAccount == null ? "" : bankAccount) + "', '"
 					+ bankAccountName + "', '" + revBankType + "', '" + revBankAccount + "', '" + revBankAccountNo
-					+ "'";
+					+ "','"+onlinePayTypeID+"' ,'"+payCardNO+"' ";
+			
 			List<Map<String, Object>> commitMap = jdbcTemplate.executeMutil(sql).getDatas().get(0);
 			if (commitMap != null && commitMap.size() > 0 && commitMap.get(0) != null
 					&& Util.objTo(commitMap.get(0).get("Status"), Integer.class) == 0
 					&& Util.objTo(commitMap.get(commitMap.size() - 1).get("Status"), Integer.class) == 0) {
 				String sSalesOrderID = (String) commitMap.get(0).get("SalesOrderID");
+				//String sOutTradeNO = (String) commitMap.get(0).get("OutTradeNO");
+				
 				jdbcTemplate.update(
 						"update tSalesOrder set sFormID = ?, sEmail = ?, sSalesmanNO = ? where sSalesOrderID = ?",
 						formId, email, salesmanNo, sSalesOrderID);