注册相关,查询用户详情,后台切换通道相关
This commit is contained in:
@@ -27,8 +27,7 @@ public class IntroduceController {
|
||||
private AppGuideService appGuideService;
|
||||
|
||||
@GetMapping({"/common", "/common/{code}"})
|
||||
public Result<String> billIntro(@PathVariable(value = "code", required = false) String code, HttpServletRequest httpServletRequest,
|
||||
@RequestParam String typeCode) {
|
||||
public Result<String> billIntro(@PathVariable(value = "code", required = false) String code, HttpServletRequest httpServletRequest) {
|
||||
if (StringUtils.isEmpty(code)) {
|
||||
String html = "<p><img src=\"https://www.shouyinbei.net/resources/images/upload/82031620725808697.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/86751620725811158.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/38401620725814105.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/14561620725816223.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/45071620725822267.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/31221620725827105.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/68211620725829889.jpg\" style=\"\"/></p><p><br/></p>";
|
||||
return ResultGenerator.genSuccessResult(html);
|
||||
@@ -43,7 +42,7 @@ public class IntroduceController {
|
||||
String type = httpServletRequest.getHeader("type");
|
||||
//TODO 暂时安卓开发IOS不开
|
||||
if ("1".equals(type)){
|
||||
return ResultGenerator.genSuccessResult(image(typeCode));
|
||||
return ResultGenerator.genSuccessResult(entity.getContent());
|
||||
}else if ("2".equals(type)){
|
||||
return ResultGenerator.genFailResult("");
|
||||
}
|
||||
|
||||
@@ -382,7 +382,14 @@ public class UserAppController {
|
||||
QueryWrapper<UserPromotion> QueryWrapper = new QueryWrapper<>();
|
||||
QueryWrapper.eq("user_id", result.getUserId());
|
||||
UserPromotion userPromotion = userPromotionService.getOne(QueryWrapper);
|
||||
result.setTypeCode(userPromotion==null?"null":userPromotion.getTypeCode());
|
||||
result.setTypeCode(userPromotion == null?"null":userPromotion.getTypeCode());
|
||||
result.setMinFee(userPromotion == null?"null":userPromotion.getCurrentFee());
|
||||
|
||||
QueryWrapper.clear();
|
||||
QueryWrapper.eq("user_id","244");
|
||||
userPromotion = userPromotionService.getOne(QueryWrapper);
|
||||
result.setMaxFee(userPromotion == null?"null":userPromotion.getCurrentFee());
|
||||
|
||||
return ResultGenerator.genSuccessResult(result);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user