| 
					
				 | 
			
			
				@@ -6,7 +6,6 @@ import cn.hutool.core.util.IdUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hutool.core.util.StrUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hutool.json.JSONUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.qmrb.system.common.result.PageResult; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.qmrb.system.common.result.Result; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -17,7 +16,6 @@ import com.qmrb.system.mq.PickCarProducer; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.qmrb.system.pojo.dto.LoginParam; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.qmrb.system.pojo.dto.UserParam; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.qmrb.system.pojo.entity.BarnRecord; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.qmrb.system.pojo.entity.Contract; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.qmrb.system.pojo.entity.Order; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.qmrb.system.pojo.entity.ToolWxConfig; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.qmrb.system.pojo.form.BarnRecordForm; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -283,7 +281,7 @@ public class OrderController extends CommonController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @PostMapping("/wechatPayCallback") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public String wechatCallback(HttpServletRequest request) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ToolWxConfig wxConfig = toolWxConfigService.findConf(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        log.info("微信退款回调通知调用============================="); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        log.info("微信支付回调通知调用============================="); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Map<String, String> result = new HashMap(SystemConstant.NUM_16); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         result.put("code", "FAIL"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         result.put("message", "失败"); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -295,7 +293,7 @@ public class OrderController extends CommonController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             notification.getSummary(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (SystemConstant.PAY_SUCCESS.equals(notification.getSummary())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (orderService.verifyCreateOrder(notification.getDecryptData())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    log.info("==============================微信退款成功订单====================================="); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    log.info("==============================微信支付成功订单====================================="); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     result.put("code", WXOrderConstant.WX_BACK_OK); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     result.put("message", "支付回调成功"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 |