zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zenghuapei:d092e0c23f040d080d88af73233fa059bb2eb830
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
..
compare: zenghuapei:0a3e68c0d181a49a99cedb9310ad5f546fe78ba4
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

2 Commits
d092e0c23f ... 0a3e68c0d1

Author SHA1 Message Date
tangqian 0a3e68c0d1 Merge branch 'feature/mall_product' into test 2023-06-15 09:41:52 +08:00
tangqian 68db974170 fix:修改充值订单导出(未退款但是退款金额显示有金额) 2023-06-15 09:41:31 +08:00
2 changed files with 3 additions and 11 deletions
Show Stats Expand all files Collapse all files

9
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/statement/StatementController.java
View File

@ -1,15 +1,13 @@
package cn.iocoder.yudao.module.shop.controller.admin.statement; package cn.iocoder.yudao.module.shop.controller.admin.statement;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated; import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.*; import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.StatementAllReqVo;
import cn.iocoder.yudao.module.shop.convert.recharge.RechargeGearConvert; import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.StatisticsExcelVO;
import cn.iocoder.yudao.module.shop.dal.dataobject.order.StoreOrderStatus; import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.StatisticsPageVo;
import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeGearDO;
import cn.iocoder.yudao.module.shop.request.order.StatementAllRequest; import cn.iocoder.yudao.module.shop.request.order.StatementAllRequest;
import cn.iocoder.yudao.module.shop.request.order.StatementPageRequest; import cn.iocoder.yudao.module.shop.request.order.StatementPageRequest;
import cn.iocoder.yudao.module.shop.service.order.StoreOrderService; import cn.iocoder.yudao.module.shop.service.order.StoreOrderService;
@ -18,7 +16,6 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

5
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
View File

@ -1463,11 +1463,6 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
request.setEndTime(LocalDateTimeUtil.endOfDay(lastDay)); request.setEndTime(LocalDateTimeUtil.endOfDay(lastDay));
} }
} }
LocalDateTime todayOfLastWeek = LocalDateTime.now().minusDays(7);
LocalDateTime monday = todayOfLastWeek.with(TemporalAdjusters.previous(DayOfWeek.SUNDAY)).plusDays(1);
LocalDateTime sunday = todayOfLastWeek.with(TemporalAdjusters.next(DayOfWeek.MONDAY)).minusDays(1);
request.setStartTime(LocalDateTimeUtil.beginOfDay(monday));
request.setEndTime(LocalDateTimeUtil.endOfDay(sunday));
List<StatementAllReqDataVo> dataVos = mapper.statisticsAll(request.getStartTime(), request.getEndTime()); List<StatementAllReqDataVo> dataVos = mapper.statisticsAll(request.getStartTime(), request.getEndTime());
if (!CollectionUtils.isEmpty(dataVos)) { if (!CollectionUtils.isEmpty(dataVos)) {
reqVo.setTotalMoney(BigDecimal.valueOf(dataVos.stream().filter(x -> x.getRefundStatus() != 2).mapToDouble(StatementAllReqDataVo::getPrice).sum())); reqVo.setTotalMoney(BigDecimal.valueOf(dataVos.stream().filter(x -> x.getRefundStatus() != 2).mapToDouble(StatementAllReqDataVo::getPrice).sum()));