From 4015e243daacda787d060aa3d6c377fe8ff89120 Mon Sep 17 00:00:00 2001 From: qjq <1766193529@qq.com> Date: Tue, 3 Dec 2024 14:21:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=B8=8B=E6=B2=A1=E7=94=A8=E6=88=B7=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/enums/ErrorCodeConstants.java | 2 +- .../admin/billing/vo/BillingRespMoneyVO.java | 6 ++++-- .../service/billing/BillingServiceImpl.java | 19 +++++++++++++++---- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java index f31b2653..b4047444 100644 --- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java +++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java @@ -154,7 +154,7 @@ public interface ErrorCodeConstants { ErrorCode BILLING_NOT_COMPLETE = new ErrorCode(1_004_023_00, "还有金额未开票"); ErrorCode BILLING_NOT_EXISTS = new ErrorCode(1_004_023_00, "开票记录不存在"); ErrorCode BILLING_NOT_ORDER_EXISTS= new ErrorCode(1_004_023_00, "该时间段没有订单可开票"); - ErrorCode BILLING_NOT_ORDER_MOENY= new ErrorCode(1_004_023_00, "27号(包含27号)以后才能开票"); + ErrorCode BILLING_NOT_ORDER_USER= new ErrorCode(1_004_025_00, "该部门下没有用户"); ErrorCode BILLING_NOT_ORDER_REFUSE= new ErrorCode(1_004_024_00, "拒绝理由不能为空"); ErrorCode BILLING_NOT_ORDER_SECURITY= new ErrorCode(1_004_023_41, "没有权限给单位统一开票"); ErrorCode CAROUSEL_NOT_EXISTS = new ErrorCode(1_004_025_00, "小程序轮播图不存在"); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/billing/vo/BillingRespMoneyVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/billing/vo/BillingRespMoneyVO.java index d8f33711..199940a3 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/billing/vo/BillingRespMoneyVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/billing/vo/BillingRespMoneyVO.java @@ -9,8 +9,10 @@ import java.math.BigDecimal; @Data public class BillingRespMoneyVO { - @Schema(description = "发票编号", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "已开票金额", requiredMode = Schema.RequiredMode.REQUIRED) private BigDecimal haveMoney; + @Schema(description = "可开票金额", requiredMode = Schema.RequiredMode.REQUIRED) private BigDecimal withoutMoney; - + @Schema(description = "当月充值金额", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal mothMoney; } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java index 63e5d2f2..8a623ef1 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java @@ -41,6 +41,7 @@ import cn.iocoder.yudao.module.member.service.storeorderdetail.StoreOrderDetailS import cn.iocoder.yudao.module.system.api.carteen.CarteenApi; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; +import lombok.Data; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.transaction.annotation.Transactional; @@ -239,9 +240,10 @@ public class BillingServiceImpl implements BillingService { // 插入 BillingDO 对象并生成唯一主键 BillingDO billing = BeanUtils.toBean(createReqVO, BillingDO.class); Set orderId = createReqVO.getOrderId(); - if(orderId==null){ + /*if(orderId==null){ createReqVO.setOrderId(new HashSet<>(getMemberListByUserId(billing.getUserId()))) ; - } + }*/ + if(CollUtil.isEmpty(orderId))throw exception(BILLING_NOT_ORDER_USER); // MemberGroupDO memberGroupDO = memberGroupDO(billing.getUserId()); billing.setId(IdUtil.getSnowflakeNextId() + ""); // billing.setUserName(memberGroupDO.getName()); @@ -452,9 +454,16 @@ public class BillingServiceImpl implements BillingService { // 查询已开票的金额 BigDecimal haveMoney = getTotalMoneyForBilling(userId, BillingStatusEnum.BILLING_INVOICING_IS_COMPLETE.getCode()); response.setHaveMoney(haveMoney); - + if(CollUtil.isEmpty(memberList)){ + response.setWithoutMoney(new BigDecimal(0)); + response.setMothMoney(new BigDecimal(0)); + return response; + } BigDecimal moneyByUserIds = cardMapper.getTotalMoneyByuserIds(memberList, CardDO.ADD, CostTypeEnum.ADMIN_PAY.getCode(),getMonth()); + int i = DateUtil.date().monthBaseOne(); + BigDecimal month = cardMapper.getTotalMoneyByuserIds(memberList, CardDO.ADD, CostTypeEnum.ADMIN_PAY.getCode(),i); response.setWithoutMoney(moneyByUserIds); + response.setMothMoney(month); return response; } private Integer getMonth(){ @@ -585,7 +594,9 @@ public class BillingServiceImpl implements BillingService { public BigDecimal getUserTotalMoney(BillingPageDataVo vo) { // 获取当前单位下的所有成员 List ids = getMemberListByUserId(vo.getUserId()); - + if(CollUtil.isEmpty(ids)){ + return new BigDecimal(0); + } List moneyByUserIds = cardMapper.getMoneyByUserIds(ids, CardDO.ADD, CostTypeEnum.ADMIN_PAY.getCode(), BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode(),getMonth()); return moneyByUserIds.stream() .map(CardDO::getChangeMoney)