diff --git a/core/api/src/main/java/com/wansenai/api/config/MybatisPlusConfig.java b/core/api/src/main/java/com/wansenai/api/config/MybatisPlusConfig.java index 8889518..a12a496 100644 --- a/core/api/src/main/java/com/wansenai/api/config/MybatisPlusConfig.java +++ b/core/api/src/main/java/com/wansenai/api/config/MybatisPlusConfig.java @@ -26,8 +26,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.StringUtils; -@Configuration -@MapperScan("com.wansenai.mappers") +//@Configuration +//@MapperScan("com.wansenai.mappers") public class MybatisPlusConfig { public final RedisUtil redisUtil; diff --git a/core/api/src/main/java/com/wansenai/api/shop/ShopController.java b/core/api/src/main/java/com/wansenai/api/shop/ShopController.java index d9d29d6..bf79d43 100644 --- a/core/api/src/main/java/com/wansenai/api/shop/ShopController.java +++ b/core/api/src/main/java/com/wansenai/api/shop/ShopController.java @@ -14,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Arrays; +import java.util.stream.Collectors; /** *

商店档案

@@ -81,10 +83,10 @@ public class ShopController { return Response.responseData(shopService.updateShop(shop)); } - @Operation(summary = "删除店铺") - @DeleteMapping("/delete/{id}") - public Response deleteShop(@Parameter(description = "店铺ID") @PathVariable Long id) { - return Response.responseData(shopService.deleteShop(id)); + @Operation(summary = "批量删除店铺") + @DeleteMapping("/delete") + public Response deleteShop(@Parameter(description = "店铺ID数组") @RequestParam("ids") List ids) { + return Response.responseData(shopService.removeByIds(ids)); } @Operation(summary = "根据渠道获取店铺列表") diff --git a/core/api/src/main/java/com/wansenai/api/support/BasAddressController.java b/core/api/src/main/java/com/wansenai/api/support/BasAddressController.java index 1667230..9818367 100644 --- a/core/api/src/main/java/com/wansenai/api/support/BasAddressController.java +++ b/core/api/src/main/java/com/wansenai/api/support/BasAddressController.java @@ -25,9 +25,8 @@ public class BasAddressController { @PostMapping("addOrUpdate") @Operation(summary = "新增or更新地址", description = "新增or更新地址") - public Response getList(@RequestBody BasAddressDto basAddressDto) { - basAddressService.addOrUpdate(basAddressDto); - return Response.success(); + public Response addOrUpdate(@RequestBody BasAddressDto basAddressDto) { + return Response.responseData(basAddressService.addOrUpdate(basAddressDto)); } @GetMapping("getDetail") diff --git a/core/domain/src/main/java/com/wansenai/dto/support/BasAddressDto.java b/core/domain/src/main/java/com/wansenai/dto/support/BasAddressDto.java index baf81f0..c1b3b4b 100644 --- a/core/domain/src/main/java/com/wansenai/dto/support/BasAddressDto.java +++ b/core/domain/src/main/java/com/wansenai/dto/support/BasAddressDto.java @@ -16,6 +16,8 @@ public class BasAddressDto { private Long regionId; + private Long streetId; + private String detail; private String fullAddress; diff --git a/core/domain/src/main/java/com/wansenai/entities/shop/BasShop.java b/core/domain/src/main/java/com/wansenai/entities/shop/BasShop.java index 61d20fd..17d7370 100644 --- a/core/domain/src/main/java/com/wansenai/entities/shop/BasShop.java +++ b/core/domain/src/main/java/com/wansenai/entities/shop/BasShop.java @@ -2,6 +2,7 @@ package com.wansenai.entities.shop; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.Accessors; @@ -24,6 +25,7 @@ public class BasShop implements Serializable { private static final long serialVersionUID = 1L; @Schema(description = "主键ID") + @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; @Schema(description = "店铺编码") @@ -39,6 +41,7 @@ public class BasShop implements Serializable { private String type; @Schema(description = "地址ID") + @JsonFormat(shape = JsonFormat.Shape.STRING) private Long addressId; @Schema(description = "价格类型") diff --git a/core/domain/src/main/java/com/wansenai/entities/support/BasAddress.java b/core/domain/src/main/java/com/wansenai/entities/support/BasAddress.java index e59d40f..f0c0b49 100644 --- a/core/domain/src/main/java/com/wansenai/entities/support/BasAddress.java +++ b/core/domain/src/main/java/com/wansenai/entities/support/BasAddress.java @@ -31,6 +31,8 @@ public class BasAddress implements Serializable { private Long regionId; + private Long streetId; + private String detail; private String fullAddress; diff --git a/core/domain/src/main/java/com/wansenai/vo/support/BasAddressVo.java b/core/domain/src/main/java/com/wansenai/vo/support/BasAddressVo.java index e938904..9994c63 100644 --- a/core/domain/src/main/java/com/wansenai/vo/support/BasAddressVo.java +++ b/core/domain/src/main/java/com/wansenai/vo/support/BasAddressVo.java @@ -31,6 +31,11 @@ public class BasAddressVo { private BasAreaVo region; + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long streetId; + + private BasAreaVo street; + @JsonFormat(shape = JsonFormat.Shape.STRING) private String detail; diff --git a/core/middleware/src/main/java/com/wansenai/middleware/security/JWTInterceptor.java b/core/middleware/src/main/java/com/wansenai/middleware/security/JWTInterceptor.java index 3657553..82a1865 100644 --- a/core/middleware/src/main/java/com/wansenai/middleware/security/JWTInterceptor.java +++ b/core/middleware/src/main/java/com/wansenai/middleware/security/JWTInterceptor.java @@ -66,8 +66,8 @@ public class JWTInterceptor implements HandlerInterceptor { //校验类 } } // 这里先不做token的判断，不然首次前端加载会出现token无效给用户造成误解 2024-08-12 - // map.put("msg", "token无效"); - // map.put("code", "A0312"); + map.put("msg", "token无效"); + map.put("code", "A0312"); String value = new ObjectMapper().writeValueAsString(map); response.setContentType("application/json;charset=UTF-8"); diff --git a/core/service/src/main/java/com/wansenai/service/shop/BasShopService.java b/core/service/src/main/java/com/wansenai/service/shop/BasShopService.java index e60024d..546a8d8 100644 --- a/core/service/src/main/java/com/wansenai/service/shop/BasShopService.java +++ b/core/service/src/main/java/com/wansenai/service/shop/BasShopService.java @@ -54,12 +54,12 @@ public interface BasShopService extends IService { * @return 是否成功 */ boolean updateShop(BasShop shop); - + /** - * 删除店铺信息 + * 批量删除店铺信息 * - * @param id 店铺ID + * @param ids 店铺ID列表 * @return 是否成功 */ - boolean deleteShop(Long id); + boolean deleteShop(List ids); } diff --git a/core/service/src/main/java/com/wansenai/service/shop/impl/BasShopServiceImpl.java b/core/service/src/main/java/com/wansenai/service/shop/impl/BasShopServiceImpl.java index 6a7b4f1..89ed20a 100644 --- a/core/service/src/main/java/com/wansenai/service/shop/impl/BasShopServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/shop/impl/BasShopServiceImpl.java @@ -4,7 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wansenai.entities.shop.BasShop; import com.wansenai.mappers.shop.BasShopMapper; import com.wansenai.service.shop.BasShopService; +import com.wansenai.service.user.ISysUserService; +import com.wansenai.utils.SnowflakeIdUtil; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -14,8 +18,11 @@ import java.util.List; @Slf4j @Service +@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class BasShopServiceImpl extends ServiceImpl implements BasShopService { + private final ISysUserService sysUserService; + @Override public BasShop getShopByCode(String code) { return baseMapper.getShopByCode(code); @@ -53,9 +60,10 @@ public class BasShopServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public boolean addShop(BasShop shop) { // 设置创建时间 + shop.setId(SnowflakeIdUtil.nextId()); shop.setCreateTime(new Date()); // 这里可以设置创建人，通常从当前登录用户中获取 - // shop.setCreateBy(getCurrentUsername()); + shop.setCreateBy(sysUserService.getCurrentUserName()); return save(shop); } @@ -66,14 +74,17 @@ public class BasShopServiceImpl extends ServiceImpl impl // 设置更新时间 shop.setUpdateTime(new Date()); // 这里可以设置更新人，通常从当前登录用户中获取 - // shop.setUpdateBy(getCurrentUsername()); + shop.setUpdateBy(sysUserService.getCurrentUserName()); return updateById(shop); } @Override @Transactional(rollbackFor = Exception.class) - public boolean deleteShop(Long id) { - return removeById(id); + public boolean deleteShop(List ids) { + if (CollectionUtils.isEmpty(ids)) { + return false; + } + return removeByIds(ids); } } diff --git a/core/service/src/main/java/com/wansenai/service/support/BasAddressService.java b/core/service/src/main/java/com/wansenai/service/support/BasAddressService.java index 7556958..931aa04 100644 --- a/core/service/src/main/java/com/wansenai/service/support/BasAddressService.java +++ b/core/service/src/main/java/com/wansenai/service/support/BasAddressService.java @@ -7,7 +7,7 @@ import com.wansenai.vo.support.BasAddressVo; public interface BasAddressService extends IService { - void addOrUpdate(BasAddressDto basAddressDto); + String addOrUpdate(BasAddressDto basAddressDto); BasAddressVo getDetail(Long id); diff --git a/core/service/src/main/java/com/wansenai/service/support/impl/BasAddressServiceImpl.java b/core/service/src/main/java/com/wansenai/service/support/impl/BasAddressServiceImpl.java index 072d360..b51b858 100644 --- a/core/service/src/main/java/com/wansenai/service/support/impl/BasAddressServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/support/impl/BasAddressServiceImpl.java @@ -24,20 +24,22 @@ public class BasAddressServiceImpl extends ServiceImpl