quyixiao/eb-service-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2025-11-19 22:23:13 +08:00
parent 2d5ff227e4
commit 245b2595de
6 changed files with 99 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSellerWarehouseDao.java
View File

@ -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<VvSellerWarehouseEntity> {
@ -18,19 +22,21 @@ public interface VvSellerWarehouseDao extends BaseMapper<VvSellerWarehouseEntity
VvSellerWarehouseEntity selectVvSellerWarehouseById(@Param("id")Long id);
Long insertVvSellerWarehouse(VvSellerWarehouseEntity vvSellerWarehouse);
Long insertVvSellerWarehouse(VvSellerWarehouseEntity vvSellerWarehouse);
Long insertOrUpdateVvSellerWarehouse(VvSellerWarehouseEntity vvSellerWarehouse);
Long insertOrUpdateVvSellerWarehouse(VvSellerWarehouseEntity vvSellerWarehouse);
int updateVvSellerWarehouseById(VvSellerWarehouseEntity vvSellerWarehouse);
int updateVvSellerWarehouseById(VvSellerWarehouseEntity vvSellerWarehouse);
int updateCoverVvSellerWarehouseById(VvSellerWarehouseEntity vvSellerWarehouse);
int updateCoverVvSellerWarehouseById(VvSellerWarehouseEntity vvSellerWarehouse);
int deleteVvSellerWarehouseById(@Param("id")Long id);
int deleteVvSellerWarehouseById(@Param("id") Long id);
List<VvSellerWarehouseEntity> selectVvSellerWarehouseBySellerId(Long sellerId);
List<VvSellerWarehouseEntity> selectVvSellerWarehouseBySellerIdList(@IN List<Long> id);
}

8
api-mapper/src/main/java/com/heyu/api/data/dto/SellerDTO.java
View File

@ -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<VvSellerWarehouseEntity> sellerWarehouseList;
}

6
api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvSellerWarehouseEntity.java
View File

@ -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;

2
api-mapper/src/main/java/com/heyu/api/data/utils/SanUtils.java
View File

@ -139,7 +139,6 @@ public class SanUtils {
if (CollectionUtils.isEmpty(values)) {
return new LinkedHashMap<>();
}
Map<R, List<V>> 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();
}

42
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerController.java
View File

@ -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<VvSellerEntity> vvSellerEntities = pageUtils.getRows();
List<Long> sellerIds = SanUtils.getFieldList(vvSellerEntities, VvSellerEntity::getId);
List<VvSellerWarehouseEntity> warehouseEntities = vvSellerWarehouseDao.selectVvSellerWarehouseBySellerIdList(sellerIds);
Map<Long, List<VvSellerWarehouseEntity>> sellerWarehouseMap = SanUtils.groupByFiled2MapList(warehouseEntities, VvSellerWarehouseEntity::getSellerId);
List<SellerDTO> 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);
}
}

36
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerWarehouseController.java Normal file
View File

@ -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);
}
}