diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/AddressController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/AddressController.java index 2918f3d..8e39098 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/AddressController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/AddressController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.alUser.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -13,6 +14,7 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.address.entity.TbAddress; import org.jeecg.modules.address.service.ITbAddressService; +import org.jeecg.modules.alUser.service.AddressService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.postBean.AddressReq; import org.springframework.beans.BeanUtils; @@ -26,76 +28,76 @@ import javax.servlet.http.HttpServletResponse; import java.util.Arrays; /** -* @Description: 用户地址表 -* @Author: jeecg-boot -* @Date: 2024-10-19 -* @Version: V1.0 -*/ -@Api(tags="用户地址") + * @Description: 用户地址表 + * @Author: jeecg-boot + * @Date: 2024-10-19 + * @Version: V1.0 + */ +@Api(tags = "用户地址") @RestController @RequestMapping("/address") @Slf4j public class AddressController extends JeecgController { - @Autowired - private ITbAddressService tbAddressService; - @Resource - private ShiroRealm shiroRealm; - /** - * 分页列表查询 - * - * @param - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "用户地址表-分页列表查询") - @ApiOperation(value="用户地址表-分页列表查询", notes="用户地址表-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList( - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(new TbAddress(), req.getParameterMap()); - queryWrapper.eq("is_disable",0).orderByDesc("create_time"); - Page page = new Page(pageNo, pageSize); - IPage pageList = tbAddressService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private ITbAddressService tbAddressService; + @Resource + private ShiroRealm shiroRealm; + @Resource + private AddressService addressService; - /** - * 添加 - * - * @param tbAddress - * @return - */ - @ApiOperation(value="用户地址表-添加", notes="用户地址表-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody AddressReq tbAddress, @RequestHeader("X-Access-Token") String token) { - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); - TbAddress tbAddress1 = new TbAddress(); - BeanUtils.copyProperties(tbAddress, tbAddress1); - tbAddress1.setUserId(hanHaiMember.getId()); - tbAddressService.save(tbAddress1); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param tbAddress - * @return - */ - @ApiOperation(value="用户地址表-编辑", notes="用户地址表-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.POST}) - public Result edit(@RequestBody AddressReq tbAddress) { - TbAddress tbAddress1 = new TbAddress(); - BeanUtils.copyProperties(tbAddress, tbAddress1); - tbAddressService.updateById(tbAddress1); - return Result.OK("编辑成功!"); - } + /** + * 分页列表查询 + * + * @param + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "用户地址表-分页列表查询") + @ApiOperation(value = "用户地址表-分页列表查询", notes = "用户地址表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList( + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req, @RequestHeader("X-Access-Token") String token) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(new TbAddress(), req.getParameterMap()); + queryWrapper.eq("user_id", hanHaiMember.getId()).eq("is_disable", 0).orderByDesc("default_flag", "create_time"); + Page page = new Page(pageNo, pageSize); + IPage pageList = tbAddressService.page(page, queryWrapper); + return Result.OK(pageList); + } + /** + * 添加 + * + * @param tbAddress + * @return + */ + @ApiOperation(value = "用户地址表-添加", notes = "用户地址表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody AddressReq tbAddress, @RequestHeader("X-Access-Token") String token) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + TbAddress tbAddress1 = new TbAddress(); + BeanUtils.copyProperties(tbAddress, tbAddress1); + tbAddress1.setUserId(hanHaiMember.getId()); + tbAddressService.save(tbAddress1); + return Result.OK("添加成功！"); + } + /** + * 编辑 + * + * @param tbAddress + * @return + */ + @ApiOperation(value = "用户地址表-编辑", notes = "用户地址表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.POST}) + public Result editAddresss(@RequestBody AddressReq tbAddress, @RequestHeader("X-Access-Token") String token) { + addressService.editAddresss(tbAddress, token); + return Result.OK("编辑成功!"); + } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java index 3eb88c1..1ad2b6f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.alUser.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -67,6 +68,7 @@ public class ProductController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(new TbProduct(), req.getParameterMap()); queryWrapper.eq("audit_status", 1) .orderByDesc("sort_num", "create_time"); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/AddressService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/AddressService.java new file mode 100644 index 0000000..1153d2f --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/AddressService.java @@ -0,0 +1,11 @@ +package org.jeecg.modules.alUser.service; + +import org.jeecg.modules.postBean.AddressReq; + + +public interface AddressService { + + void editAddresss(AddressReq addressReq,String token); + + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/AddressServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/AddressServiceImpl.java new file mode 100644 index 0000000..27233f7 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/AddressServiceImpl.java @@ -0,0 +1,52 @@ + +package org.jeecg.modules.alUser.service; + + +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.address.entity.TbAddress; +import org.jeecg.modules.address.service.ITbAddressService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.jeecg.modules.postBean.AddressReq; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + + +@Service +public class AddressServiceImpl implements AddressService { + + + @Autowired + private ITbAddressService tbAddressService; + @Autowired + private IHanHaiMemberService iHanHaiMemberService; + @Autowired + private ShiroRealm shiroRealm; + + + @Transactional(rollbackFor = Exception.class) + @Override + public void editAddresss(AddressReq tbAddress, String token) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + TbAddress tbAddress1 = new TbAddress(); + BeanUtils.copyProperties(tbAddress, tbAddress1); + if (tbAddress.getDefaultFlag() == 1) { + UpdateWrapper objectUpdateWrapper = new UpdateWrapper<>(); + objectUpdateWrapper.set("default_flag", 0).eq("user_id", hanHaiMember.getId()); + tbAddressService.update(objectUpdateWrapper); + } + tbAddressService.updateById(tbAddress1); + } + + + + + + + + + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/AddressReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/AddressReq.java index 68b14f4..6dde2ec 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/AddressReq.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/AddressReq.java @@ -49,10 +49,12 @@ public class AddressReq implements Serializable { @Excel(name = "纬度", width = 15) @ApiModelProperty(value = "纬度") private String longitude; -// /**是否默认地址 0非默认 1默认*/ -// @Excel(name = "是否默认地址 0非默认 1默认", width = 15) -// @ApiModelProperty(value = "是否默认地址 0非默认 1默认") -// private Integer defaultFlag; + /**是否默认地址 0非默认 1默认*/ + @Excel(name = "是否默认地址 0非默认 1默认", width = 15) + @ApiModelProperty(value = "是否默认地址 0非默认 1默认") + private Integer defaultFlag; + @ApiModelProperty(value = "0正常 1删除") + private java.lang.Integer isDisable; /**收货人*/ @Excel(name = "收货人", width = 15) @ApiModelProperty(value = "收货人")