diff --git a/admin/src/views/content/article/edit.vue b/admin/src/views/content/article/edit.vue index 64930624..c79e5263 100644 --- a/admin/src/views/content/article/edit.vue +++ b/admin/src/views/content/article/edit.vue @@ -8,8 +8,14 @@ - - + + + +
@@ -94,7 +100,7 @@ export default { }, pram: { author: null, - cid: 0, + cid: null, content: null, imageInput: '', isBanner: false, @@ -163,9 +169,9 @@ export default { // this.pram.mediaId = mediaId }, handlerGetCategoryTreeData() { - const _pram = { type: constants.categoryType[2].value, status: 1 } + const _pram = { type: constants.categoryType[2].value, status: 1, pid: 0 } categoryApi.treeCategroy(_pram).then(data => { - this.categoryTreeData = selfUtil.addTreeListLabelForCasCard(data) + this.categoryTreeData = data }) }, handerSubmit(form) { diff --git a/admin/src/views/store/storeComment/index.vue b/admin/src/views/store/storeComment/index.vue index acb63905..84f5b15b 100644 --- a/admin/src/views/store/storeComment/index.vue +++ b/admin/src/views/store/storeComment/index.vue @@ -22,7 +22,6 @@ - {{uids}} diff --git a/admin/src/views/systemSetting/logistics/cityList/index.vue b/admin/src/views/systemSetting/logistics/cityList/index.vue index 4335589f..619ba9de 100644 --- a/admin/src/views/systemSetting/logistics/cityList/index.vue +++ b/admin/src/views/systemSetting/logistics/cityList/index.vue @@ -35,20 +35,20 @@ {{ scope.row.name }} - - - + + + + + + + + + + + + + + { this.$message.success('操作成功') diff --git a/admin/src/views/user/list/edit.vue b/admin/src/views/user/list/edit.vue index e98d9056..5e9728a3 100644 --- a/admin/src/views/user/list/edit.vue +++ b/admin/src/views/user/list/edit.vue @@ -27,19 +27,16 @@ - - - @@ -138,7 +135,7 @@ }, // 等级列表 levelLists () { - levelListApi({ page: 1, limit: 9999}).then(async res => { + levelListApi({ page: 1, limit: 9999, isShow: 1, isDel: 0}).then(async res => { this.levelList = res.list }) }, diff --git a/app/api/api.js b/app/api/api.js index 3654846f..faa7cf61 100644 --- a/app/api/api.js +++ b/app/api/api.js @@ -94,7 +94,7 @@ export function getArticleBannerList(){ * */ export function getArticleDetails(id){ - return request.get('article/info',id,{},{noAuth:true}); + return request.get('article/info',id,{noAuth:true}); } /** diff --git a/crmeb/src/main/java/com/zbkj/crmeb/article/service/impl/ArticleServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/article/service/impl/ArticleServiceImpl.java index 5e31ebad..183c86b2 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/article/service/impl/ArticleServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/article/service/impl/ArticleServiceImpl.java @@ -86,7 +86,7 @@ public class ArticleServiceImpl extends ServiceImpl impleme } - lambdaQueryWrapper.orderByDesc(Article::getSort).orderByDesc(Article::getVisit); + lambdaQueryWrapper.orderByDesc(Article::getSort).orderByDesc(Article::getVisit).orderByDesc(Article::getCreateTime); List
articleList = dao.selectList(lambdaQueryWrapper); ArrayList articleVoArrayList = new ArrayList<>(); diff --git a/crmeb/src/main/java/com/zbkj/crmeb/authorization/controller/adminUser.java b/crmeb/src/main/java/com/zbkj/crmeb/authorization/controller/adminUser.java index 501ad2e5..18982385 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/authorization/controller/adminUser.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/authorization/controller/adminUser.java @@ -5,6 +5,7 @@ import com.common.CommonResult; import com.constants.Constants; import com.exception.CrmebException; import com.exception.ExceptionCodeEnum; +import com.utils.CrmebUtil; import com.zbkj.crmeb.authorization.manager.TokenManager; import com.zbkj.crmeb.system.request.SystemAdminLoginRequest; import com.zbkj.crmeb.system.request.SystemAdminRequest; @@ -60,7 +61,7 @@ public class adminUser { @ApiOperation(value="AdminUserLogin") @PostMapping(value = "/login", produces = "application/json") - public CommonResult SystemAdminLogin(@RequestBody @Validated SystemAdminLoginRequest systemAdminLoginRequest) throws Exception { + public CommonResult SystemAdminLogin(@RequestBody @Validated SystemAdminLoginRequest systemAdminLoginRequest, HttpServletRequest request) throws Exception { // 判断验证码 ValidateCode validateCode = new ValidateCode(systemAdminLoginRequest.getKey(),systemAdminLoginRequest.getCode()); boolean codeCheckResult = validateCodeService.check(validateCode); @@ -69,7 +70,7 @@ public class adminUser { SystemAdminRequest systemAdminRequest = new SystemAdminRequest(); systemAdminRequest.setAccount(systemAdminLoginRequest.getAccount()); systemAdminRequest.setPwd(systemAdminLoginRequest.getPwd()); - SystemAdminResponse systemAdminResponse = systemAdminService.login(systemAdminRequest); + SystemAdminResponse systemAdminResponse = systemAdminService.login(systemAdminRequest, CrmebUtil.getClientIp(request)); if(null == systemAdminResponse){ return CommonResult.failed(ExceptionCodeEnum.FAILED, "login failed"); } diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreOrderRefundRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreOrderRefundRequest.java index e827e7d4..00d424b5 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreOrderRefundRequest.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreOrderRefundRequest.java @@ -30,7 +30,7 @@ public class StoreOrderRefundRequest { private Integer orderId; @ApiModelProperty(value = "退款金额") - @DecimalMin(value = "0.01", message = "退款金额不能少于0.01") + @DecimalMin(value = "0.00", message = "退款金额不能少于0.00") private BigDecimal amount; @ApiModelProperty(value = "status 1 = 直接退款, 2 = 退款后,返回原状态", allowableValues = "range[1,2]") diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreProductReplyAddRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreProductReplyAddRequest.java index c6cf3526..ffe4f339 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreProductReplyAddRequest.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreProductReplyAddRequest.java @@ -9,9 +9,7 @@ import lombok.experimental.Accessors; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import java.io.Serializable; -import java.util.List; /** *

@@ -44,11 +42,11 @@ public class StoreProductReplyAddRequest implements Serializable { private String unique; @ApiModelProperty(value = "商品分数", example = "5", required = true) - @Min(1) + @Min(value = 1, message = "商品分数必须大于1") private Integer productScore; @ApiModelProperty(value = "服务分数", example = "5", required = true) - @Min(1) + @Min(value = 1, message = "服务分数必须大于1") private Integer serviceScore; @ApiModelProperty(value = "评论内容", required = true) diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductServiceImpl.java index 7ded42f9..2fd53fa2 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductServiceImpl.java @@ -193,7 +193,7 @@ public class StoreProductServiceImpl extends ServiceImpl storeProducts = dao.selectList(lambdaQueryWrapper); List storeProductResponses = new ArrayList<>(); for (StoreProduct product : storeProducts) { diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/controller/SystemAttachmentController.java b/crmeb/src/main/java/com/zbkj/crmeb/system/controller/SystemAttachmentController.java index 6b43fb85..94fa7fdc 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/system/controller/SystemAttachmentController.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/system/controller/SystemAttachmentController.java @@ -114,7 +114,7 @@ public class SystemAttachmentController { @RequestMapping(value = "/move", method = RequestMethod.POST) public CommonResult updateAttrId(@RequestBody @Validated SystemAttachmentMoveRequest move){ LambdaUpdateWrapper lup = new LambdaUpdateWrapper<>(); - lup.eq(SystemAttachment::getAttId,move.getAttrId()); + lup.in(SystemAttachment::getAttId, CrmebUtil.stringToArray(move.getAttrId())); lup.set(SystemAttachment::getPid, move.getPid()); if(systemAttachmentService.update(lup)){ return CommonResult.success(); diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemAdmin.java b/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemAdmin.java index c0e983e9..45743fe6 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemAdmin.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemAdmin.java @@ -1,17 +1,17 @@ package com.zbkj.crmeb.system.model; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; - -import com.zbkj.crmeb.system.response.SystemAdminResponse; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** *

* 后台管理员表 @@ -49,13 +49,10 @@ public class SystemAdmin implements Serializable { private String lastIp; @ApiModelProperty(value = "后台管理员最后一次登录时间") - private Integer lastTime; + private Date updateTime; @ApiModelProperty(value = "后台管理员添加时间") - private Integer addTime; - - @ApiModelProperty(value = "登录次数") - private Integer loginCount; + private Date createTime; @ApiModelProperty(value = "后台管理员级别") private Integer level; @@ -63,7 +60,10 @@ public class SystemAdmin implements Serializable { @ApiModelProperty(value = "后台管理员状态 1有效0无效") private Boolean status; + @ApiModelProperty(value = "是否删除 1是0否") private Boolean isDel; + @ApiModelProperty(value = "登录次数") + private Integer loginCount; } diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemAdminRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemAdminRequest.java index 51f49e7c..a11dbeff 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemAdminRequest.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemAdminRequest.java @@ -3,16 +3,14 @@ package com.zbkj.crmeb.system.request; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.Date; /** *

@@ -51,10 +49,10 @@ public class SystemAdminRequest implements Serializable { private String lastIp; @ApiModelProperty(value = "后台管理员最后一次登录时间") - private Integer lastTime; + private Date updateTime; @ApiModelProperty(value = "后台管理员添加时间") - private Integer addTime; + private Date createTime; @ApiModelProperty(value = "登录次数") private Integer loginCount; diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemAttachmentMoveRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemAttachmentMoveRequest.java index f8bf4205..2c8dd28e 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemAttachmentMoveRequest.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemAttachmentMoveRequest.java @@ -1,9 +1,18 @@ package com.zbkj.crmeb.system.request; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; + @Data public class SystemAttachmentMoveRequest { + + + @ApiModelProperty(value = "父级id") private Integer pid; - private Integer attrId; + + @ApiModelProperty(value = "附件id") + @NotBlank(message = "请选择附件") + private String attrId; } diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemAdminService.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemAdminService.java index 410c528e..d4e21463 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemAdminService.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemAdminService.java @@ -2,7 +2,6 @@ package com.zbkj.crmeb.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.common.PageParamRequest; -import com.zbkj.crmeb.category.vo.CategoryTreeVo; import com.zbkj.crmeb.system.model.SystemAdmin; import com.zbkj.crmeb.system.request.SystemAdminAddRequest; import com.zbkj.crmeb.system.request.SystemAdminRequest; @@ -20,7 +19,7 @@ public interface SystemAdminService extends IService { SystemAdminResponse getInfo(SystemAdminRequest request) throws Exception; - SystemAdminResponse login(SystemAdminRequest request) throws Exception; + SystemAdminResponse login(SystemAdminRequest request, String ip) throws Exception; /** * 根据Token获取对应用户信息 diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemAdminServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemAdminServiceImpl.java index 02a14197..d4e92718 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemAdminServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemAdminServiceImpl.java @@ -49,9 +49,7 @@ public class SystemAdminServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(SystemAdmin::getAccount, request.getAccount()); SystemAdmin systemAdmin = dao.selectOne(lambdaQueryWrapper); @@ -93,6 +89,15 @@ public class SystemAdminServiceImpl extends ServiceImpl 0){ + public SystemAdminResponse saveAdmin(SystemAdminAddRequest systemAdminAddRequest) { + try { + // 管理员名称唯一校验 + Integer result = checkAccount(systemAdminAddRequest.getAccount()); + if (result > 0) { + throw new CrmebException("管理员已存在"); + } + + SystemAdminRequest systemAdminRequest = new SystemAdminRequest(); + BeanUtils.copyProperties(systemAdminAddRequest, systemAdminRequest); + + // 执行新增管理员操作 + String pwd = CrmebUtil.encryptPassword(systemAdminAddRequest.getPwd(), systemAdminAddRequest.getAccount()); + systemAdminAddRequest.setPwd(pwd); + SystemAdmin systemAdmin = new SystemAdmin(); + BeanUtils.copyProperties(systemAdminAddRequest, systemAdmin); SystemAdminResponse systemAdminResponse = new SystemAdminResponse(); BeanUtils.copyProperties(systemAdminAddRequest, systemAdminResponse); return systemAdminResponse; + + }catch (Exception e){ + throw new CrmebException("新增管理员异常 " + e.getMessage()); } - throw new CrmebException("新增管理员异常"); + } + + private Integer checkAccount(String account) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SystemAdmin::getAccount, account); + return dao.selectCount(lambdaQueryWrapper); + } @Override diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemUserLevelServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemUserLevelServiceImpl.java index f40d4ec0..1abaca34 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemUserLevelServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemUserLevelServiceImpl.java @@ -1,21 +1,18 @@ package com.zbkj.crmeb.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.common.PageParamRequest; import com.github.pagehelper.PageHelper; -import com.zbkj.crmeb.system.model.SystemUserLevel; import com.zbkj.crmeb.system.dao.SystemUserLevelDao; +import com.zbkj.crmeb.system.model.SystemUserLevel; import com.zbkj.crmeb.system.request.SystemUserLevelRequest; import com.zbkj.crmeb.system.request.SystemUserLevelSearchRequest; import com.zbkj.crmeb.system.service.SystemAttachmentService; import com.zbkj.crmeb.system.service.SystemUserLevelService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zbkj.crmeb.user.model.User; -import com.zbkj.crmeb.user.service.UserService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -35,9 +32,6 @@ public class SystemUserLevelServiceImpl extends ServiceImpl