From bd36593e0d289d3617a5e2e005498dc43b952ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=AD=94=E4=BB=99=7E?= <13068499+willowhh@user.noreply.gitee.com> Date: Thu, 19 Dec 2024 20:26:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=85=85=E5=80=BC=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../userRecharge/UserRechargeController.java | 4 +- .../domain/NgUserRechargeRecords.java | 2 + .../domain/UserConsumptionDetails.java | 2 + .../service/IUserRechargeCardsService.java | 2 +- .../impl/UserRechargeCardsServiceImpl.java | 37 ++++++++++++++----- 5 files changed, 35 insertions(+), 12 deletions(-) diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeController.java index c03751e..8bd159f 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeController.java @@ -30,12 +30,12 @@ public class UserRechargeController extends BaseController { /** * 修改用户充值卡金额 */ - /*@PreAuthorize("@ss.hasPermi('rechargecard:cards:edit')") + @PreAuthorize("@ss.hasPermi('rechargecard:cards:edit')") @PutMapping @ApiOperation("修改用户充值卡") public AjaxResult result(@RequestBody RechargecardUser rechargecardUser) { return toAjax(userRechargeCardsService.updateUserRecharge(rechargecardUser)); - }*/ + } } diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUserRechargeRecords.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUserRechargeRecords.java index 2536e17..defc584 100644 --- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUserRechargeRecords.java +++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUserRechargeRecords.java @@ -5,6 +5,7 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -21,6 +22,7 @@ import com.fastbee.common.core.domain.BaseEntity; @ApiModel(value = "NgUserRechargeRecords",description = "用户充值记录 ng_user_recharge_records") @Data @EqualsAndHashCode(callSuper = true) +@Builder public class NgUserRechargeRecords extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/UserConsumptionDetails.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/UserConsumptionDetails.java index 0916985..607770c 100644 --- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/UserConsumptionDetails.java +++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/UserConsumptionDetails.java @@ -5,6 +5,7 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -21,6 +22,7 @@ import com.fastbee.common.core.domain.BaseEntity; @ApiModel(value = "UserConsumptionDetails",description = "用户充值卡账单明细记录 user_consumption_details") @Data @EqualsAndHashCode(callSuper = true) +@Builder public class UserConsumptionDetails extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/IUserRechargeCardsService.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/IUserRechargeCardsService.java index eec08dc..b3d1c2a 100644 --- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/IUserRechargeCardsService.java +++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/IUserRechargeCardsService.java @@ -69,5 +69,5 @@ public interface IUserRechargeCardsService * @return 结果 */ - /*public int updateUserRecharge(RechargecardUser rechargecardUser);*/ + public int updateUserRecharge(RechargecardUser rechargecardUser); } diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java index d0eeab3..6dcacb9 100644 --- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java +++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java @@ -5,8 +5,10 @@ import java.util.List; import cn.hutool.core.lang.Console; import com.fastbee.common.utils.DateUtils; +import com.fastbee.rechargecard.domain.NgUserRechargeRecords; import com.fastbee.rechargecard.domain.UserConsumptionDetails; import com.fastbee.rechargecard.domain.dto.RechargecardUser; +import com.fastbee.rechargecard.mapper.NgUserRechargeRecordsMapper; import com.fastbee.rechargecard.mapper.UserConsumptionDetailsMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,6 +31,8 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService private UserRechargeCardsMapper userRechargeCardsMapper; @Autowired private UserConsumptionDetailsMapper userConsumptionDetailsMapper; + @Autowired + private NgUserRechargeRecordsMapper userRechargeRecordsMapper; @Override public Long test(Long id) { return userRechargeCardsMapper.test(id); @@ -116,7 +120,7 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService * * @return 结果 */ - /*@Override + @Override public int updateUserRecharge(RechargecardUser rechargecardUser){ // 根据id查询用户充值卡信息 @@ -127,17 +131,32 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService } // 计算新的余额 BigDecimal newBalance = rechargecardUser.getNumber().add(info.getBalance()); - UserConsumptionDetails userConsumptionDetails= UserConsumptionDetails.builder() - .userId(info.getUserId()).deviceNumber(null).cardNumber(info.getCardNumber()) - .projectId(null).deptId(null).billingType(0).pumpTime(null).unitPrice(null).totalPrice(null) - .discount(null).taxAmount(null).amountDue(rechargecardUser.getNumber()).billingPeriodUnit(null).billingPeriodDuration(null) - .billingDate(DateUtils.getNowDate()).startTime(null).endTime(null).paymentStatus(2).paymentMethod(rechargecardUser.getStatus()) - .paymentTime(DateUtils.getNowDate()).status(0).remark(null); - + UserConsumptionDetails userConsumptionDetails = UserConsumptionDetails.builder() + .userId(info.getUserId()) + .cardNumber(info.getCardNumber()) + .billingType(0) + .amountDue(rechargecardUser.getNumber()) + .billingDate(DateUtils.getNowDate()) // 获取当前日期 + .paymentStatus(2) + .paymentMethod(rechargecardUser.getStatus()) + .paymentTime(DateUtils.getNowDate()) // 获取当前日期 + .status(0) + .areaCode(rechargecardUser.getAreacode()) // 假设 getAreacode() 方法返回区域代码 + .build(); + userConsumptionDetails.setCreateTime(DateUtils.getNowDate()); + NgUserRechargeRecords ngUserRechargeRecords = NgUserRechargeRecords.builder() + .userId(info.getUserId()).userName(info.getUserName()) + .cardNumber(info.getCardNumber()).areaCode(rechargecardUser.getAreacode()) + .type(rechargecardUser.getStatus()).amount(rechargecardUser.getNumber()) + .balance(info.getBalance()).rechargeTime(DateUtils.getNowDate()) + .rechargeCode(null).status(0).serialNumber(null).deviceNumber(null).projectId(null) + .deptId(null) + .build(); + userRechargeRecordsMapper.insertNgUserRechargeRecords(ngUserRechargeRecords); userConsumptionDetailsMapper.insertUserConsumptionDetails(userConsumptionDetails); // 更新用户充值卡信息，包括新的余额 info.setBalance(newBalance); info.setUpdateTime(DateUtils.getNowDate()); return userRechargeCardsMapper.updateUserRechargeCards(info); - }*/ + } }