From 0cf5871afb1c4202e48968240d8949afe0ac826c Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Fri, 9 Apr 2021 18:14:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E8=AE=A4=E8=AF=81=E3=80=81?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=8B=93=E5=B1=95=E5=B1=9E=E6=80=A7=E3=80=81?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 + .../shopauditlog/ShopAuditLogController.java | 28 +- .../ShopCertificationController.java | 11 + .../api/userexpand/UserExpandController.java | 51 +++ .../userexpand/UserExpandAppController.java | 65 ++++ .../dao/userexpand/IUserExpandDao.java | 120 +++++++ .../pojo/bos/userexpand/UserExpandBO.java | 69 ++++ .../ShopCertificationDTO.java | 30 ++ .../pojo/dtos/userexpand/UserExpandDTO.java | 68 ++++ .../pojo/pos/userexpand/UserExpandPO.java | 69 ++++ .../pojo/vos/shopauditlog/ShopAuditLogVO.java | 4 +- .../pojo/vos/userexpand/UserExpandVO.java | 61 ++++ .../service/shop/impl/ShopServiceImpl.java | 2 - .../impl/ShopAuditLogServiceImpl.java | 20 +- .../IShopCertificationService.java | 8 + .../impl/ShopCertificationServiceImpl.java | 27 ++ .../shopstaff/impl/ShopStaffServiceImpl.java | 13 + .../userexpand/IUserExpandService.java | 30 ++ .../impl/UserExpandServiceImpl.java | 135 +++++++ .../shop-certification-mapper.xml | 6 +- .../mapper/userexpand/user-expand-mapper.xml | 224 ++++++++++++ .../static/route/shopauditlog/audit.html | 57 +-- .../static/route/shopauditlog/show.html | 12 +- .../static/route/shopcertification/list.html | 22 +- .../static/route/userexpand/list.html | 280 +++++++++++++++ .../static/route/userexpand/save.html | 323 +++++++++++++++++ .../static/route/userexpand/show.html | 329 +++++++++++++++++ .../static/route/userexpand/update.html | 340 ++++++++++++++++++ 28 files changed, 2324 insertions(+), 87 deletions(-) create mode 100644 src/main/java/cn/com/tenlion/controller/api/userexpand/UserExpandController.java create mode 100644 src/main/java/cn/com/tenlion/controller/app/apis/userexpand/UserExpandAppController.java create mode 100644 src/main/java/cn/com/tenlion/dao/userexpand/IUserExpandDao.java create mode 100644 src/main/java/cn/com/tenlion/pojo/bos/userexpand/UserExpandBO.java create mode 100644 src/main/java/cn/com/tenlion/pojo/dtos/userexpand/UserExpandDTO.java create mode 100644 src/main/java/cn/com/tenlion/pojo/pos/userexpand/UserExpandPO.java create mode 100644 src/main/java/cn/com/tenlion/pojo/vos/userexpand/UserExpandVO.java create mode 100644 src/main/java/cn/com/tenlion/service/userexpand/IUserExpandService.java create mode 100644 src/main/java/cn/com/tenlion/service/userexpand/impl/UserExpandServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/userexpand/user-expand-mapper.xml create mode 100644 src/main/resources/static/route/userexpand/list.html create mode 100644 src/main/resources/static/route/userexpand/save.html create mode 100644 src/main/resources/static/route/userexpand/show.html create mode 100644 src/main/resources/static/route/userexpand/update.html diff --git a/pom.xml b/pom.xml index db12229..c8a8f2b 100644 --- a/pom.xml +++ b/pom.xml @@ -106,6 +106,13 @@ java-sdk 4.8.0 + + + ink.wgink + login-wechat + 1.0-SNAPSHOT + + diff --git a/src/main/java/cn/com/tenlion/controller/api/shopauditlog/ShopAuditLogController.java b/src/main/java/cn/com/tenlion/controller/api/shopauditlog/ShopAuditLogController.java index d03f36a..7ddaea3 100644 --- a/src/main/java/cn/com/tenlion/controller/api/shopauditlog/ShopAuditLogController.java +++ b/src/main/java/cn/com/tenlion/controller/api/shopauditlog/ShopAuditLogController.java @@ -43,29 +43,6 @@ public class ShopAuditLogController extends DefaultBaseController { return new SuccessResult(); } - @ApiOperation(value = "删除", notes = "删除接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "ID列表,用下划线分隔", paramType = "path", example = "1_2_3") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @DeleteMapping("remove/{ids}") - public SuccessResult remove(@PathVariable("ids") String ids) { - shopAuditLogService.remove(Arrays.asList(ids.split("\\_"))); - return new SuccessResult(); - } - - @ApiOperation(value = "修改", notes = "修改接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "shopAuditLogId", value = "ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PutMapping("update/{shopAuditLogId}") - @CheckRequestBodyAnnotation - public SuccessResult update(@PathVariable("shopAuditLogId") String shopAuditLogId, @RequestBody ShopAuditLogVO shopAuditLogVO) { - shopAuditLogService.update(shopAuditLogId, shopAuditLogVO); - return new SuccessResult(); - } - @ApiOperation(value = "详情", notes = "详情接口") @ApiImplicitParams({ @ApiImplicitParam(name = "shopAuditLogId", value = "ID", paramType = "path") @@ -78,9 +55,10 @@ public class ShopAuditLogController extends DefaultBaseController { @ApiOperation(value = "列表", notes = "列表接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("list") - public List list() { + @GetMapping("list/{bId}") + public List list(@PathVariable("bId") String bId) { Map params = requestParams(); + params.put("auditBId",bId); return shopAuditLogService.list(params); } diff --git a/src/main/java/cn/com/tenlion/controller/api/shopcertification/ShopCertificationController.java b/src/main/java/cn/com/tenlion/controller/api/shopcertification/ShopCertificationController.java index 1ddb8a5..354498e 100644 --- a/src/main/java/cn/com/tenlion/controller/api/shopcertification/ShopCertificationController.java +++ b/src/main/java/cn/com/tenlion/controller/api/shopcertification/ShopCertificationController.java @@ -34,6 +34,17 @@ public class ShopCertificationController extends DefaultBaseController { @Autowired private IShopCertificationService shopCertificationService; + @ApiOperation(value = "修改店铺认证状态", notes = "修改店铺认证接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "shopCertificationId", value = "店铺认证ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("updateAuditStatus/{shopCertificationId}/{auditStatus}") + public SuccessResult updateAuditStatus(@PathVariable("shopCertificationId") String shopCertificationId,@PathVariable("auditStatus") String auditStatus) { + shopCertificationService.updateAuditStatus(shopCertificationId, auditStatus); + return new SuccessResult(); + } + @ApiOperation(value = "新增店铺认证", notes = "新增店铺认证接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @PostMapping("save") diff --git a/src/main/java/cn/com/tenlion/controller/api/userexpand/UserExpandController.java b/src/main/java/cn/com/tenlion/controller/api/userexpand/UserExpandController.java new file mode 100644 index 0000000..7ed1d2f --- /dev/null +++ b/src/main/java/cn/com/tenlion/controller/api/userexpand/UserExpandController.java @@ -0,0 +1,51 @@ +package cn.com.tenlion.controller.api.userexpand; + +import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultData; +import ink.wgink.pojo.result.SuccessResultList; +import cn.com.tenlion.pojo.dtos.userexpand.UserExpandDTO; +import cn.com.tenlion.pojo.vos.userexpand.UserExpandVO; +import cn.com.tenlion.service.userexpand.IUserExpandService; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: UserExpandController + * @Description: + * @Author: CodeFactory + * @Date: 2021-04-09 14:12:12 + * @Version: 3.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "用户拓展信息接口") +@RestController +@RequestMapping(ISystemConstant.API_PREFIX + "/userexpand") +public class UserExpandController extends DefaultBaseController { + + @Autowired + private IUserExpandService userExpandService; + + + @ApiOperation(value = "详情(通过ID)", notes = "详情(通过ID)接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "userId", value = "用户ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{userId}") + public UserExpandDTO get(@PathVariable("userId") String userId) { + return userExpandService.get(userId); + } + + + + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/controller/app/apis/userexpand/UserExpandAppController.java b/src/main/java/cn/com/tenlion/controller/app/apis/userexpand/UserExpandAppController.java new file mode 100644 index 0000000..ea1df25 --- /dev/null +++ b/src/main/java/cn/com/tenlion/controller/app/apis/userexpand/UserExpandAppController.java @@ -0,0 +1,65 @@ +package cn.com.tenlion.controller.app.apis.userexpand; + +import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultData; +import ink.wgink.pojo.result.SuccessResultList; +import cn.com.tenlion.pojo.dtos.userexpand.UserExpandDTO; +import cn.com.tenlion.pojo.vos.userexpand.UserExpandVO; +import cn.com.tenlion.service.userexpand.IUserExpandService; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: UserExpandAppController + * @Description: + * @Author: CodeFactory + * @Date: 2021-04-09 14:12:12 + * @Version: 3.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "个人拓展信息接口") +@RestController +@RequestMapping(ISystemConstant.APP_PREFIX + "/userexpand") +public class UserExpandAppController extends DefaultBaseController { + + @Autowired + private IUserExpandService userExpandService; + + + + + @ApiOperation(value = "新增", notes = "新增接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save") + @CheckRequestBodyAnnotation + public SuccessResult save(@RequestHeader("token") String token, @RequestBody UserExpandVO userExpandVO) { + userExpandService.save(token, userExpandVO); + return new SuccessResult(); + } + + @ApiOperation(value = "详情(通过ID)", notes = "详情(通过ID)接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "userId", value = "用户ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{userId}") + public UserExpandDTO get(@RequestHeader("token") String token, @PathVariable("userId") String userId) { + return userExpandService.get(userId); + } + + + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/dao/userexpand/IUserExpandDao.java b/src/main/java/cn/com/tenlion/dao/userexpand/IUserExpandDao.java new file mode 100644 index 0000000..9c7368a --- /dev/null +++ b/src/main/java/cn/com/tenlion/dao/userexpand/IUserExpandDao.java @@ -0,0 +1,120 @@ +package cn.com.tenlion.dao.userexpand; + +import ink.wgink.exceptions.RemoveException; +import ink.wgink.exceptions.SaveException; +import ink.wgink.exceptions.SearchException; +import ink.wgink.exceptions.UpdateException; +import cn.com.tenlion.pojo.bos.userexpand.UserExpandBO; +import cn.com.tenlion.pojo.pos.userexpand.UserExpandPO; +import cn.com.tenlion.pojo.dtos.userexpand.UserExpandDTO; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: IUserExpandDao + * @Description: + * @Author: CodeFactory + * @Date: 2021-04-09 14:12:12 + * @Version: 3.0 + **/ +@Repository +public interface IUserExpandDao { + + /** + * 新增 + * + * @param params + * @throws SaveException + */ + void save(Map params) throws SaveException; + + /** + * 删除 + * + * @param params + * @throws RemoveException + */ + void remove(Map params) throws RemoveException; + + /** + * 删除(物理) + * + * @param params + * @throws RemoveException + */ + void delete(Map params) throws RemoveException; + + /** + * 修改 + * + * @param params + * @throws UpdateException + */ + void update(Map params) throws UpdateException; + + /** + * 详情 + * + * @param params + * @return + * @throws SearchException + */ + UserExpandDTO get(Map params) throws SearchException; + + /** + * 详情 + * + * @param params + * @return + * @throws SearchException + */ + UserExpandBO getBO(Map params) throws SearchException; + + /** + * 详情 + * + * @param params + * @return + * @throws SearchException + */ + UserExpandPO getPO(Map params) throws SearchException; + + /** + * 列表 + * + * @param params + * @return + * @throws SearchException + */ + List list(Map params) throws SearchException; + + /** + * 列表 + * + * @param params + * @return + * @throws SearchException + */ + List listBO(Map params) throws SearchException; + + /** + * 列表 + * + * @param params + * @return + * @throws SearchException + */ + List listPO(Map params) throws SearchException; + + /** + * 统计 + * + * @param params + * @return + * @throws SearchException + */ + Integer count(Map params) throws SearchException; + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/pojo/bos/userexpand/UserExpandBO.java b/src/main/java/cn/com/tenlion/pojo/bos/userexpand/UserExpandBO.java new file mode 100644 index 0000000..d697787 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/bos/userexpand/UserExpandBO.java @@ -0,0 +1,69 @@ +package cn.com.tenlion.pojo.bos.userexpand; + +/** + * + * @ClassName: UserExpandBO + * @Description: + * @Author: CodeFactory + * @Date: 2021-04-09 14:12:12 + * @Version: 3.0 + **/ +public class UserExpandBO { + + private String userExpandId; + private String userId; + private String summary; + private String photo; + private String video; + private Integer isDelete; + + public String getUserExpandId() { + return userExpandId == null ? "" : userExpandId.trim(); + } + + public void setUserExpandId(String userExpandId) { + this.userExpandId = userExpandId; + } + + public String getUserId() { + return userId == null ? "" : userId.trim(); + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getSummary() { + return summary == null ? "" : summary.trim(); + } + + public void setSummary(String summary) { + this.summary = summary; + } + + public String getPhoto() { + return photo == null ? "" : photo.trim(); + } + + public void setPhoto(String photo) { + this.photo = photo; + } + + public String getVideo() { + return video == null ? "" : video.trim(); + } + + public void setVideo(String video) { + this.video = video; + } + + public Integer getIsDelete() { + return isDelete == null ? 0 : isDelete; + } + + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + +} diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/shopcertification/ShopCertificationDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/shopcertification/ShopCertificationDTO.java index 575a94f..03db3d6 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/shopcertification/ShopCertificationDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/shopcertification/ShopCertificationDTO.java @@ -48,6 +48,12 @@ public class ShopCertificationDTO { private String certificationImage; @ApiModelProperty(name = "审核状态", value = "0 未审核 1审核通过 -1审核不通过") private Integer auditStatus; + @ApiModelProperty(name = "gmtCreate", value = "申请时间") + private String gmtCreate; + @ApiModelProperty(name = "creatorName", value = "申请人姓名") + private String creatorName; + @ApiModelProperty(name = "creatorName", value = "申请人ID") + private String creator; public String getShopCertificationId() { @@ -186,4 +192,28 @@ public class ShopCertificationDTO { public void setAuditStatus(Integer auditStatus) { this.auditStatus = auditStatus; } + + public String getGmtCreate() { + return gmtCreate; + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public String getCreatorName() { + return creatorName; + } + + public void setCreatorName(String creatorName) { + this.creatorName = creatorName; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } } diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/userexpand/UserExpandDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/userexpand/UserExpandDTO.java new file mode 100644 index 0000000..305ba40 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/dtos/userexpand/UserExpandDTO.java @@ -0,0 +1,68 @@ +package cn.com.tenlion.pojo.dtos.userexpand; + + +import ink.wgink.pojo.dtos.user.UserDTO; +import io.swagger.annotations.ApiModelProperty; + +/** + * TODO + * @version 1.0 + * @author LY + * @date 2021/4/9 12:05 + */ +public class UserExpandDTO extends UserDTO { + + @ApiModelProperty(name = "userExpandId", value = "ID") + private String userExpandId; + @ApiModelProperty(name = "userId", value = "用户ID") + private String userId; + @ApiModelProperty(name = "summary", value = "简介") + private String summary; + @ApiModelProperty(name = "photo", value = "宣传照片") + private String photo; + @ApiModelProperty(name = "video", value = "宣传视频") + private String video; + + + public String getUserExpandId() { + return userExpandId; + } + + public void setUserExpandId(String userExpandId) { + this.userExpandId = userExpandId; + } + + @Override + public String getUserId() { + return userId; + } + + @Override + public void setUserId(String userId) { + this.userId = userId; + } + + public String getSummary() { + return summary; + } + + public void setSummary(String summary) { + this.summary = summary; + } + + public String getPhoto() { + return photo; + } + + public void setPhoto(String photo) { + this.photo = photo; + } + + public String getVideo() { + return video; + } + + public void setVideo(String video) { + this.video = video; + } +} diff --git a/src/main/java/cn/com/tenlion/pojo/pos/userexpand/UserExpandPO.java b/src/main/java/cn/com/tenlion/pojo/pos/userexpand/UserExpandPO.java new file mode 100644 index 0000000..d2ec1ac --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/pos/userexpand/UserExpandPO.java @@ -0,0 +1,69 @@ +package cn.com.tenlion.pojo.pos.userexpand; + +/** + * + * @ClassName: UserExpandPO + * @Description: + * @Author: CodeFactory + * @Date: 2021-04-09 14:12:12 + * @Version: 3.0 + **/ +public class UserExpandPO { + + private String userExpandId; + private String userId; + private String summary; + private String photo; + private String video; + private Integer isDelete; + + public String getUserExpandId() { + return userExpandId == null ? "" : userExpandId.trim(); + } + + public void setUserExpandId(String userExpandId) { + this.userExpandId = userExpandId; + } + + public String getUserId() { + return userId == null ? "" : userId.trim(); + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getSummary() { + return summary == null ? "" : summary.trim(); + } + + public void setSummary(String summary) { + this.summary = summary; + } + + public String getPhoto() { + return photo == null ? "" : photo.trim(); + } + + public void setPhoto(String photo) { + this.photo = photo; + } + + public String getVideo() { + return video == null ? "" : video.trim(); + } + + public void setVideo(String video) { + this.video = video; + } + + public Integer getIsDelete() { + return isDelete == null ? 0 : isDelete; + } + + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + +} diff --git a/src/main/java/cn/com/tenlion/pojo/vos/shopauditlog/ShopAuditLogVO.java b/src/main/java/cn/com/tenlion/pojo/vos/shopauditlog/ShopAuditLogVO.java index 6f2c194..e284e38 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/shopauditlog/ShopAuditLogVO.java +++ b/src/main/java/cn/com/tenlion/pojo/vos/shopauditlog/ShopAuditLogVO.java @@ -25,14 +25,14 @@ public class ShopAuditLogVO { @ApiModelProperty(name = "auditUserName", value = "审核人姓名") private String auditUserName; @ApiModelProperty(name = "auditStatus", value = "审核状态:0未审核 1审核通过 -1审核未通过") - @CheckNumberAnnotation(name = "审核状态:0未审核 1审核通过 -1审核未通过") + @CheckNumberAnnotation(name = "审核状态") private Integer auditStatus; @ApiModelProperty(name = "auditResult", value = "审核说明") private String auditResult; @ApiModelProperty(name = "auditDate", value = "审核时间") - @CheckEmptyAnnotation(name = "审核时间", verifyType = "datetime") private String auditDate; @ApiModelProperty(name = "auditType", value = "审核类型") + @CheckEmptyAnnotation(name = "审核类型") private String auditType; public String getShopAuditId() { diff --git a/src/main/java/cn/com/tenlion/pojo/vos/userexpand/UserExpandVO.java b/src/main/java/cn/com/tenlion/pojo/vos/userexpand/UserExpandVO.java new file mode 100644 index 0000000..eabc533 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/vos/userexpand/UserExpandVO.java @@ -0,0 +1,61 @@ +package cn.com.tenlion.pojo.vos.userexpand; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckNumberAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: UserExpandVO + * @Description: + * @Author: CodeFactory + * @Date: 2021-04-09 14:12:12 + * @Version: 3.0 + **/ +@ApiModel +public class UserExpandVO { + + @ApiModelProperty(name = "userId", value = "用户ID") + private String userId; + @ApiModelProperty(name = "summary", value = "简介") + private String summary; + @ApiModelProperty(name = "photo", value = "宣传照片") + private String photo; + @ApiModelProperty(name = "video", value = "宣传视频") + private String video; + + public String getUserId() { + return userId == null ? "" : userId.trim(); + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getSummary() { + return summary == null ? "" : summary.trim(); + } + + public void setSummary(String summary) { + this.summary = summary; + } + + public String getPhoto() { + return photo == null ? "" : photo.trim(); + } + + public void setPhoto(String photo) { + this.photo = photo; + } + + public String getVideo() { + return video == null ? "" : video.trim(); + } + + public void setVideo(String video) { + this.video = video; + } + + +} diff --git a/src/main/java/cn/com/tenlion/service/shop/impl/ShopServiceImpl.java b/src/main/java/cn/com/tenlion/service/shop/impl/ShopServiceImpl.java index 013cdcd..5b3bc9e 100644 --- a/src/main/java/cn/com/tenlion/service/shop/impl/ShopServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/shop/impl/ShopServiceImpl.java @@ -106,8 +106,6 @@ public class ShopServiceImpl extends DefaultBaseService implements IShopService LOG.info("新增员工表"); ShopStaffVO shopstaffvo = new ShopStaffVO(); shopstaffvo.setShopId(shopId); - AppTokenUser appTokenUser = AppTokenManager.getInstance().getToken(token).getAppTokenUser(); - shopstaffvo.setUserId(appTokenUser.getId()); shopstaffvo.setPositionId(positonId); shopstaffvo.setIsAdmin(0); shopstaffvo.setIsLeader(1); diff --git a/src/main/java/cn/com/tenlion/service/shopauditlog/impl/ShopAuditLogServiceImpl.java b/src/main/java/cn/com/tenlion/service/shopauditlog/impl/ShopAuditLogServiceImpl.java index dbe7e80..99d9ec3 100644 --- a/src/main/java/cn/com/tenlion/service/shopauditlog/impl/ShopAuditLogServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/shopauditlog/impl/ShopAuditLogServiceImpl.java @@ -35,7 +35,7 @@ public class ShopAuditLogServiceImpl extends DefaultBaseService implements IShop @Autowired private IShopAuditLogDao shopAuditLogDao; - + @Autowired private SecurityComponent securityComponent; @Autowired private IShopService shopService; @@ -60,9 +60,9 @@ public class ShopAuditLogServiceImpl extends DefaultBaseService implements IShop public String saveReturnId(String token, ShopAuditLogVO shopAuditLogVO) { shopAuditLogVO.setAuditUserName(securityComponent.getCurrentUser().getUserName()); shopAuditLogVO.setAuditUser(securityComponent.getCurrentUser().getUserId()); - String shopAuditLogId = UUIDUtil.getUUID(); + String shopAuditId = UUIDUtil.getUUID(); Map params = HashMapUtil.beanToMap(shopAuditLogVO); - params.put("shopAuditLogId", shopAuditLogId); + params.put("shopAuditId", shopAuditId); params.put("auditDate", DateUtil.getTime()); if (StringUtils.isBlank(token)) { setSaveInfo(params); @@ -70,7 +70,7 @@ public class ShopAuditLogServiceImpl extends DefaultBaseService implements IShop setAppSaveInfo(token, params); } shopAuditLogDao.save(params); - return shopAuditLogId; + return shopAuditId; } @Override @@ -81,7 +81,7 @@ public class ShopAuditLogServiceImpl extends DefaultBaseService implements IShop @Override public void remove(String token, List ids) { Map params = getHashMap(2); - params.put("shopAuditLogIds", ids); + params.put("shopAuditIds", ids); if (StringUtils.isBlank(token)) { setUpdateInfo(params); } else { @@ -93,7 +93,7 @@ public class ShopAuditLogServiceImpl extends DefaultBaseService implements IShop @Override public void delete(List ids) { Map params = getHashMap(2); - params.put("shopAuditLogIds", ids); + params.put("shopAuditIds", ids); shopAuditLogDao.delete(params); } @@ -105,7 +105,7 @@ public class ShopAuditLogServiceImpl extends DefaultBaseService implements IShop @Override public void update(String token, String shopAuditLogId, ShopAuditLogVO shopAuditLogVO) { Map params = HashMapUtil.beanToMap(shopAuditLogVO); - params.put("shopAuditLogId", shopAuditLogId); + params.put("shopAuditId", shopAuditLogId); if (StringUtils.isBlank(token)) { setUpdateInfo(params); } else { @@ -122,7 +122,7 @@ public class ShopAuditLogServiceImpl extends DefaultBaseService implements IShop @Override public ShopAuditLogDTO get(String shopAuditLogId) { Map params = super.getHashMap(2); - params.put("shopAuditLogId", shopAuditLogId); + params.put("shopAuditId", shopAuditLogId); return get(params); } @@ -134,7 +134,7 @@ public class ShopAuditLogServiceImpl extends DefaultBaseService implements IShop @Override public ShopAuditLogBO getBO(String shopAuditLogId) { Map params = super.getHashMap(2); - params.put("shopAuditLogId", shopAuditLogId); + params.put("shopAuditId", shopAuditLogId); return getBO(params); } @@ -146,7 +146,7 @@ public class ShopAuditLogServiceImpl extends DefaultBaseService implements IShop @Override public ShopAuditLogPO getPO(String shopAuditLogId) { Map params = super.getHashMap(2); - params.put("shopAuditLogId", shopAuditLogId); + params.put("shopAuditId", shopAuditLogId); return getPO(params); } diff --git a/src/main/java/cn/com/tenlion/service/shopcertification/IShopCertificationService.java b/src/main/java/cn/com/tenlion/service/shopcertification/IShopCertificationService.java index 3fecc19..d3c572d 100644 --- a/src/main/java/cn/com/tenlion/service/shopcertification/IShopCertificationService.java +++ b/src/main/java/cn/com/tenlion/service/shopcertification/IShopCertificationService.java @@ -19,6 +19,14 @@ import java.util.Map; **/ public interface IShopCertificationService { + + /** + * 更新认证审核状态 + * @param shopCertificationId + * @param auditStatus + */ + void updateAuditStatus(String shopCertificationId,String auditStatus); + /** * 新增店铺认证 * diff --git a/src/main/java/cn/com/tenlion/service/shopcertification/impl/ShopCertificationServiceImpl.java b/src/main/java/cn/com/tenlion/service/shopcertification/impl/ShopCertificationServiceImpl.java index af3046e..56a4d54 100644 --- a/src/main/java/cn/com/tenlion/service/shopcertification/impl/ShopCertificationServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/shopcertification/impl/ShopCertificationServiceImpl.java @@ -1,5 +1,6 @@ package cn.com.tenlion.service.shopcertification.impl; +import cn.com.tenlion.service.shop.IShopService; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.ParamsException; import ink.wgink.pojo.ListPage; @@ -33,6 +34,31 @@ public class ShopCertificationServiceImpl extends DefaultBaseService implements @Autowired private IShopCertificationDao shopCertificationDao; + @Autowired + private IShopService shopService; + + + + + public void updateAuditStatus(String shopCertificationId,String auditStatus) { + Map params = new HashMap(); + params.put("shopCertificationId", shopCertificationId); + params.put("auditStatus", auditStatus); + setUpdateInfo(params); + shopCertificationDao.update(params); + ShopCertificationDTO shopCertificationDTO = this.get(shopCertificationId); + if(shopCertificationDTO == null){ + throw new ParamsException("系统异常"); + } + //审核通过更新店铺认证状态 + if(shopCertificationDTO.getAuditStatus() == 1){ + shopService.updateIsCertification(shopCertificationDTO.getShopId()); + } + } + + + + @Override public void save(ShopCertificationVO shopCertificationVO) { @@ -103,6 +129,7 @@ public class ShopCertificationServiceImpl extends DefaultBaseService implements public void update(String token, String shopCertificationId, ShopCertificationVO shopCertificationVO) { Map params = HashMapUtil.beanToMap(shopCertificationVO); params.put("shopCertificationId", shopCertificationId); + params.put("auditStatus", 0); if (StringUtils.isBlank(token)) { setUpdateInfo(params); } else { diff --git a/src/main/java/cn/com/tenlion/service/shopstaff/impl/ShopStaffServiceImpl.java b/src/main/java/cn/com/tenlion/service/shopstaff/impl/ShopStaffServiceImpl.java index bf67b0d..b0eadf0 100644 --- a/src/main/java/cn/com/tenlion/service/shopstaff/impl/ShopStaffServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/shopstaff/impl/ShopStaffServiceImpl.java @@ -2,9 +2,12 @@ package cn.com.tenlion.service.shopstaff.impl; import cn.com.tenlion.pojo.dtos.shopposition.ShopPositionDTO; import cn.com.tenlion.service.shopposition.IShopPositionService; +import ink.wgink.app.AppTokenManager; import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.common.component.SecurityComponent; import ink.wgink.exceptions.SaveException; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.app.AppTokenUser; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; @@ -42,6 +45,8 @@ public class ShopStaffServiceImpl extends DefaultBaseService implements IShopSta @Autowired private IShopPositionService shopPositionService; + @Autowired + protected SecurityComponent securityComponent; @Override public void save(ShopStaffVO shopStaffVO) { @@ -50,6 +55,14 @@ public class ShopStaffServiceImpl extends DefaultBaseService implements IShopSta @Override public void save(String token, ShopStaffVO shopStaffVO) { + + if (StringUtils.isBlank(token)) { + shopStaffVO.setUserId(securityComponent.getCurrentUser().getUserId()); + } else { + AppTokenUser appTokenUser = AppTokenManager.getInstance().getToken(token).getAppTokenUser(); + shopStaffVO.setUserId(appTokenUser.getId()); + } + Map params = new HashMap<>(); params.put("userId",shopStaffVO.getUserId()); params.put("shopId",shopStaffVO.getShopId()); diff --git a/src/main/java/cn/com/tenlion/service/userexpand/IUserExpandService.java b/src/main/java/cn/com/tenlion/service/userexpand/IUserExpandService.java new file mode 100644 index 0000000..2c95edc --- /dev/null +++ b/src/main/java/cn/com/tenlion/service/userexpand/IUserExpandService.java @@ -0,0 +1,30 @@ +package cn.com.tenlion.service.userexpand; + +import cn.com.tenlion.pojo.bos.userexpand.UserExpandBO; +import cn.com.tenlion.pojo.dtos.userexpand.UserExpandDTO; +import cn.com.tenlion.pojo.pos.userexpand.UserExpandPO; +import cn.com.tenlion.pojo.vos.userexpand.UserExpandVO; +import ink.wgink.interfaces.user.IUserExpandBaseService; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResultList; + +import java.util.List; +import java.util.Map; + +public interface IUserExpandService extends IUserExpandBaseService { + + + + /** + * 新增 + * + * @param token + * @param userExpandVO + * @return + */ + void save(String token, UserExpandVO userExpandVO); + + + + +} diff --git a/src/main/java/cn/com/tenlion/service/userexpand/impl/UserExpandServiceImpl.java b/src/main/java/cn/com/tenlion/service/userexpand/impl/UserExpandServiceImpl.java new file mode 100644 index 0000000..435c23d --- /dev/null +++ b/src/main/java/cn/com/tenlion/service/userexpand/impl/UserExpandServiceImpl.java @@ -0,0 +1,135 @@ +package cn.com.tenlion.service.userexpand.impl; + + +import cn.com.tenlion.dao.userexpand.IUserExpandDao; +import cn.com.tenlion.pojo.dtos.userexpand.UserExpandDTO; +import cn.com.tenlion.pojo.vos.userexpand.UserExpandVO; +import cn.com.tenlion.service.userexpand.IUserExpandService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResultList; +import ink.wgink.util.UUIDUtil; +import ink.wgink.util.map.HashMapUtil; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * TODO + * @version 1.0 + * @author LY + * @date 2021/4/9 12:07 + */ +@Service +public class UserExpandServiceImpl extends DefaultBaseService implements IUserExpandService { + + + @Autowired + private IUserExpandDao userExpandDao; + + @Override + public String getRoute() { + return "route/userexpand/show.html"; + } + + @Override + public UserExpandDTO get(String s) { + Map params = super.getHashMap(2); + params.put("userId", s); + return userExpandDao.get(params); + } + + @Override + public UserExpandDTO getByUsername(String s) { + return null; + } + + @Override + public List listByUserIds(List list) { + return null; + } + + @Override + public List listByUsernames(List list) { + return null; + } + + @Override + public List list(Map map) { + return null; + } + + @Override + public SuccessResultList> listPage(ListPage listPage) { + return null; + } + + @Override + public SuccessResultList> listPageByIds(List list, ListPage listPage) { + return null; + } + + @Override + public SuccessResultList> listPageByExcludeIds(List list, ListPage listPage) { + return null; + } + + @Override + public int countDateRange(String s, String s1) { + return 0; + } + + @Override + public int count() { + return 0; + } + + @Override + public List listByKeywords(String s) { + return null; + } + + + @Override + public void save(String token, UserExpandVO userExpandVO) { + UserExpandDTO userExpandDTO = this.get(userExpandVO.getUserId()); + if (userExpandDTO == null){ + saveReturnId(token, userExpandVO); + }else{ + update(token,userExpandVO); + } + } + + + + public String saveReturnId(String token, UserExpandVO userExpandVO) { + String userExpandId = UUIDUtil.getUUID(); + Map params = HashMapUtil.beanToMap(userExpandVO); + params.put("userExpandId", userExpandId); + if (StringUtils.isBlank(token)) { + setSaveInfo(params); + } else { + setAppSaveInfo(token, params); + } + userExpandDao.save(params); + return userExpandId; + } + + + + public void update(String token, UserExpandVO userExpandVO) { + Map params = HashMapUtil.beanToMap(userExpandVO); + if (StringUtils.isBlank(token)) { + setUpdateInfo(params); + } else { + setAppUpdateInfo(token, params); + } + userExpandDao.update(params); + } + +} diff --git a/src/main/resources/mybatis/mapper/shopcertification/shop-certification-mapper.xml b/src/main/resources/mybatis/mapper/shopcertification/shop-certification-mapper.xml index b708e38..882bd31 100644 --- a/src/main/resources/mybatis/mapper/shopcertification/shop-certification-mapper.xml +++ b/src/main/resources/mybatis/mapper/shopcertification/shop-certification-mapper.xml @@ -20,6 +20,7 @@ + @@ -320,6 +321,7 @@ t1.certification_composition, t1.certification_image, t1.audit_status, + t1.gmt_create, t2.shop_name FROM svc_shop_certification t1 @@ -332,7 +334,7 @@ t2.shop_name LIKE CONCAT('%', #{keywords}, '%') OR - t2.certification_name LIKE CONCAT('%', #{keywords}, '%') + t1.certification_name LIKE CONCAT('%', #{keywords}, '%') ) @@ -353,7 +355,7 @@ AND t1.audit_status = #{auditStatus} - ORDER BY t1.gmt_create + ORDER BY t1.gmt_create DESC diff --git a/src/main/resources/mybatis/mapper/userexpand/user-expand-mapper.xml b/src/main/resources/mybatis/mapper/userexpand/user-expand-mapper.xml new file mode 100644 index 0000000..6684a5f --- /dev/null +++ b/src/main/resources/mybatis/mapper/userexpand/user-expand-mapper.xml @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO sys_user_expand( + user_expand_id, + user_id, + summary, + photo, + video, + is_delete + ) VALUES( + #{userExpandId}, + #{userId}, + #{summary}, + #{photo}, + #{video}, + #{isDelete} + ) + + + + + UPDATE + sys_user_expand + SET + is_delete = 1 + WHERE + user_expand_id IN + + #{userExpandIds[${index}]} + + + + + + DELETE FROM + sys_user_expand + WHERE + user_expand_id IN + + #{userExpandIds[${index}]} + + + + + + UPDATE + sys_user_expand + SET + summary = #{summary}, + photo = #{photo}, + video = #{video} + WHERE + user_id = #{userId} + + + + + SELECT + t1.user_id, + t1.summary, + t1.photo, + t1.video, + t1.user_expand_id + FROM + sys_user_expand t1 + WHERE + t1.is_delete = 0 AND t1.user_id = #{userId} + + + + + SELECT + t1.user_expand_id, + t1.user_id, + t1.summary, + t1.photo, + t1.video, + t1.is_delete + FROM + sys_user_expand t1 + WHERE + t1.is_delete = 0 AND t1.user_id = #{userId} + + + + + SELECT + t1.user_expand_id, + t1.user_id, + t1.summary, + t1.photo, + t1.video, + t1.is_delete + FROM + sys_user_expand t1 + WHERE + t1.is_delete = 0 AND t1.user_id = #{userId} + + + + + SELECT + t1.user_expand_id, + t1.user_id, + t1.summary, + t1.photo, + t1.video, + 1 + FROM + sys_user_expand t1 + WHERE + t1.is_delete = 0 + + AND ( + + t1.id LIKE CONCAT('%', #{keywords}, '%') + ) + + + AND + t1.user_expand_id IN + + #{userExpandIds[${index}]} + + + + + + + SELECT + t1.user_expand_id, + t1.user_id, + t1.summary, + t1.photo, + t1.video, + t1.is_delete + FROM + sys_user_expand t1 + WHERE + t1.is_delete = 0 + + AND ( + + t1.id LIKE CONCAT('%', #{keywords}, '%') + ) + + + AND + t1.user_expand_id IN + + #{userExpandIds[${index}]} + + + + + + + SELECT + t1.user_expand_id, + t1.user_id, + t1.summary, + t1.photo, + t1.video, + t1.is_delete + FROM + sys_user_expand t1 + WHERE + t1.is_delete = 0 + + AND ( + + t1.id LIKE CONCAT('%', #{keywords}, '%') + ) + + + AND + t1.user_expand_id IN + + #{userExpandIds[${index}]} + + + + + + + SELECT + COUNT(*) + FROM + sys_user_expand t1 + WHERE + t1.is_delete = 0 + + + \ No newline at end of file diff --git a/src/main/resources/static/route/shopauditlog/audit.html b/src/main/resources/static/route/shopauditlog/audit.html index 08f394c..d85cb8d 100644 --- a/src/main/resources/static/route/shopauditlog/audit.html +++ b/src/main/resources/static/route/shopauditlog/audit.html @@ -21,17 +21,18 @@ - + + 审核意见 - + 审核结果 - + 通过 驳回 @@ -63,7 +64,10 @@ var form = layui.form; var laytpl = layui.laytpl; var laydate = layui.laydate; - var shopId = top.restAjax.params(window.location.href).shopId; + var bId = top.restAjax.params(window.location.href).bId; + var auditType = top.restAjax.params(window.location.href).auditType; + $("#auditBId").val(bId); + $("#auditType").val(auditType); function closeBox() { @@ -77,18 +81,12 @@ top.dialog.close(index); var loadLayerIndex; top.restAjax.post(top.restAjax.path('api/shopauditlog/save', []), formData.field, null, function(code, data) { - var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { - time: 0, - btn: [top.dataMessage.button.yes, top.dataMessage.button.no], - shade: 0.3, - yes: function(index) { - top.dialog.close(index); - window.location.reload(); - }, - btn2: function() { - closeBox(); - } - }); + var auditType = formData.field['auditType']; + var auditBId = formData.field['auditBId']; + var auditStatus = formData.field['auditStatus']; + if(auditType == 1){ + auditType1(auditBId,auditStatus) + } }, function(code, data) { top.dialog.msg(data.msg); }, function() { @@ -100,13 +98,26 @@ return false; }); - - - - - - - + function auditType1(shopCertificationId,auditStatus){ + var loadLayerIndex; + top.restAjax.put(top.restAjax.path('api/shopcertification/updateAuditStatus/{shopCertificationId}/{auditStatus}', [shopCertificationId,auditStatus]), null, null, function(code, data) { + var layerIndex = top.dialog.msg("提交成功!", { + time: 0, + btn: [top.dataMessage.button.yes], + shade: 0.3, + yes: function(index) { + top.dialog.close(index); + closeBox(); + } + }); + }, function(code, data) { + top.dialog.msg(data.msg); + }, function() { + loadLayerIndex = top.dialog.msg(top.dataMessage.committing, {icon: 16, time: 0, shade: 0.3}); + }, function() { + top.dialog.close(loadLayerIndex); + }); + } diff --git a/src/main/resources/static/route/shopauditlog/show.html b/src/main/resources/static/route/shopauditlog/show.html index 1d66e5d..43ee1d0 100644 --- a/src/main/resources/static/route/shopauditlog/show.html +++ b/src/main/resources/static/route/shopauditlog/show.html @@ -43,7 +43,7 @@ var form = layui.form; var laytpl = layui.laytpl; var laydate = layui.laydate; - var shopId = top.restAjax.params(window.location.href).shopId; + var bId = top.restAjax.params(window.location.href).bId; function closeBox() { @@ -54,10 +54,10 @@ // 初始化内容 function initData() { var loadLayerIndex; - top.restAjax.get(top.restAjax.path('api/shopauditlog/list/{shopId}', [shopId]), {}, null, function(code, data) { + top.restAjax.get(top.restAjax.path('api/shopauditlog/list/{bId}', [bId]), {}, null, function(code, data) { var dataFormData = ""; for(var i in data) { - dataFormData +=initLineData(data[i].auditDate,data[i].auditUser,data[i].auditStatus,data[i].auditResult) + dataFormData +=initLineData(data[i].auditDate,data[i].auditUserName,data[i].auditStatus,data[i].auditResult) } $("#logData").append(dataFormData); }, function(code, data) { @@ -78,11 +78,8 @@ if(status == -1){ sName = "审核不通过" } - - - var data = - ''+ + ''+ ''+ ''+ ''+data+''+ @@ -111,7 +108,6 @@ ''+ ''+ ''; - return data; } diff --git a/src/main/resources/static/route/shopcertification/list.html b/src/main/resources/static/route/shopcertification/list.html index 697185e..eee746d 100644 --- a/src/main/resources/static/route/shopcertification/list.html +++ b/src/main/resources/static/route/shopcertification/list.html @@ -28,8 +28,8 @@ - - + + 全部 未审核 通过 @@ -147,15 +147,6 @@ return rowData; } }, - {field: 'creator', width: 180, title: '申请人', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, {field: 'gmtCreate', width: 180, title: '申请时间', align:'center',fixed: 'right', templet: function(row) { var rowData = row[this.field]; @@ -213,7 +204,8 @@ where: { keywords: $('#keywords').val(), startTime: $('#startTime').val(), - endTime: $('#endTime').val() + endTime: $('#endTime').val(), + auditStatus: $('#auditStatus').val() }, page: { curr: currentPage @@ -359,7 +351,7 @@ area: ['50%', '50%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/shopauditlog/audit.html?shopId={shopId}', [data.shopId]), + content: top.restAjax.path('route/shopauditlog/audit.html?auditType=1&bId={shopCertificationId}', [data.shopCertificationId]), end: function() { reloadTable(); } @@ -369,10 +361,10 @@ type: 2, title: false, closeBtn: 0, - area: ['50%', '50%'], + area: ['70%', '70%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/shopauditlog/audit.html?shopId={shopId}', [data.shopId]), + content: top.restAjax.path('route/shopauditlog/show.html?bId={bId}', [data.shopCertificationId]), end: function() { reloadTable(); } diff --git a/src/main/resources/static/route/userexpand/list.html b/src/main/resources/static/route/userexpand/list.html new file mode 100644 index 0000000..90ace54 --- /dev/null +++ b/src/main/resources/static/route/userexpand/list.html @@ -0,0 +1,280 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/userexpand/save.html b/src/main/resources/static/route/userexpand/save.html new file mode 100644 index 0000000..1a82240 --- /dev/null +++ b/src/main/resources/static/route/userexpand/save.html @@ -0,0 +1,323 @@ + + + + + + + + + + + + + + + + + + + 上级列表/ + 新增内容 + + + + + + 用户ID + + + + + + 简介 + + + + + + 宣传照片 + + + + + + + + 宣传视频 + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/userexpand/show.html b/src/main/resources/static/route/userexpand/show.html new file mode 100644 index 0000000..2921cf8 --- /dev/null +++ b/src/main/resources/static/route/userexpand/show.html @@ -0,0 +1,329 @@ + + + + + + + + + + + + + + + + + + + + + 个人简介 + + + + + + 宣传照片 + + + + + + + + 宣传视频 + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/userexpand/update.html b/src/main/resources/static/route/userexpand/update.html new file mode 100644 index 0000000..1f4b871 --- /dev/null +++ b/src/main/resources/static/route/userexpand/update.html @@ -0,0 +1,340 @@ + + + + + + + + + + + + + + + + + + + 上级列表/ + 编辑内容 + + + + + + 用户ID + + + + + + 简介 + + + + + + 宣传照片 + + + + + + + + 宣传视频 + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file