加剩余金额字段

jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberAdapayRecord.java

@@ -1,16 +1,13 @@
 package com.jsowell.pile.domain;
 
+import lombok.*;
+
 import java.math.BigDecimal;
 import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 /**
-    * 会员汇付支付记录表
-    */
+ * 会员汇付支付记录表
+ */
 @Getter
 @Setter
 @Builder
@@ -20,62 +17,67 @@ public class MemberAdapayRecord {
     private Integer id;
 
     /**
-    * 会员id
-    */
+     * 会员id
+     */
     private String memberId;
 
     /**
-    * 场景类型（order, balance）
-    */
+     * 场景类型（order, balance）
+     */
     private String scenarioType;
 
     /**
-    * 汇付支付id
-    */
+     * 汇付支付id
+     */
     private String paymentId;
 
     /**
-    * 汇付支付单号
-    */
+     * 汇付支付单号
+     */
     private String paymentOrderNo;
 
     /**
-    * 支付金额
-    */
+     * 支付金额
+     */
     private BigDecimal payAmt;
 
     /**
-    * 退款金额
-    */
+     * 退款金额
+     */
     private BigDecimal refundAmt;
 
     /**
-    * 消费金额
-    */
+     * 消费金额
+     */
     private BigDecimal spendAmt;
 
     /**
-    * 创建人
-    */
+     * 剩余金额
+     */
+    private BigDecimal balanceAmt;
+
+    /**
+     * 创建人
+     */
     private String createBy;
 
     /**
-    * 创建时间
-    */
+     * 创建时间
+     */
     private Date createTime;
 
     /**
-    * 更新人
-    */
+     * 更新人
+     */
     private String updateBy;
 
     /**
-    * 更新时间
-    */
+     * 更新时间
+     */
     private Date updateTime;
 
     /**
-    * 删除标识
-    */
+     * 删除标识
+     */
     private String delFlag;
 }

jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberAdapayRecordMapper.java

@@ -1,12 +1,14 @@
 package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.MemberAdapayRecord;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface MemberAdapayRecordMapper {
     /**
      * insert record to table selective
+     *
      * @param record the record
      * @return insert count
      */
@@ -14,6 +16,7 @@ public interface MemberAdapayRecordMapper {
 
     /**
      * select by primary key
+     *
      * @param id primary key
      * @return object by primary key
      */
@@ -21,6 +24,7 @@ public interface MemberAdapayRecordMapper {
 
     /**
      * update record selective
+     *
      * @param record the updated record
      * @return update count
      */

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -632,6 +632,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
     public void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
         logger.info("结算订单start data:{}, orderBasicInfo:{}", data.toString(), orderBasicInfo.toString());
         String orderCode = orderBasicInfo.getOrderCode();
+        String memberId = orderBasicInfo.getMemberId();
 
         // 判断订单状态
         if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) {
@@ -1111,6 +1112,29 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         return result;
     }
 
+    /**
+     * 余额支付订单，使用余额支付转账
+     * @param orderBasicInfo
+     * @param adapayMemberAccount
+     * @return
+     */
+    public OrderSettleResult doBalancePaymentV2(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount) throws BaseAdaPayException {
+        // 计算应该支付金额，和手续费
+        SplitSettleAmountVO splitSettleAmountVO = splitSettleAmount(orderBasicInfo.getSettleAmount());
+        BigDecimal feeAmount = splitSettleAmountVO.getFeeAmount();
+        BigDecimal tradeAmount = splitSettleAmountVO.getTradeAmount();
+        logger.info("余额支付订单使用余额支付转账, orderCode:{}, inMemberId:{}, transAmt:{}", orderBasicInfo.getOrderCode(), orderBasicInfo, tradeAmount);
+
+        // 查询会员的余额充值记录
+
+        // 分账
+
+        // 更新余额充值记录
+
+
+        return null;
+    }
+
     /**
      * 延迟交易订单 交易确认
      * @param orderBasicInfo 订单