zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

开票优化

Browse Source
This commit is contained in:
qjq
2024-11-20 15:23:07 +08:00
parent d77fbc7813
commit 8c21220c48
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/billing/AppBillingController.java
View File

@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.member.controller.admin.billing.vo.BillingRespVO;
import cn.iocoder.yudao.module.member.controller.admin.billing.vo.BillingSaveReqVO;
import cn.iocoder.yudao.module.member.dal.dataobject.billing.BillingDO;
import cn.iocoder.yudao.module.member.service.billing.BillingService;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -78,7 +79,8 @@ public class AppBillingController {
}
@GetMapping("/totalMoney")
@Operation(summary = "获取月时间段的金额")
public CommonResult<BigDecimal> getBillingPage(@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @RequestParam("time") Date time,
public CommonResult<BigDecimal> getBillingPage(@DateTimeFormat(pattern = "yyyy-MM-dd")
@RequestParam("time") Date time,
@RequestParam("billingType") Integer billingType,
@RequestParam("carteenId") Long carteenId,
@RequestParam("userId")Long userId) {
@ -87,7 +89,8 @@ public class AppBillingController {
}
@GetMapping("/data")
@Operation(summary = "获取月时间段的订单详情")
public CommonResult<Object> getData(@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @RequestParam("time") Date time,
public CommonResult<Object> getData(@DateTimeFormat(pattern = "yyyy-MM-dd")
@RequestParam("time") Date time,
@RequestParam("billingType") Integer billingType,
@RequestParam("carteenId") Long carteenId,
@RequestParam("userId")Long userId) {

6
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java
View File

@ -74,7 +74,7 @@ public class BillingServiceImpl implements BillingService {
return dishOrderMapper.selectList(new LambdaQueryWrapperX<DishOrderDO>()
.betweenIfPresent(DishOrderDO::getCreateTime,startTime,endTime)
.eq(DishOrderDO::getOrderStatus,DishOrderDO.COMPLETE)
.ne(DishOrderDO::getBillingExist,Boolean.FALSE)
.eq(DishOrderDO::getBillingExist,Boolean.FALSE)
.eq(DishOrderDO::getStoreId,carteenId)
.in(DishOrderDO::getUserId,ids)
);
@ -89,7 +89,7 @@ public class BillingServiceImpl implements BillingService {
return storeOrderMapper.selectList(new LambdaQueryWrapperX<StoreOrderDO>()
.betweenIfPresent(StoreOrderDO::getCreateTime,startTime,endTime)
.eq(StoreOrderDO::getStatus, StoreOrderStatusEnum.COMPLETE.getCode())
.ne(StoreOrderDO::getBillingExist,Boolean.FALSE)
.eq(StoreOrderDO::getBillingExist,Boolean.FALSE)
.eq(StoreOrderDO::getCarteenId,carteenId)
.in(StoreOrderDO::getUserId,ids)
);
@ -104,7 +104,7 @@ public class BillingServiceImpl implements BillingService {
return orderSpaceCapsuleMapper.selectList(new LambdaQueryWrapperX<OrderSpaceCapsuleDO>()
.betweenIfPresent(OrderSpaceCapsuleDO::getCreateTime,startTime,endTime)
.eq(OrderSpaceCapsuleDO::getStatus, SpaceCapsuleOrderEnum.SPACE_CAPSULE_ORDER_ENUM_DONE.getCode())
.ne(OrderSpaceCapsuleDO::getBillingExist,Boolean.FALSE)
.eq(OrderSpaceCapsuleDO::getBillingExist,Boolean.FALSE)
.eq(OrderSpaceCapsuleDO::getCarteenId,carteenId)
.in(OrderSpaceCapsuleDO::getUserId,ids)
);