用户充值提交接口

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));
-    }*/
+    }
 }

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;

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;

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);
 }

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()
+        UserConsumptionDetails userConsumptionDetails = UserConsumptionDetails.builder()
-                        .userId(info.getUserId()).deviceNumber(null).cardNumber(info.getCardNumber())
+                .userId(info.getUserId())
-                .projectId(null).deptId(null).billingType(0).pumpTime(null).unitPrice(null).totalPrice(null)
+                .cardNumber(info.getCardNumber())
-                .discount(null).taxAmount(null).amountDue(rechargecardUser.getNumber()).billingPeriodUnit(null).billingPeriodDuration(null)
+                .billingType(0)
-                .billingDate(DateUtils.getNowDate()).startTime(null).endTime(null).paymentStatus(2).paymentMethod(rechargecardUser.getStatus())
+                .amountDue(rechargecardUser.getNumber())
-                .paymentTime(DateUtils.getNowDate()).status(0).remark(null);
+                .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);
-    }*/
+    }
 }