diff --git a/CatmDogd-Mall-Front-test/src/views/model/banner/index.vue b/CatmDogd-Mall-Front-test/src/views/model/banner/index.vue index cf8bb1b..94628ce 100644 --- a/CatmDogd-Mall-Front-test/src/views/model/banner/index.vue +++ b/CatmDogd-Mall-Front-test/src/views/model/banner/index.vue @@ -65,9 +65,17 @@ - - + + + + + + + + + - + - + + diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAddressController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAddressController.java new file mode 100644 index 0000000..fbf48ff --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAddressController.java @@ -0,0 +1,17 @@ +package com.ruoyi.applet.contoller; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(description = "小程序-地址相关接口") +@RestController +@RequestMapping("/applet/address") +public class ApiAppletAddressController { + + + + + + +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java index 3354ecc..5c4f93c 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java @@ -4,8 +4,10 @@ package com.ruoyi.applet.contoller; import com.ruoyi.applet.pojo.dto.ApiQueryIIdDTO; import com.ruoyi.applet.pojo.dto.ApiQueryIIdMyUserDTO; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.model.domain.AppBanner; import com.ruoyi.model.service.IAApiAppletHhrWorkOutService; import com.ruoyi.model.service.IAApiAppletLoginService; +import com.ruoyi.model.service.IAppBannerService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -13,6 +15,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; @Api(description = "伴宠师-合伙人工作台内部流程") @RestController @@ -22,6 +25,8 @@ public class ApiAppletHhrWorkOutController { //伴宠师-登录相关问题 @Resource private IAApiAppletHhrWorkOutService apiAppletHhrWorkOutService; + @Resource + private IAppBannerService bannerService; //合伙人工作台 - 绑定用户基础信息 @@ -56,6 +61,13 @@ public class ApiAppletHhrWorkOutController { return apiAppletHhrWorkOutService.HhrMyUserGetById(appUserId); } + //获取bannerList + @ApiOperation("合伙人工作台 - 获取bannerList") + @GetMapping("/bannerList") + public AjaxResult bannerList(){ + List bannerList = bannerService.getBannerList(); + return AjaxResult.success(bannerList); + } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletInfoController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletInfoController.java index 5c3b5a9..b454796 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletInfoController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletInfoController.java @@ -1,28 +1,34 @@ package com.ruoyi.applet.contoller; +import com.ruoyi.applet.pojo.dto.ApiQueryIIdMyUserDTO; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.model.domain.AppUsers; +import com.ruoyi.model.service.IAppUsersService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.web.bind.annotation.*; @Api(description = "伴宠师-我的流程") @RestController @RequestMapping("/applet/info") public class ApiAppletInfoController { - - - - - - - - - - + @Autowired + private IAppUsersService appUsersService; + + //修改用户信息接口 + @ApiOperation("修改用户信息接口") + @PostMapping("/updateInfo") + public AjaxResult updateInfo(@RequestBody AppUsers appUsers){ + if((appUsers.getUserId() == null)){ + return AjaxResult.error("用户标识不能为空"); + } + appUsersService.updateAppUsers(appUsers); + return AjaxResult.success("修改成功"); + } }