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

修复店铺结算单结算金额对于积分商品和砍价商品重复计算问题

Browse Source
This commit is contained in:
paulGao 2022-01-10 18:04:38 +08:00
parent d2cab9f4a1
commit ec8d511e9e
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,11 @@
package cn.lili.modules.store.service;
import cn.hutool.core.date.DateTime;
import cn.lili.modules.store.entity.dos.Store;
import cn.lili.modules.store.entity.dos.StoreDetail;
import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
import cn.lili.modules.store.entity.dto.StoreSettingDTO;
import cn.lili.modules.store.entity.dto.StoreSettlementDay;
import cn.lili.modules.store.entity.vos.StoreBasicInfoVO;
import cn.lili.modules.store.entity.vos.StoreDetailVO;
import cn.lili.modules.store.entity.vos.StoreManagementCategoryVO;
@ -120,4 +122,20 @@ public interface StoreDetailService extends IService<StoreDetail> {
* @param merchantEuid 店铺客服信息
*/
Boolean editMerchantEuid(String merchantEuid);
/**
* 获取待结算店铺列表
*
* @param day 结算日
* @return 待结算店铺列表
*/
List<StoreSettlementDay> getSettlementStore(int day);
/**
* 修改店铺的结算日
*
* @param storeId 店铺ID
* @param dateTime 结算日
*/
void updateSettlementDay(String storeId, DateTime dateTime);
}

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

@ -1,5 +1,6 @@
package cn.lili.modules.store.serviceimpl;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.map.MapUtil;
import cn.hutool.json.JSONUtil;
import cn.lili.common.properties.RocketmqCustomProperties;
@ -14,6 +15,7 @@ import cn.lili.modules.store.entity.dos.Store;
import cn.lili.modules.store.entity.dos.StoreDetail;
import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
import cn.lili.modules.store.entity.dto.StoreSettingDTO;
import cn.lili.modules.store.entity.dto.StoreSettlementDay;
import cn.lili.modules.store.entity.vos.StoreBasicInfoVO;
import cn.lili.modules.store.entity.vos.StoreDetailVO;
import cn.lili.modules.store.entity.vos.StoreManagementCategoryVO;
@ -115,6 +117,28 @@ public class StoreDetailServiceImpl extends ServiceImpl<StoreDetailMapper, Store
return storeService.updateById(store);
}
/**
* 获取待结算店铺列表
*
* @param day 结算日
* @return 待结算店铺列表
*/
@Override
public List<StoreSettlementDay> getSettlementStore(int day) {
return this.baseMapper.getSettlementStore(day);
}
/**
* 修改店铺的结算日
*
* @param storeId 店铺ID
* @param dateTime 结算日
*/
@Override
public void updateSettlementDay(String storeId, DateTime dateTime) {
this.baseMapper.updateSettlementDay(storeId, dateTime);
}
@Override
public StoreBasicInfoVO getStoreBasicInfoDTO(String storeId) {
return this.baseMapper.getStoreBasicInfoDTO(storeId);