用户钱包账单明细

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/wallet/UserBillingDetailVO.java

+package com.mmc.iuav.user.model.vo.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author LW
+ * @date 2023/8/24 14:37
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class UserBillingDetailVO implements Serializable {
+
+    private static final long serialVersionUID = -113701726830167312L;
+    @ApiModelProperty(value = "用户id")
+    private Integer userAccountId;
+    @ApiModelProperty(value = "流水编号")
+    private String payNo;
+    @ApiModelProperty(value = "操作方式 100（订单发布） 200(无人接单取消订单）300（有人接单取消订单）400（飞手抢单）500（客服判定飞手无责取消订单）" +
+            "600（飞手有责取消订单）700（正常结算）800(修改订单金额状态)900（飞手未确认修改金额状态）1000（飞手确认修改金额状态）1100（充值） 1200（提现）")
+    private Integer payMethod;
+    @ApiModelProperty(value = "云享金变动金额(正数充值，负数扣除)")
+    private BigDecimal cashAmtPaid;
+    @ApiModelProperty(value = "佣金变动金额(正数入账，负数扣除)")
+    private BigDecimal salaryAmtPaid;
+    @ApiModelProperty(value = "操作时间")
+    private Date payTime;
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/wallet/PayWalletController.java

@@ -4,6 +4,7 @@ import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.controller.BaseController;
 import com.mmc.iuav.user.model.dto.wallet.PayWalletDTO;
 import com.mmc.iuav.user.model.vo.wallet.TopUpOrderVO;
+import com.mmc.iuav.user.model.vo.wallet.UserBillingDetailVO;
 import com.mmc.iuav.user.model.vo.wallet.WalletFlowVO;
 import com.mmc.iuav.user.service.wallet.PayWalletService;
 import io.swagger.annotations.*;
@@ -67,9 +68,9 @@ public class PayWalletController extends BaseController {
     }
 
     @ApiOperation(value = "用户账单明细")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UserBillingDetailVO.class)})
     @GetMapping("customerBillingDetail")
-    public ResultBody customerBillingDetail(Integer userAccountId) {
-        return payWalletService.customerBillingDetail(userAccountId);
+    public ResultBody<UserBillingDetailVO> customerBillingDetail(HttpServletRequest request) {
+        return payWalletService.customerBillingDetail(this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/wallet/PayWalletDao.java

@@ -4,6 +4,8 @@ import com.mmc.iuav.user.entity.wallet.PayLogDO;
 import com.mmc.iuav.user.entity.wallet.PayWalletDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @Author LW
  * @date 2023/8/18 11:37
@@ -18,4 +20,6 @@ public interface PayWalletDao {
     void insertPayLogDO(PayLogDO payWalletDO);
 
     int updatePayWallet(PayWalletDO updatePayWallet);
+
+    List<PayLogDO> getPayLog(Integer userAccountId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/wallet/PayLogDO.java

 package com.mmc.iuav.user.entity.wallet;
 
+import com.mmc.iuav.user.model.vo.wallet.UserBillingDetailVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -34,7 +35,8 @@ public class PayLogDO implements Serializable {
      */
     private String payNo;
     /**
-     * 0手动变更(大于0充值or小于0扣除) 50订单取消 100订单扣除 150订单冻结  200订单完成  250充值 300 提现扣除
+     * 支付方式 100（订单发布） 200(无人接单取消订单）300（有人接单取消订单）400（飞手抢单）500（客服判定飞手无责取消订单）
+     * 600（飞手有责取消订单）700（正常结算）800(修改订单金额状态)900（飞手未确认修改金额状态）1000（飞手确认修改金额状态）1100（充值） 1200（提现）
      */
     private Integer payMethod;
     /**
@@ -61,5 +63,11 @@ public class PayLogDO implements Serializable {
     private Date createTime;
 
     private Date updateTime;
+
+    public UserBillingDetailVO buildUserBillingDetailVO() {
+        return UserBillingDetailVO.builder().userAccountId(userAccountId).payNo(payNo)
+                .payTime(payTime).payMethod(payMethod).cashAmtPaid(cashAmtPaid)
+                .salaryAmtPaid(salaryAmtPaid).build();
+    }
 }
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/wallet/impl/PayWalletServiceImpl.java

@@ -22,6 +22,8 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author LW
@@ -454,7 +456,7 @@ public class PayWalletServiceImpl implements PayWalletService {
 
     @Override
     public ResultBody customerBillingDetail(Integer userAccountId) {
-        
-        return null;
+        List<PayLogDO> payLogList = payWalletDao.getPayLog(userAccountId);
+        return ResultBody.success(payLogList == null ? null : payLogList.stream().map(PayLogDO::buildUserBillingDetailVO).collect(Collectors.toList()));
     }
 }

csm-service/cms-service-user/src/main/resources/mapper/wallet/PayWalletDao.xml

@@ -62,4 +62,18 @@
         from pay_wallet
         where user_account_id = #{userAccountId}
     </select>
+    <select id="getPayLog" resultType="com.mmc.iuav.user.entity.wallet.PayLogDO">
+        select id,
+               user_account_id,
+               pay_no,
+               pay_method,
+               cash_amt_paid,
+               salary_amt_paid,
+               pay_time,
+               remark,
+               operate_user,
+               create_time
+        from pay_log
+        where user_account_id = #{userAccountId}
+    </select>
 </mapper>