|
|
|
@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletRequest; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
@RestController |
|
|
|
@RequestMapping("wxCUserBasicInfo") |
|
|
|
@@ -40,7 +41,7 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
|
private WxCUserTagsService wxCUserTagsService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WxTagsService wxTagsService; |
|
|
|
private WxCUserCarService wxCUserCarService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WxCouponOrderService wxCouponOrderService; |
|
|
|
@@ -78,6 +79,15 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void setUserInfoCar(WxCUserBasicInfo info) { |
|
|
|
WxCUserCar wxCUserCar = new WxCUserCar(); |
|
|
|
wxCUserCar.setCUserId(info.getId()); |
|
|
|
List<WxCUserCar> list = wxCUserCarService.getList(wxCUserCar); |
|
|
|
if (list.size() > 0) { |
|
|
|
info.setCarList(list.stream().map(p -> p.getCarNumber()).collect(Collectors.toList())); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("分页列表接口") |
|
|
|
@GetMapping("list") |
|
|
|
@@ -168,7 +178,7 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
|
|
|
|
|
setUserInfoTag(info); |
|
|
|
setUserInfoLevel(info); |
|
|
|
|
|
|
|
setUserInfoCar(info); |
|
|
|
return new ResultData(info); |
|
|
|
} |
|
|
|
|
|
|
|
|