| 
					
				 | 
			
			
				@@ -1,6 +1,5 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 package com.gree.mall.miniapp.controller.user; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import cn.hutool.core.date.DateUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.baomidou.mybatisplus.core.metadata.IPage; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.miniapp.annotation.ApiNotAuth; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -10,7 +9,6 @@ import com.gree.mall.miniapp.bean.settle.OrderShareBean; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.miniapp.bean.user.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.miniapp.bean.websit.AdminWebsitApplyCount; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.miniapp.bean.worker.WorkerWarrantyDetal; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.gree.mall.miniapp.constant.Constant; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.miniapp.exception.RemoteServiceException; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.miniapp.helper.ResponseHelper; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.miniapp.logic.common.CommonLogic; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -19,9 +17,7 @@ import com.gree.mall.miniapp.logic.common.outside.WechatLogic; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.miniapp.logic.user.UserLogic; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.miniapp.plus.entity.SettleExpenseItem; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.miniapp.plus.entity.User; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.gree.mall.miniapp.plus.entity.WorkerWarranty; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.miniapp.plus.service.UserService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.gree.mall.miniapp.utils.CommonUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import io.swagger.annotations.Api; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import io.swagger.annotations.ApiOperation; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import io.swagger.annotations.ApiParam; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -33,7 +29,6 @@ import org.springframework.web.bind.annotation.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import javax.servlet.http.HttpServletRequest; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.math.BigDecimal; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import java.util.Date; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.List; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 @Slf4j 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -152,9 +147,9 @@ public class UserController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             @ApiParam(required = true, value = "code") @RequestParam(required = true) String userId, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             HttpServletRequest request 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     ) throws RemoteServiceException { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        log.info("打印请求时间"+userId+"开始时间"+ DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//        log.info("打印请求时间"+userId+"开始时间"+ DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         UserWxBean userWxBean = userLogic.userDetail(userId,request); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        log.info("打印请求时间"+userId+"结束时间"+ DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//        log.info("打印请求时间"+userId+"结束时间"+ DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return ResponseHelper.success(userWxBean); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |