From 245b2595de94531fb01d6596ba0e2b5add70b201 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 19 Nov 2025 22:23:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/data/dao/vv/VvSellerWarehouseDao.java | 16 ++++--- .../java/com/heyu/api/data/dto/SellerDTO.java | 8 +++- .../entity/vv/VvSellerWarehouseEntity.java | 6 +-- .../com/heyu/api/data/utils/SanUtils.java | 2 +- .../controller/mm/AdminSellerController.java | 42 ++++++++++++++++++- .../mm/AdminSellerWarehouseController.java | 36 ++++++++++++++++ 6 files changed, 99 insertions(+), 11 deletions(-) create mode 100644 api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerWarehouseController.java diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSellerWarehouseDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSellerWarehouseDao.java index a407265..d0651f5 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSellerWarehouseDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSellerWarehouseDao.java @@ -9,8 +9,12 @@ package com.heyu.api.data.dao.vv; */ import com.heyu.api.data.entity.vv.VvSellerWarehouseEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lz.mybatis.plugin.annotations.IN; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; + +import java.util.List; + @Mapper public interface VvSellerWarehouseDao extends BaseMapper { @@ -18,19 +22,21 @@ public interface VvSellerWarehouseDao extends BaseMapper selectVvSellerWarehouseBySellerId(Long sellerId); + List selectVvSellerWarehouseBySellerIdList(@IN List id); } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/dto/SellerDTO.java b/api-mapper/src/main/java/com/heyu/api/data/dto/SellerDTO.java index 26d6abc..b811afa 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dto/SellerDTO.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dto/SellerDTO.java @@ -1,12 +1,18 @@ package com.heyu.api.data.dto; import com.heyu.api.data.entity.vv.VvSellerEntity; +import com.heyu.api.data.entity.vv.VvSellerWarehouseEntity; import lombok.Data; +import java.util.List; + @Data public class SellerDTO extends VvSellerEntity { - + /*** + * + */ + private List sellerWarehouseList; } diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvSellerWarehouseEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvSellerWarehouseEntity.java index 1cfaaf4..0f880cf 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvSellerWarehouseEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvSellerWarehouseEntity.java @@ -1,12 +1,11 @@ package com.heyu.api.data.entity.vv; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.lz.mybatis.plugin.annotations.AS; -import java.math.BigDecimal; -import java.util.Date;import java.util.Date; +import java.util.Date; /** *卖家仓库表 * @author quyixiao @@ -32,6 +31,7 @@ private static final long serialVersionUID = 1L; public final static String warehouse_detail_address = CLASS_NAME + "warehouse_detail_address"; // 仓库详情地址 public final static String seller_id = CLASS_NAME + "seller_id"; // 卖家id public final static String warehouse_phone = CLASS_NAME + "warehouse_phone"; // 卖家手机号 + // @TableId(value = "id", type = IdType.AUTO) private Long id; diff --git a/api-mapper/src/main/java/com/heyu/api/data/utils/SanUtils.java b/api-mapper/src/main/java/com/heyu/api/data/utils/SanUtils.java index 1400273..ca8d202 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/utils/SanUtils.java +++ b/api-mapper/src/main/java/com/heyu/api/data/utils/SanUtils.java @@ -139,7 +139,6 @@ public class SanUtils { if (CollectionUtils.isEmpty(values)) { return new LinkedHashMap<>(); } - Map> listmap = new LinkedHashMap<>(); Method method = getMethod(function); try { @@ -153,6 +152,7 @@ public class SanUtils { list.add(v); listmap.put(r, list); } + } catch (Exception e) { e.printStackTrace(); } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerController.java index 2bd5a5f..62572e1 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerController.java @@ -6,16 +6,23 @@ import com.heyu.api.alibaba.request.mm.order.VVSellerRequest; import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.VvSellerDao; import com.heyu.api.data.dao.vv.VvSellerWarehouseDao; +import com.heyu.api.data.dto.SellerDTO; +import com.heyu.api.data.entity.vv.VvSellerEntity; +import com.heyu.api.data.entity.vv.VvSellerWarehouseEntity; import com.heyu.api.data.utils.R; +import com.heyu.api.data.utils.SanUtils; import com.heyu.api.utils.ISelect; import com.heyu.api.utils.PPageUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.List; +import java.util.Map; @Slf4j @RestController @@ -33,7 +40,7 @@ public class AdminSellerController { * 列表 * http://localhost:8888/mm/seller/list */ - @Describe("后台订单列表") + @Describe("后台卖家列表") @RequestMapping("/list") public R list(@RequestBody VVSellerRequest request) { PPageUtils pageUtils = PPageUtils.startPage(request.getPageNum(), request.getPageSize()) @@ -49,7 +56,40 @@ public class AdminSellerController { } }); + + List vvSellerEntities = pageUtils.getRows(); + + List sellerIds = SanUtils.getFieldList(vvSellerEntities, VvSellerEntity::getId); + + List warehouseEntities = vvSellerWarehouseDao.selectVvSellerWarehouseBySellerIdList(sellerIds); + + Map> sellerWarehouseMap = SanUtils.groupByFiled2MapList(warehouseEntities, VvSellerWarehouseEntity::getSellerId); + + List sellerDTOList = new ArrayList<>(); + for (VvSellerEntity vvSellerEntity : vvSellerEntities) { + SellerDTO sellerDTO = new SellerDTO(); + BeanUtils.copyProperties(vvSellerEntity, sellerDTO); + sellerDTO.setSellerWarehouseList(sellerWarehouseMap.get(vvSellerEntity.getId())); + sellerDTOList.add(sellerDTO); + } + pageUtils.setRows(sellerDTOList); return R.ok().setData(pageUtils); } + /*** + * http://localhost:8888/mm/seller/insertOrUpdate + * + * + */ + @Describe("后台添加卖家") + @RequestMapping("/insertOrUpdate") + public R list(@RequestBody VvSellerEntity request) { + if (request.getId() == null) { + request.setCreateTimestamp(System.currentTimeMillis()); + } + request.setModifyTimestamp(System.currentTimeMillis()); + vvSellerDao.insertOrUpdateVvSeller(request); + return R.ok().setData(request); + } + } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerWarehouseController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerWarehouseController.java new file mode 100644 index 0000000..20a9c5f --- /dev/null +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerWarehouseController.java @@ -0,0 +1,36 @@ +package com.heyu.api.controller.mm; + + +import com.heyu.api.common.annotation.Describe; +import com.heyu.api.data.dao.vv.VvSellerWarehouseDao; +import com.heyu.api.data.entity.vv.VvSellerWarehouseEntity; +import com.heyu.api.data.utils.R; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@RestController +@RequestMapping("/mm/warehouse") +public class AdminSellerWarehouseController { + + @Autowired + private VvSellerWarehouseDao vvSellerWarehouseDao; + + + /**** + * + * http://localhost:8888/mm/warehouse/insertOrUpdate + * + */ + @Describe("仓库添加") + @RequestMapping("/insertOrUpdate") + public R add(@RequestBody VvSellerWarehouseEntity warehouseEntity) { + vvSellerWarehouseDao.insertOrUpdateVvSellerWarehouse(warehouseEntity); + return R.ok().setData(warehouseEntity); + } + + +}