diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizMemberController.java b/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizMemberController.java index b069f1862..e83c189b5 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizMemberController.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizMemberController.java @@ -1,6 +1,8 @@ package com.ruoyi.business.controller; import java.util.List; + +import com.ruoyi.common.utils.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -112,6 +114,21 @@ public class BizMemberController extends BaseController return toAjax(bizMemberService.updateBizMember(bizMember)); } + /** + * 修改会员密码 + */ + @RequiresPermissions("business:member:edit") + @Log(title = "会员密码", businessType = BusinessType.UPDATE) + @PostMapping("/editPassword") + @ResponseBody + public AjaxResult editPassword(Long memberID, String password) + { + BizMember bizMember = bizMemberService.selectBizMemberSimple(memberID); + if(bizMember == null || StringUtils.isEmpty(password)) return toAjax(0); + bizMember.setPassword(password); + return toAjax(bizMemberService.updateBizMember(bizMember)); + } + /** * 删除会员 */ diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizOrderController.java b/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizOrderController.java index 7a471b8f4..2e7affd0c 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizOrderController.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizOrderController.java @@ -119,7 +119,7 @@ public class BizOrderController extends BaseController * 订单发货 */ @RequiresPermissions("business:order:edit") - @Log(title = "订单", businessType = BusinessType.UPDATE) + @Log(title = "订单发货", businessType = BusinessType.UPDATE) @PostMapping("/deliver") @ResponseBody public AjaxResult editDeliver(Long orderID) @@ -131,7 +131,7 @@ public class BizOrderController extends BaseController * 订单修改地址/备注 */ @RequiresPermissions("business:order:edit") - @Log(title = "订单", businessType = BusinessType.UPDATE) + @Log(title = "订单修改地址/备注", businessType = BusinessType.UPDATE) @PostMapping("/updateAddressOrRemark") @ResponseBody public AjaxResult updateAddressOrRemark(Long orderID, String content, Integer type) diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizProductController.java b/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizProductController.java index 45e15ad23..182fda646 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizProductController.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizProductController.java @@ -138,7 +138,7 @@ public class BizProductController extends BaseController * 上架下架产品 */ @RequiresPermissions("business:product:edit") - @Log(title = "产品", businessType = BusinessType.UPDATE) + @Log(title = "产品状态", businessType = BusinessType.UPDATE) @PostMapping("/status") @ResponseBody public AjaxResult editStatus(@PathVariable(value = "productId", required = true) Long productID) diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizMemberMapper.java b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizMemberMapper.java index 9c2f9282e..c90ca289e 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizMemberMapper.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizMemberMapper.java @@ -19,6 +19,14 @@ public interface BizMemberMapper */ public BizMember selectBizMemberById(Long id); + /** + * 查询会员 + * + * @param id 会员ID + * @return 会员 + */ + public BizMember selectBizMemberSimple(Long id); + /** * 查询会员列表 * diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizMemberService.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizMemberService.java index e03dd43d9..6eb52008e 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizMemberService.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizMemberService.java @@ -19,6 +19,14 @@ public interface IBizMemberService */ public BizMember selectBizMemberById(Long id); + /** + * 查询会员 + * + * @param id 会员ID + * @return 会员 + */ + public BizMember selectBizMemberSimple(Long id); + /** * 查询会员列表 * diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizMemberServiceImpl.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizMemberServiceImpl.java index 1e0171fca..43398830a 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizMemberServiceImpl.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizMemberServiceImpl.java @@ -33,6 +33,18 @@ public class BizMemberServiceImpl implements IBizMemberService return bizMemberMapper.selectBizMemberById(id); } + /** + * 查询会员 + * + * @param id 会员ID + * @return 会员 + */ + @Override + public BizMember selectBizMemberSimple(Long id) + { + return bizMemberMapper.selectBizMemberSimple(id); + } + /** * 查询会员列表 * diff --git a/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml b/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml index f05700b16..71c8d6531 100644 --- a/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml +++ b/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml @@ -43,6 +43,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where a.id = #{id} + + insert into biz_member