| 
														
															@@ -65,6 +65,7 @@ public class PayOrderController { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             PayOrder payOrder = new PayOrder(); 
														 | 
														
														 | 
														
															             PayOrder payOrder = new PayOrder(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             payOrder.setConsumer(appUserInfoList.get(0).getBlogNickName());             //昵称 
														 | 
														
														 | 
														
															             payOrder.setConsumer(appUserInfoList.get(0).getBlogNickName());             //昵称 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             payOrder.setConsumerId(appUserInfoList.get(0).getUserId());                 //用户id 
														 | 
														
														 | 
														
															             payOrder.setConsumerId(appUserInfoList.get(0).getUserId());                 //用户id 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            payOrderRequest.setCustomerPhone(appUserInfoList.get(0).getMobilePhone()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             Random random = new Random(); 
														 | 
														
														 | 
														
															             Random random = new Random(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             String result=""; 
														 | 
														
														 | 
														
															             String result=""; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             for(int i=0;i<6;i++){ 
														 | 
														
														 | 
														
															             for(int i=0;i<6;i++){ 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -193,7 +194,7 @@ public class PayOrderController { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 case "95#": 
														 | 
														
														 | 
														
															                 case "95#": 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     payOrder.setOilType("2"); 
														 | 
														
														 | 
														
															                     payOrder.setOilType("2"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     break; 
														 | 
														
														 | 
														
															                     break; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                case "98#": 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                case "97#": 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     payOrder.setOilType("2"); 
														 | 
														
														 | 
														
															                     payOrder.setOilType("2"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     break; 
														 | 
														
														 | 
														
															                     break; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 case "0#": 
														 | 
														
														 | 
														
															                 case "0#": 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -254,7 +255,7 @@ public class PayOrderController { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             case "95#": 
														 | 
														
														 | 
														
															             case "95#": 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 cardOilsType ="1"; 
														 | 
														
														 | 
														
															                 cardOilsType ="1"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 break; 
														 | 
														
														 | 
														
															                 break; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            case "98#": 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            case "97#": 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 cardOilsType ="1"; 
														 | 
														
														 | 
														
															                 cardOilsType ="1"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 break; 
														 | 
														
														 | 
														
															                 break; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             case "0#": 
														 | 
														
														 | 
														
															             case "0#": 
														 |