suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

Browse Source
This commit is contained in:
苏竹红
2025-04-12 14:33:03 +08:00
parent 22c19c9f80 51aff7b77c
commit 344de0ac8f
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java
View File

@@ -12,5 +12,5 @@ import java.util.List;
*/
public interface WarehouseInfoService {
List<WarehouseInfoDO> getAllAndActive(String keyword);
List<WarehouseInfoDO> getAllAndActive(String keyword,Integer pageNum,Integer pageSize);
}

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
View File

@@ -84,6 +84,7 @@ public class BuildInformationServiceImpl implements BuildInformationService {
response.setAddresseeMobile(orderSysInfoDO.getAddresseeMobile());
response.setXgjVicePresident(orderSysInfoDO.getXgjVicePresident());
response.setXgjRegionId(orderSysInfoDO.getXgjRegionId());
response.setXgjRegionName(orderSysInfoDO.getXgjRegionName());
response.setAddresseeProvince(orderSysInfoDO.getAddresseeProvince());
response.setAddresseeCity(orderSysInfoDO.getAddresseeCity());
response.setAddresseeDistrict(orderSysInfoDO.getAddresseeDistrict());

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java
View File

@@ -60,6 +60,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(request.getShopId());
if (request.getType().equals(OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())) {
orderSysInfoDO.setXgjVicePresident(request.getXgjVicePresident());
orderSysInfoDO.setXgjRegionName(request.getXgjRegionName());
orderSysInfoDO.setXgjRegionId(request.getXgjRegionId());
orderSysInfoDO.setAddresseeProvince(request.getAddresseeProvince());
orderSysInfoDO.setAddresseeCity(request.getAddresseeCity());

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java
View File

@@ -3,6 +3,8 @@ package com.cool.store.service.impl;
import com.cool.store.entity.WarehouseInfoDO;
import com.cool.store.mapper.WarehouseInfoMapper;
import com.cool.store.service.WarehouseInfoService;
import com.github.pagehelper.PageHelper;
import com.lowagie.text.PageSize;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -21,7 +23,8 @@ public class WarehouseInfoServiceImpl implements WarehouseInfoService {
@Resource
private WarehouseInfoMapper warehouseInfoMapper;
@Override
public List<WarehouseInfoDO> getAllAndActive(String keyword) {
public List<WarehouseInfoDO> getAllAndActive(String keyword,Integer pageNum,Integer pageSize) {
PageHelper.startPage(pageNum,pageSize);
return warehouseInfoMapper.getAllAndActive(keyword);
}
}

6
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java
View File

@@ -29,7 +29,9 @@ public class PCWarehouseInfoController {
@GetMapping("/getAllAndActive")
@ApiOperation(value = "获取正新鸡排仓库配置")
public ResponseResult<List<WarehouseInfoDO>> getAllAndActive(@RequestParam("keyword")String keyword ) {
return ResponseResult.success(warehouseInfoService.getAllAndActive(keyword));
public ResponseResult<List<WarehouseInfoDO>> getAllAndActive(@RequestParam("keyword")String keyword ,
@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
@RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) {
return ResponseResult.success(warehouseInfoService.getAllAndActive(keyword,pageNum,pageSize));
}
}