From 6aa82c643f589a105bb029aca692031d05f36cf8 Mon Sep 17 00:00:00 2001 From: sdhkjh <2450473462@qq.com> Date: Wed, 25 Sep 2024 21:08:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=95=86=E5=9F=8E=E6=94=B6=E4=BB=B6?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=EF=BC=8C=E6=9F=A5=E8=AF=A2=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E5=9C=B0=E5=9D=80=E5=92=8C=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E7=9A=84=E6=89=80=E6=9C=89=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ShopMemberLevelController.java | 12 +++--- .../skyeye/level/dao/ShopMemberLevelDao.java | 2 +- .../skyeye/level/entity/ShopMemberLevel.java | 1 - .../controller/ShopAddressController.java | 21 ++-------- .../com/skyeye/store/entity/ShopAddress.java | 20 +--------- .../store/service/ShopAddressService.java | 2 +- .../service/impl/ShopAddressServiceImpl.java | 39 ++++++++++++------- .../com/skyeye/type/entity/StoreType.java | 2 +- 8 files changed, 40 insertions(+), 59 deletions(-) diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/level/controller/ShopMemberLevelController.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/controller/ShopMemberLevelController.java index 5d2ec8b3..9fa3d3de 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/level/controller/ShopMemberLevelController.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/controller/ShopMemberLevelController.java @@ -50,19 +50,19 @@ public class ShopMemberLevelController { shopMemberLevelService.selectById(inputObject, outputObject); } - @ApiOperation(id = "memberLevelListAllSimple",value = "获取精简的会员等级信息，主要用于下拉列表",method = "GET",allUse = "2") + @ApiOperation(id = "memberLevelListAllSimple", value = "获取精简的会员等级信息，主要用于下拉列表", method = "GET", allUse = "2") @RequestMapping("/post/ShopMemberLevelController/memberLevelListAllSimple") public void streamlineMemberLevelList(InputObject inputObject, OutputObject outputObject) { - shopMemberLevelService.streamlineMemberLevelList(inputObject,outputObject); + shopMemberLevelService.streamlineMemberLevelList(inputObject, outputObject); } - @ApiOperation(id = "memberLevelList",value = "获得会员等级列表",method = "POST",allUse = "2") + @ApiOperation(id = "memberLevelList", value = "获得会员等级列表", method = "POST", allUse = "2") @ApiImplicitParams({ - @ApiImplicitParam(id = "name", name = "name", value = "等级名称"), - @ApiImplicitParam(id = "enabled", name = "enabled", value = "状态")}) + @ApiImplicitParam(id = "name", name = "name", value = "等级名称"), + @ApiImplicitParam(id = "enabled", name = "enabled", value = "状态")}) @RequestMapping("/post/ShopMemberLevelController/memberLevelList") public void memberLevelList(InputObject inputObject, OutputObject outputObject) { - shopMemberLevelService.memberLevelList(inputObject,outputObject); + shopMemberLevelService.memberLevelList(inputObject, outputObject); } diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/level/dao/ShopMemberLevelDao.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/dao/ShopMemberLevelDao.java index 48aafda3..5b5edca9 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/level/dao/ShopMemberLevelDao.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/dao/ShopMemberLevelDao.java @@ -4,6 +4,6 @@ import com.skyeye.eve.dao.SkyeyeBaseMapper; import com.skyeye.level.entity.ShopMemberLevel; -public interface ShopMemberLevelDao extends SkyeyeBaseMapper { +public interface ShopMemberLevelDao extends SkyeyeBaseMapper { } diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/level/entity/ShopMemberLevel.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/entity/ShopMemberLevel.java index 6eb02186..bce98dff 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/level/entity/ShopMemberLevel.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/entity/ShopMemberLevel.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.skyeye.annotation.api.ApiModel; import com.skyeye.annotation.api.ApiModelProperty; import com.skyeye.annotation.unique.UniqueField; - import com.skyeye.common.entity.features.OperatorUserInfo; import lombok.Data; diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/store/controller/ShopAddressController.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/store/controller/ShopAddressController.java index 1d479086..e7337a1e 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/store/controller/ShopAddressController.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/store/controller/ShopAddressController.java @@ -65,11 +65,10 @@ public class ShopAddressController { * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ - @ApiOperation(id = "queryMyShopAddress", value = "分页获取收件地址信息", method = "POST", allUse = "2") - @ApiImplicitParams(classBean = CommonPageInfo.class) + @ApiOperation(id = "queryMyShopAddress", value = "获取收件地址信息", method = "POST", allUse = "2") @RequestMapping("/post/ShopAddressController/queryMyShopAddress") public void queryMyShopAddress(InputObject inputObject, OutputObject outputObject) { - shopAddressService.queryPageList(inputObject, outputObject); + shopAddressService.queryList(inputObject, outputObject); } /** @@ -81,20 +80,6 @@ public class ShopAddressController { @ApiOperation(id = "queryDefaultShopAddress", value = "获取默认收件地址信息", method = "POST", allUse = "2") @RequestMapping("/post/ShopAddressController/queryDefaultShopAddress") public void queryDefaultShopAddress(InputObject inputObject, OutputObject outputObject) { - shopAddressService.queryList(inputObject, outputObject); - } - - /** - * 获取用户收件地址信息 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @ApiOperation(id = "queryShopAddressByCreateId", value = "获取用户收件地址信息", method = "POST", allUse = "2") - @ApiImplicitParams({ - @ApiImplicitParam(id = "userId", name = "userId", value = "用户主键id", required = "required")}) - @RequestMapping("/post/ShopAddressController/queryShopAddressByCreateId") - public void queryShopAddressByCreateId(InputObject inputObject, OutputObject outputObject) { - shopAddressService.queryShopAddressByCreateId(inputObject, outputObject); + shopAddressService.queryDefaultShopAddress(inputObject, outputObject); } } \ No newline at end of file diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/store/entity/ShopAddress.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/store/entity/ShopAddress.java index e12d9ca3..48ada0a8 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/store/entity/ShopAddress.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/store/entity/ShopAddress.java @@ -11,7 +11,7 @@ import com.skyeye.annotation.api.ApiModel; import com.skyeye.annotation.api.ApiModelProperty; import com.skyeye.annotation.cache.RedisCacheField; import com.skyeye.common.constans.RedisConstants; -import com.skyeye.common.entity.features.OperatorUserInfo; +import com.skyeye.common.entity.features.AreaInfo; import lombok.Data; /** @@ -26,7 +26,7 @@ import lombok.Data; @RedisCacheField(name = "shop:address", cacheTime = RedisConstants.THIRTY_DAY_SECONDS) @TableName(value = "shop_address") @ApiModel("收件地址管理实体类") -public class ShopAddress extends OperatorUserInfo { +public class ShopAddress extends AreaInfo { @TableId("id") @ApiModelProperty("主键id。为空时新增，不为空时编辑") @@ -40,22 +40,6 @@ public class ShopAddress extends OperatorUserInfo { @ApiModelProperty(value = "手机号", required = "required") private String mobile; - @TableField("province_id") - @ApiModelProperty(value = "省") - private String provinceId; - - @TableField("city_id") - @ApiModelProperty(value = "市") - private String cityId; - - @TableField("area_id") - @ApiModelProperty(value = "县区") - private String areaId; - - @TableField("township_id") - @ApiModelProperty(value = "乡镇") - private String townshipId; - @TableField("absolute_address") @ApiModelProperty(value = "详细地址") private String absoluteAddress; diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/ShopAddressService.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/ShopAddressService.java index 73fd6812..30cbe324 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/ShopAddressService.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/ShopAddressService.java @@ -18,5 +18,5 @@ import com.skyeye.store.entity.ShopAddress; * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ public interface ShopAddressService extends SkyeyeBusinessService { - void queryShopAddressByCreateId(InputObject inputObject, OutputObject outputObject); + void queryDefaultShopAddress(InputObject inputObject, OutputObject outputObject); } diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/impl/ShopAddressServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/impl/ShopAddressServiceImpl.java index d3148801..9b1fe2ce 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/impl/ShopAddressServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/impl/ShopAddressServiceImpl.java @@ -4,6 +4,7 @@ package com.skyeye.store.service.impl; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -17,9 +18,12 @@ import com.skyeye.common.enumeration.WhetherEnum; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; +import com.skyeye.entity.Member; +import com.skyeye.eve.service.IAreaService; import com.skyeye.store.dao.ShopAddressDao; import com.skyeye.store.entity.ShopAddress; import com.skyeye.store.service.ShopAddressService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Arrays; @@ -38,6 +42,9 @@ import java.util.Map; @SkyeyeService(name = "收件地址管理", groupName = "收件地址管理") public class ShopAddressServiceImpl extends SkyeyeBusinessServiceImpl implements ShopAddressService { + @Autowired + private IAreaService iAreaService; + @Override public void writePostpose(ShopAddress shopAddress, String userId) { if (WhetherEnum.ENABLE_USING.getKey().equals(shopAddress.getIsDefault())) { @@ -63,12 +70,21 @@ public class ShopAddressServiceImpl extends SkyeyeBusinessServiceImpl> queryPageDataList(InputObject inputObject) { + public void queryDefaultShopAddress(InputObject inputObject, OutputObject outputObject) { String userId = InputObject.getLogParamsStatic().get("id").toString(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(MybatisPlusUtil.toColumns(ShopAddress::getCreateId), userId); - List list = list(queryWrapper); - return JSONUtil.toList(JSONUtil.toJsonStr(list), null); + queryWrapper.eq(MybatisPlusUtil.toColumns(ShopAddress::getIsDefault), WhetherEnum.ENABLE_USING.getKey()); + ShopAddress one = getOne(queryWrapper); + if (ObjectUtil.isEmpty(one)) { + return; + } + iAreaService.setDataMation(one, ShopAddress::getProvinceId); + iAreaService.setDataMation(one, ShopAddress::getCityId); + iAreaService.setDataMation(one, ShopAddress::getAreaId); + iAreaService.setDataMation(one, ShopAddress::getTownshipId); + outputObject.setBean(one); + outputObject.settotal(CommonNumConstants.NUM_ONE); } @Override @@ -78,16 +94,13 @@ public class ShopAddressServiceImpl extends SkyeyeBusinessServiceImpl list = list(queryWrapper); + if (CollectionUtil.isEmpty(list)) { + return null; + } + iAreaService.setDataMation(list, ShopAddress::getProvinceId); + iAreaService.setDataMation(list, ShopAddress::getCityId); + iAreaService.setDataMation(list, ShopAddress::getAreaId); + iAreaService.setDataMation(list, ShopAddress::getTownshipId); return JSONUtil.toList(JSONUtil.toJsonStr(list), null); } - - @Override - public void queryShopAddressByCreateId(InputObject inputObject, OutputObject outputObject) { - String userId = inputObject.getParams().get("userId").toString(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(MybatisPlusUtil.toColumns(ShopAddress::getCreateId), userId); - List list = list(queryWrapper); - outputObject.setBeans(list); - outputObject.settotal(list.size()); - } } diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/type/entity/StoreType.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/type/entity/StoreType.java index c4d7ec9b..de3a9302 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/type/entity/StoreType.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/type/entity/StoreType.java @@ -23,7 +23,7 @@ import java.util.Map; */ @Data @TableName(value = "shop_store_type") -@ApiModel("门店商品分类管理实体类") +@ApiModel(value = "门店商品分类管理实体类") public class StoreType extends BaseGeneralInfo { @TableField(value = "logo")