caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

导出功能,福禄清除

Browse Source
This commit is contained in:
chc 2022-09-02 10:31:35 +08:00
parent eea47aea55
commit 2d4cf29da8
5 changed files with 2 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsImportServiceImpl.java
View File

@ -3,10 +3,7 @@ package cn.lili.modules.goods.serviceimpl;
import cn.hutool.core.convert.Convert;
import cn.hutool.poi.excel.ExcelReader;
import cn.hutool.poi.excel.ExcelUtil;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.modules.goods.entity.dos.Category;
import cn.lili.modules.goods.entity.dos.GoodsUnit;
import cn.lili.modules.goods.entity.dto.GoodsImportDTO;
@ -56,11 +53,7 @@ public class GoodsImportServiceImpl implements GoodsImportService {
@Override
public void download(HttpServletResponse response) {
AuthUser currentUser = UserContext.getCurrentUser();
if(currentUser == null || currentUser.getStoreId() == null ){
throw new ServiceException(ResultCode.STORE_NOT_EXIST);
}
String storeId = currentUser.getStoreId();
String storeId = "1376369067769724928";
// //Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
//创建Excel工作薄对象
Workbook workbook = new HSSFWorkbook();

10
framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java
View File

@ -173,16 +173,6 @@ public class StoreDetail extends BaseIdEntity {
@ApiModelProperty(value = "详细地址")
private String salesConsigneeDetail;
//店铺福禄配置
@ApiModelProperty(value = "福禄app密钥")
private String appSecretKey;
@ApiModelProperty(value = "福禄商户号")
private String merchantNumber;
@ApiModelProperty(value = "福禄appKEY商户key")
private String appMerchantKey;
//店铺发货地址
@ApiModelProperty(value = "发货人姓名")

18
framework/src/main/java/cn/lili/modules/store/service/StoreDetailService.java
View File

@ -67,13 +67,6 @@ public interface StoreDetailService extends IService<StoreDetail> {
*/
StoreAfterSaleAddressDTO getStoreAfterSaleAddressDTO();
/**
* 获取当前登录店铺福禄配置
*
* @return 店铺福禄配置
*/
FuLuConfigureDTO getFuLuConfigureDTO();
/**
* 获取某一个店铺的退货收件地址信息
*
@ -90,18 +83,9 @@ public interface StoreDetailService extends IService<StoreDetail> {
*/
boolean editStoreAfterSaleAddressDTO(StoreAfterSaleAddressDTO storeAfterSaleAddressDTO);
/**
<<<<<<< HEAD
* 修改当前登录店铺福禄配置
*
* @param fuLuConfigureDTO 店铺福禄配置DTO
* @return 店铺福禄配置
*/
boolean editFuLuConfigureDTO(FuLuConfigureDTO fuLuConfigureDTO);
/**
=======
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
* 修改店铺库存预警数量
*
* @param stockWarning 库存预警数量

15
framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java
View File

@ -184,11 +184,6 @@ public class StoreDetailServiceImpl extends ServiceImpl<StoreDetailMapper, Store
return this.baseMapper.getStoreAfterSaleAddressDTO(storeId);
}
@Override
public FuLuConfigureDTO getFuLuConfigureDTO() {
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
return this.baseMapper.getFuLuConfigureDTO(storeId);
}
@Override
public StoreAfterSaleAddressDTO getStoreAfterSaleAddressDTO(String id) {
@ -212,16 +207,6 @@ public class StoreDetailServiceImpl extends ServiceImpl<StoreDetailMapper, Store
return this.update(lambdaUpdateWrapper);
}
@Override
public boolean editFuLuConfigureDTO(FuLuConfigureDTO fuLuConfigureDTO) {
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
LambdaUpdateWrapper<StoreDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
lambdaUpdateWrapper.set(StoreDetail::getAppSecretKey, fuLuConfigureDTO.getAppSecretKey());
lambdaUpdateWrapper.set(StoreDetail::getMerchantNumber, fuLuConfigureDTO.getMerchantNumber());
lambdaUpdateWrapper.set(StoreDetail::getAppMerchantKey, fuLuConfigureDTO.getAppMerchantKey());
lambdaUpdateWrapper.eq(StoreDetail::getStoreId, storeId);
return this.update(lambdaUpdateWrapper);
}
@Override
public boolean updateStockWarning(Integer stockWarning) {

15
seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java
View File

@ -90,21 +90,6 @@ public class StoreSettingsController {
return ResultUtil.data(result);
}
@ApiOperation(value = "获取商家福禄配置")
@GetMapping("/fuLuConfigure")
public ResultMessage<FuLuConfigureDTO> getFuLuConfigure() {
//获取当前登录商家内容
return ResultUtil.data(storeDetailService.getFuLuConfigureDTO());
}
@ApiOperation(value = "修改商家福禄配置")
@PutMapping("/fuLuConfigure")
public ResultMessage<Object> editFuLuConfigure(@Valid FuLuConfigureDTO fuLuConfigureDTO) {
//修改商家退货收件地址
boolean result = storeDetailService.editFuLuConfigureDTO(fuLuConfigureDTO);
return ResultUtil.data(result);
}
@ApiOperation(value = "获取商家发货地址")
@GetMapping("/storeDeliverGoodsAddress")