t_station_account_record新增交易类型

car-wash-entity/src/main/java/com/kym/entity/StationAccountRecord.java

@@ -1,8 +1,6 @@
 package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.kym.entity.BaseEntity;
-import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -43,10 +41,15 @@ public class StationAccountRecord extends BaseEntity {
     private Integer amount;
 
     /**
-     * 0：收入 1：支出
+     * 交易类型(0-平台技术服务费，1-充值 2-消费 3-解冻 4-跨店支出 5-退款)
      */
     private Integer type;
 
+    /**
+     * 0：收入 1：支出
+     */
+    private Integer typeDesc;
+
     /**
      * 交易前余额（分）
      */

car-wash-service/src/main/java/com/kym/service/awoara/event/handle/OrderCloseEventHandler.java

@@ -175,7 +175,8 @@ public class OrderCloseEventHandler implements AwoaraEventHandler<OrderInfoObjec
                 .setStationId(StationAccount.PLATFORM_STATION_ID)
                 .setTradeNo(washOrder.getOrderId())
                 .setAmount(platformAmount)
-                .setType(StationAccountRecord.TYPE_收入)
+                .setType(SplitRecord.TYPE_RECHARGE)
+                .setTypeDesc(StationAccountRecord.TYPE_收入)
                 .setBeforeBalance(platformStationAccount.getBalance())
                 .setAfterBalance(platformStationAccount.getBalance() + platformAmount);
 
@@ -183,7 +184,8 @@ public class OrderCloseEventHandler implements AwoaraEventHandler<OrderInfoObjec
                 .setStationId(washOrder.getStationId())
                 .setTradeNo(washOrder.getOrderId())
                 .setAmount(unfreezeAmount)
-                .setType(StationAccountRecord.TYPE_收入)
+                .setType(SplitRecord.TYPE_RECHARGE)
+                .setTypeDesc(StationAccountRecord.TYPE_收入)
                 .setBeforeBalance(userStationAccount.getBalance())
                 .setAfterBalance(userStationAccount.getBalance() + unfreezeAmount);
 
@@ -276,7 +278,8 @@ public class OrderCloseEventHandler implements AwoaraEventHandler<OrderInfoObjec
                 .setStationId(StationAccount.PLATFORM_STATION_ID)
                 .setTradeNo(washOrder.getOrderId())
                 .setAmount(platformAmount)
-                .setType(StationAccountRecord.TYPE_收入)
+                .setType(SplitRecord.TYPE_PLATFORM)
+                .setTypeDesc(StationAccountRecord.TYPE_收入)
                 .setBeforeBalance(platformStationAccount.getBalance())
                 .setAfterBalance(platformStationAccount.getBalance() + platformAmount);
 
@@ -284,7 +287,8 @@ public class OrderCloseEventHandler implements AwoaraEventHandler<OrderInfoObjec
                 .setStationId(washOrder.getStationId())
                 .setTradeNo(washOrder.getOrderId())
                 .setAmount(crossAmount)
-                .setType(StationAccountRecord.TYPE_收入)
+                .setType(SplitRecord.TYPE_CONSUME)
+                .setTypeDesc(StationAccountRecord.TYPE_收入)
                 .setBeforeBalance(consumeStationAccount.getBalance())
                 .setAfterBalance(consumeStationAccount.getBalance() + crossAmount);
 
@@ -293,7 +297,8 @@ public class OrderCloseEventHandler implements AwoaraEventHandler<OrderInfoObjec
                 .setStationId(userStationId)
                 .setTradeNo(washOrder.getOrderId())
                 .setAmount(localAmount)
-                .setType(StationAccountRecord.TYPE_收入)
+                .setType(SplitRecord.TYPE_CONSUME) // Todo 是否要拆分消费和解冻
+                .setTypeDesc(StationAccountRecord.TYPE_收入)
                 .setBeforeBalance(userStationAccount.getBalance())
                 .setAfterBalance(userStationAccount.getBalance() + localAmount)
                 .setBeforeFrozenAmount(userStationAccount.getFrozenAmount())
@@ -304,7 +309,8 @@ public class OrderCloseEventHandler implements AwoaraEventHandler<OrderInfoObjec
                 .setStationId(userStationId)
                 .setTradeNo(washOrder.getOrderId())
                 .setAmount(crossAmount)
-                .setType(StationAccountRecord.TYPE_支出)
+                .setType(SplitRecord.TYPE_CROSS_EXPEND)
+                .setTypeDesc(StationAccountRecord.TYPE_支出)
                 .setBeforeBalance(stationAccountRecord2.getAfterBalance())
                 .setAfterBalance(stationAccountRecord2.getAfterBalance() - unfreezeAmount);
 

car-wash-service/src/main/java/com/kym/service/wechat/impl/WxPayServiceImpl.java

@@ -18,9 +18,7 @@ import com.kym.entity.*;
 import com.kym.service.*;
 import com.kym.service.wechat.WxPayService;
 import com.wechat.pay.java.core.Config;
-import com.wechat.pay.java.core.RSAAutoCertificateConfig;
 import com.wechat.pay.java.core.exception.ValidationException;
-import com.wechat.pay.java.core.http.DefaultHttpClientBuilder;
 import com.wechat.pay.java.core.http.okhttp.OkHttpClientAdapter;
 import com.wechat.pay.java.core.notification.NotificationConfig;
 import com.wechat.pay.java.core.notification.NotificationParser;
@@ -372,7 +370,8 @@ public class WxPayServiceImpl implements WxPayService {
                         .setStationId(stationId)
                         .setTradeNo(transaction.getTransactionId())
                         .setAmount(stationBasicAmount)
-                        .setType(StationAccountRecord.TYPE_收入)
+                        .setType(SplitRecord.TYPE_RECHARGE)
+                        .setTypeDesc(StationAccountRecord.TYPE_收入)
                         .setBeforeBalance(stationAccount.getBalance())
                         .setBeforeFrozenAmount(stationAccount.getFrozenAmount())
                         .setAfterBalance(stationAccount.getBalance() + stationBasicAmount)