| 
														
															@@ -136,6 +136,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             //预支付交易会话标识 prepay_id 
														 | 
														
														 | 
														
															             //预支付交易会话标识 prepay_id 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             String bodyAsString = EntityUtils.toString(response.getEntity()); 
														 | 
														
														 | 
														
															             String bodyAsString = EntityUtils.toString(response.getEntity()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             //5.APP调起支付API 构造签名串 
														 | 
														
														 | 
														
															             //5.APP调起支付API 构造签名串 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            log.info(bodyAsString); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             String timestamp = DateUtil.currentSeconds() + ""; 
														 | 
														
														 | 
														
															             String timestamp = DateUtil.currentSeconds() + ""; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             String nonce = RandomUtil.randomString(SystemConstant.NUM_32); 
														 | 
														
														 | 
														
															             String nonce = RandomUtil.randomString(SystemConstant.NUM_32); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             StringBuilder builder = new StringBuilder(); 
														 | 
														
														 | 
														
															             StringBuilder builder = new StringBuilder(); 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -168,7 +169,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															     Integer queryAmountByOrderNo(String orderNo) { 
														 | 
														
														 | 
														
															     Integer queryAmountByOrderNo(String orderNo) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         QueryWrapper<Order> wrapper = new QueryWrapper<>(); 
														 | 
														
														 | 
														
															         QueryWrapper<Order> wrapper = new QueryWrapper<>(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        wrapper.select("amount").eq("id",orderNo); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        wrapper.select("amounts_payable").eq("id",orderNo); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         return getOne(wrapper).getAmountsPayable(); 
														 | 
														
														 | 
														
															         return getOne(wrapper).getAmountsPayable(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 |