payment(add)

src/main/java/com/mmc/payment/controller/RepoCashController.java

@@ -3,9 +3,11 @@ package com.mmc.payment.controller;
 import com.mmc.payment.common.BaseController;
 import com.mmc.payment.common.ResultBody;
 import com.mmc.payment.config.RepeatSubmit;
+import com.mmc.payment.model.dto.PayCashResultDTO;
 import com.mmc.payment.model.dto.RepoCashDTO;
 import com.mmc.payment.model.qo.RepoCashQO;
 import com.mmc.payment.model.vo.RepoCashVO;
+import com.mmc.payment.model.vo.RepoOrderPayVO;
 import com.mmc.payment.service.RepoCashService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,8 +15,10 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 
 /**
  * @Author small
@@ -29,6 +33,22 @@ public class RepoCashController  {
     @Autowired
     private RepoCashService repoCashService;
 
+
+    @ApiOperation(value = "支付订单-充值扣款")
+    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = PayCashResultDTO.class) })
+    @ApiIgnore
+    @PostMapping("PayCashOrder")
+    public PayCashResultDTO feignPayCashOrder(@RequestBody RepoOrderPayVO orderPay) {
+        return repoCashService.payCashOrder(orderPay);
+    }
+
+    @ApiIgnore
+    @ApiOperation(value = "当前用户剩余的余额")
+    @GetMapping("RemainingBalance")
+    public BigDecimal RemainingBalance(@RequestParam(value = "repoAccountId",required = true) Integer repoAccountId) {
+        return repoCashService.RemainingBalance(repoAccountId);
+    }
+
     @ApiOperation(value = "余额变更-分页-列表")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = RepoCashDTO.class) })
     @PostMapping("listPageCash")

src/main/java/com/mmc/payment/dao/RepoCashDao.java

@@ -28,4 +28,8 @@ public interface RepoCashDao {
     RepoWalletDO getRepoWalletInfo(Integer repoAccountId);
 
     void updateRepoWalletAmt(Integer repoAccountId, BigDecimal chageAmt);
+
+    BigDecimal RemainingBalance(Integer repoAccountId);
+
+    void updateWalletAmt(Integer repoAccountId, BigDecimal addAmt, BigDecimal addPaid);
 }

src/main/java/com/mmc/payment/model/dto/BaseAccountDTO.java

@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.model.dto.BaseAccountDTO", description = "登录信息DTO")
+//@ApiModel(value = "com.mmc.csf.model.dto.BaseAccountDTO", description = "登录信息DTO")
 public class BaseAccountDTO implements Serializable {
     private static final long serialVersionUID = -2979712090903806216L;
     private Integer id;

src/main/java/com/mmc/payment/model/dto/ExpStationsDTO.java

+package com.mmc.payment.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author small
+ * @Date 2023/5/27 15:31
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+//@ApiModel(value = "com.mmc.csf.model.dto.ExpStationsDTO", description = "物流信息DTO")
+public class ExpStationsDTO implements Serializable {
+    private static final long serialVersionUID = 8737447241343561076L;
+    @ApiModelProperty(value = "物流状态：查字典")
+    private String Action;
+    @ApiModelProperty(value = "描述")
+    private String AcceptStation;
+    @ApiModelProperty(value = "时间")
+    private String AcceptTime;
+    @ApiModelProperty(value = "所在城市")
+    private String Location;
+}

src/main/java/com/mmc/payment/model/dto/KdnExpDTO.java

+package com.mmc.payment.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author small
+ * @Date 2023/5/27 15:31
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+//@ApiModel(value = "com.mmc.csf.model.dto.KdnExpDTO", description = "物流信息DTO")
+public class KdnExpDTO implements Serializable {
+    private static final long serialVersionUID = 4129710329541565557L;
+    @ApiModelProperty(value = "物流状态：查字典")
+    private String StateEx;
+    @ApiModelProperty(value = "快递公司编码：查字典")
+    private String ShipperCode;
+    @ApiModelProperty(value = "物流单号")
+    private String LogisticCode;
+    @ApiModelProperty(value = "快递流转信息")
+    private List<ExpStationsDTO> Traces;
+}

src/main/java/com/mmc/payment/model/dto/OrderInfoDTO.java

+package com.mmc.payment.model.dto;
+
+import com.mmc.payment.entity.RepoCashDO;
+import io.swagger.annotations.ApiModel;
+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;
+import java.util.List;
+
+/**
+ * @Author small
+ * @Date 2023/5/27 15:16
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+//@ApiModel(value = "com.mmc.csf.model.dto.OrderInfoDTO", description = "云仓订单DTO")
+public class OrderInfoDTO implements Serializable {
+    private static final long serialVersionUID = 1572467108563651846L;
+    @ApiModelProperty(value = "ID")
+    private Integer id;
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+    @ApiModelProperty(value = "商品ID")
+    private Integer wareInfoId;
+    @ApiModelProperty(value = "商品编号")
+    private String wareNo;
+    @ApiModelProperty(value = "商品标题")
+    private String wareTitle;
+    @ApiModelProperty(value = "商品图片")
+    private String wareImg;
+    @ApiModelProperty(value = "套餐（sku）ID")
+    private Integer skuInfoId;
+    @ApiModelProperty(value = "套餐（sku）名称")
+    private String skuTitle;
+    @ApiModelProperty(value = "购买用户ID")
+    private Integer repoAccountId;
+    @ApiModelProperty(value = "用户UID")
+    private String uid;
+    @ApiModelProperty(value = "买家name")
+    private String buyerName;
+    @ApiModelProperty(value = "买家电话")
+    private String buyerPhone;
+    @ApiModelProperty(value = "单价")
+    private BigDecimal unitPrice;
+    @ApiModelProperty(value = "购买的商品数量")
+    private Integer wareNum;
+    @ApiModelProperty(value = "应付款金额")
+    private BigDecimal shouldPay;
+    @ApiModelProperty(value = "实收款金额")
+    private BigDecimal actualPay;
+    @ApiModelProperty(value = "订单类型：0租赁 100购买")
+    private Integer orderType;
+    @ApiModelProperty(value = "押金")
+    private BigDecimal deposit;
+    @ApiModelProperty(value = "租金总金额")
+    private BigDecimal rentPrice;
+    @ApiModelProperty(value = "租约开始日")
+    private Date startDate;
+    @ApiModelProperty(value = "租约结束日")
+    private Date endDate;
+    @ApiModelProperty(value = "付款天数")
+    private Integer payDay;
+    @ApiModelProperty(value = "交易状态：查订单状态字典")
+    private String tranStatus;
+    @ApiModelProperty(value = "减库方式 0:买家拍下减库存 1:卖家付款减库存")
+    private Integer exWare;
+    @ApiModelProperty(value = "用户备注")
+    private String remark;
+    @ApiModelProperty(value = "平台人员备注")
+    private String pfRemark;
+    @ApiModelProperty(value = "关闭原因")
+    private String shutReason;
+    @ApiModelProperty(value = "交易编号")
+    private String payNo;
+    @ApiModelProperty(value = "支付时间")
+    private Date payTime;
+    @ApiModelProperty(value = "发货时间")
+    private Date sendWareTime;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    @ApiModelProperty(value = "物流信息/收货地址信息")
+    private OrderReceiptDTO receipt;
+    @ApiModelProperty(value = "退款单详情信息,无则为null")
+    private OrderRefundDTO orderRefund;
+    @ApiModelProperty(value = "发货-物流动态,无则为null")
+    private KdnExpDTO express;
+    @ApiModelProperty(value = "退货-物流动态,无则为null")
+    private KdnExpDTO refundExpress;
+    @ApiModelProperty(value = "质检详情,无则为null")
+    private List<OrderVcuDTO> vcus;
+
+    public RepoCashDO buildRepoCashDO() {
+        return RepoCashDO.builder().uid(this.uid).accountName(this.buyerName).orderInfoId(this.id)
+                .orderNo(this.orderNo).skuInfoId(this.skuInfoId).skuTitle(this.skuTitle).wareInfoId(this.wareInfoId)
+                .wareTitle(this.wareTitle).wareNo(this.wareNo).build();
+    }
+
+}
+

src/main/java/com/mmc/payment/model/dto/OrderReceiptDTO.java

+package com.mmc.payment.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author small
+ * @Date 2023/5/27 15:27
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+//@ApiModel(value = "com.mmc.csf.model.dto.OrderReceiptDTO", description = "订单收货信息DTO")
+public class OrderReceiptDTO implements Serializable {
+    private static final long serialVersionUID = -6212026509857770276L;
+    @ApiModelProperty(value = "地址ID")
+    private Integer id;
+    @ApiModelProperty(value = "收货方式：0邮寄 1门店地址")
+    private Integer receiptMethod;
+    @ApiModelProperty(value = "0-收货人姓名")
+    private String takeName;
+    @ApiModelProperty(value = "0-收货人电话")
+    private String takePhone;
+    @ApiModelProperty(value = "0-收货区域")
+    private String region;
+    @ApiModelProperty(value = "0-收获详细地址")
+    private String detailAddress;
+    @ApiModelProperty(value = "1-门店名称")
+    private String repoName;
+    @ApiModelProperty(value = "1-门店详细地址")
+    private String repoAddress;
+    @ApiModelProperty(value = "1-预留手机号")
+    private String bookPhone;
+    @ApiModelProperty(value = "发货-物流公司码")
+    private String sendExCode;
+    @ApiModelProperty(value = "发货-物流单号")
+    private String sendExNo;
+    @ApiModelProperty(value = "发货地址")
+    private String sendAddress;
+    @ApiModelProperty(value = "退还货方式：0邮寄 1门店地址")
+    private Integer renMethod;
+    @ApiModelProperty(value = "退还货-收货电话")
+    private String renPhone;
+    @ApiModelProperty(value = "退还货-收货人")
+    private String renName;
+    @ApiModelProperty(value = "退还货-物流公司码")
+    private String renExCode;
+    @ApiModelProperty(value = "退还货-物流单号")
+    private String renExNo;
+    @ApiModelProperty(value = "退还货-地址")
+    private String renAddress;
+    @ApiModelProperty(value = "退还货-门店名称")
+    private String renRepoName;
+    @ApiModelProperty(value = "退还货-门店地址")
+    private String renRepoAddr;
+    @ApiModelProperty(value = "退还货-门店联系电话")
+    private String renRepoPhone;
+
+}

src/main/java/com/mmc/payment/model/dto/OrderRefundDTO.java

+package com.mmc.payment.model.dto;
+
+import io.swagger.annotations.ApiModel;
+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;
+import java.util.List;
+
+/**
+ * @Author small
+ * @Date 2023/5/27 15:27
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "com.mmc.csf.model.dto.OrderRefundDTO", description = "退款单DTO")
+public class OrderRefundDTO implements Serializable {
+    private static final long serialVersionUID = -6124933008580173589L;
+    @ApiModelProperty(value = "退款单ID")
+    private Integer id;
+    @ApiModelProperty(value = "订单ID")
+    private Integer orderInfoId;
+    @ApiModelProperty(value = "退款单号")
+    private String refundNo;
+    @ApiModelProperty(value = "退款单状态：查字典")
+    private Integer refundStatus;
+    @ApiModelProperty(value = "应退款金额")
+    private BigDecimal shouldRefund;
+    @ApiModelProperty(value = "实际退款金额")
+    private BigDecimal actualRefund;
+    @ApiModelProperty(value = "退款理由")
+    private String reason;
+    @ApiModelProperty(value = "创建时间/申请时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "退款-设备情况(图片&视频)")
+    private OrderVcuDTO orderVcu;
+
+    @ApiModelProperty(value = "订单信息")
+    private OrderInfoDTO orderInfo;
+
+    @ApiModelProperty(value = "退款协商历史")
+    private List<RefundLogDTO> rlogs;
+
+    @ApiModelProperty(value = "退款流水信息")
+    private RepoCashDTO refundCash;
+    @ApiModelProperty(value = "平台备注")
+    private String pfRemark;
+}

src/main/java/com/mmc/payment/model/dto/OrderVcuDTO.java

+package com.mmc.payment.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author small
+ * @Date 2023/5/27 15:27
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "com.mmc.csf.model.dto.OrderVcuDTO", description = "订单凭证DTO")
+public class OrderVcuDTO implements Serializable {
+    private static final long serialVersionUID = -7101242524092899210L;
+    @ApiModelProperty(value = "ID")
+    private Integer id;
+    @ApiModelProperty(value = "订单ID")
+    private Integer orderInfoId;
+    @ApiModelProperty(value = "0:发货 1:收货 2:归还 3:平台收货")
+    private Integer vcuType;
+    @ApiModelProperty(value = "设备状况:0无问题 1有问题")
+    private Integer vcuSatus;
+    @ApiModelProperty(value = "描述-备注")
+    private String remark;
+    @ApiModelProperty(value = "图片集合")
+    private List<String> imgs;
+    @ApiModelProperty(value = "视频")
+    private String videoUrl;
+}
+

src/main/java/com/mmc/payment/model/dto/PayCashResultDTO.java

+package com.mmc.payment.model.dto;
+
+import io.swagger.annotations.ApiModel;
+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;
+
+/**
+ * @Author small
+ * @Date 2023/5/27 15:22
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+//@ApiModel(value = "com.mmc.csf.model.dto.PayCashResultDTO", description = "云仓支付扣款DTO")
+public class PayCashResultDTO implements Serializable {
+    private static final long serialVersionUID = 5187623898281150213L;
+    @ApiModelProperty(value = "响应状态（200成功，其他失败）")
+    private String status;
+    @ApiModelProperty(value = "响应消息")
+    private String message;
+    @ApiModelProperty(value = "交易编号")
+    private String payNo;
+    @ApiModelProperty(value = "本次操作支付现金金额")
+    private BigDecimal cashPaid;
+
+    public static PayCashResultDTO error(String status, String message) {
+        return PayCashResultDTO.builder().status(status).message(message).build();
+    }
+
+    public static PayCashResultDTO success(BigDecimal cashPaid, String payNo) {
+        return PayCashResultDTO.builder().status("200").message("success").cashPaid(cashPaid).payNo(payNo).build();
+    }
+}
+

src/main/java/com/mmc/payment/model/dto/RefundLogDTO.java

+package com.mmc.payment.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author small
+ * @Date 2023/5/27 15:30
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+//@ApiModel(value = "com.mmc.csf.model.dto.RefundLogDTO", description = "退款logDTO")
+public class RefundLogDTO implements Serializable {
+    private static final long serialVersionUID = 6524395508534109389L;
+    @ApiModelProperty(value = "内容")
+    private String msg;
+    @ApiModelProperty(value = "账号")
+    private String opAccount;
+    @ApiModelProperty(value = "名称")
+    private String opName;
+    @ApiModelProperty(value = "创建/发送时间")
+    private Date createTime;
+
+}

src/main/java/com/mmc/payment/model/vo/RepoOrderPayVO.java

+package com.mmc.payment.model.vo;
+
+import com.mmc.payment.model.dto.BaseAccountDTO;
+import com.mmc.payment.model.dto.OrderInfoDTO;
+import com.mmc.payment.model.dto.RepoAccountDTO;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Author small
+ * @Date 2023/5/27 15:23
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+//@ApiModel(value = "com.mmc.csf.model.vo.RepoOrderPayVO", description = "订单支付VO")
+public class RepoOrderPayVO implements Serializable {
+    private static final long serialVersionUID = 8149373745729826654L;
+    private BaseAccountDTO account;
+    private OrderInfoDTO orderInfo;
+    private ShareOrderDTO shareOrder;
+    private RepoAccountDTO repoAccount;
+    private RepoCashVO payCash;
+    private BigDecimal amtPaid;
+    private String refundNo;
+}

src/main/java/com/mmc/payment/model/vo/ShareOrderDTO.java

+package com.mmc.payment.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author small
+ * @Date 2023/5/27 15:23
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+//@ApiModel(value = "com.mmc.csf.model.dto.ShareOrderDTO", description = "共享设备订单DTO")
+public class ShareOrderDTO implements Serializable {
+    private static final long serialVersionUID = -1395178773843809078L;
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+    @ApiModelProperty(value = "用户id")
+    private Integer repoAccountId;
+    @ApiModelProperty(value = "用户uid")
+    private String uid;
+    @ApiModelProperty(value = "用户手机号")
+    private String phoneNum;
+    @ApiModelProperty(value = "设备品牌")
+    private String deviceBrand;
+    @ApiModelProperty(value = "地区")
+    private String region;
+    @ApiModelProperty(value = "状态:查字典")
+    private Integer sdStatus;
+    @ApiModelProperty(value = "设备ID")
+    private String deviceCode;
+    @ApiModelProperty(value = "设备型号")
+    private String deviceModel;
+    @ApiModelProperty(value = "用户备注")
+    private String remark;
+    @ApiModelProperty(value = "平台备注")
+    private String pfRemark;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    @ApiModelProperty(value = "修改人ID", hidden = true)
+    private Integer updateUser;
+    @ApiModelProperty(value = "操作人-名字")
+    private String opName;
+    @ApiModelProperty(value = "操作人-账号")
+    private String opNo;
+
+}

src/main/java/com/mmc/payment/service/Impl/RepoCashServiceImpl.java

@@ -10,11 +10,14 @@ import com.mmc.payment.model.dto.*;
 import com.mmc.payment.model.qo.RepoCashQO;
 import com.mmc.payment.model.qo.UserAccountQO;
 import com.mmc.payment.model.vo.RepoCashVO;
+import com.mmc.payment.model.vo.RepoOrderPayVO;
 import com.mmc.payment.service.RepoCashService;
 import io.jsonwebtoken.lang.Collections;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.client.RestTemplate;
 
 import java.math.BigDecimal;
@@ -67,9 +70,9 @@ public class RepoCashServiceImpl implements RepoCashService {
         }).collect(Collectors.toList());
         UserAccountQO uq = UserAccountQO.builder().userIds(userIds).build();
         List<UserAccountDTO> users = null;
+        //批量获取用户信息
     // userServletClient.feignListUserAccountById(uq);
-
-    // 远程调用
+    // 远程调用非当前接口
     ResponseEntity<String> response =
         restTemplate.getForEntity("http://localhost:35150/userapp/user-account/feignGetUserSimpleInfo?userAccountId=1"+ userIds,String.class);
         String body = response.getBody();
@@ -204,4 +207,40 @@ public class RepoCashServiceImpl implements RepoCashService {
         RepoCashDO refund=repoCashDao.getRefundCashInfo(refundNo);
         return refund == null ? null : refund.buildRepoCashDTO();
     }
+
+    @Override
+    public BigDecimal RemainingBalance(Integer repoAccountId) {
+        return repoCashDao.RemainingBalance(repoAccountId);
+    }
+
+    @Override
+    public PayCashResultDTO payCashOrder(RepoOrderPayVO orderPay) {
+        BaseAccountDTO account = orderPay.getAccount();
+        OrderInfoDTO orderInfo = orderPay.getOrderInfo();
+        RepoWalletDO wallet = repoCashDao.getRepoWalletInfo(account.getId());
+        if (wallet == null) {
+            return PayCashResultDTO.error(ResultEnum.WALLET_NOT_FIND_ERROR.getResultCode(),
+                    ResultEnum.WALLET_NOT_FIND_ERROR.getResultMsg());
+        }
+        BigDecimal amtPaid = orderInfo.getShouldPay();
+        if (amtPaid.compareTo(wallet.getCashAmt()) > 0) {
+
+            return PayCashResultDTO.error(ResultEnum.WALLET_CASH_NOT_ENOUGH_ERROR.getResultCode(),
+                    ResultEnum.WALLET_CASH_NOT_ENOUGH_ERROR.getResultMsg());
+        }
+        Date cdate = new Date();
+        RepoCashDO cash = orderInfo.buildRepoCashDO();
+        cash.setRepoAccountId(account.getId());
+        cash.setPayNo(CodeUtil.createRepoCashNo());
+        cash.setPayMethod(RepoCashMethod.RENT.getCode());
+        cash.setAmtPaid(amtPaid.multiply(BigDecimal.valueOf(-1)));
+        cash.setCashAmt(wallet.getCashAmt().subtract(amtPaid));
+        cash.setPayTime(cdate);
+        cash.setCreateTime(cdate);
+        repoCashDao.insertRepoCash(cash);
+        repoCashDao.updateWalletAmt(account.getId(), cash.getAmtPaid(), amtPaid);
+        return PayCashResultDTO.success(amtPaid, cash.getPayNo());
+    }
+
+
 }

src/main/java/com/mmc/payment/service/RepoCashService.java

@@ -3,9 +3,13 @@ package com.mmc.payment.service;
 import com.mmc.payment.common.PageResult;
 import com.mmc.payment.common.ResultBody;
 import com.mmc.payment.model.dto.BaseAccountDTO;
+import com.mmc.payment.model.dto.PayCashResultDTO;
 import com.mmc.payment.model.dto.RepoCashDTO;
 import com.mmc.payment.model.qo.RepoCashQO;
 import com.mmc.payment.model.vo.RepoCashVO;
+import com.mmc.payment.model.vo.RepoOrderPayVO;
+
+import java.math.BigDecimal;
 
 /**
  * @Author small
@@ -28,4 +32,8 @@ public interface RepoCashService {
     ResultBody dedCash(BaseAccountDTO cuser, RepoCashVO cash);
 
     RepoCashDTO getRefundInfo(String refundNo);
+
+    BigDecimal RemainingBalance(Integer uid);
+
+    PayCashResultDTO payCashOrder(RepoOrderPayVO orderPay);
 }

src/main/resources/mapper/RepoCashDao.xml

@@ -151,4 +151,16 @@
         set cash_amt = cash_amt + #{chageAmt}
         where repo_account_id = #{repoAccountId}
     </update>
+
+    <select id="RemainingBalance" resultType="java.math.BigDecimal">
+        select cash_amt from repo_wallet where repo_account_id=#{repoAccountId}
+    </select>
+
+    <update id="updateWalletAmt">
+        update repo_wallet
+        set cash_amt = cash_amt + #{addAmt},
+            cash_paid = cash_paid + #{addPaid}
+        where repo_account_id = #{repoAccountId}
+    </update>
+
 </mapper>