APP司机账户

performance-api/src/main/java/com/clx/performance/vo/app/APPNetworkDriverRunningWaterRecordVO.java

@@ -26,9 +26,15 @@ public class APPNetworkDriverRunningWaterRecordVO {
     @ApiModelProperty("流水类型 10：运单结算 20：提现冻结 30：提现成功")
     private Integer runningWaterType;
 
+    @ApiModelProperty("流水类型简介")
+    private Integer runningWaterTypeMsg;
+
     @ApiModelProperty("资金类型 10：收入 20：冻结 30：支出")
     private Integer fundType;
 
+    @ApiModelProperty("资金类型简介")
+    private Integer fundTypeMsg;
+
     @ApiModelProperty("")
     private Long relationId;
 

performance-api/src/main/java/com/clx/performance/vo/pc/NetworkDriverRunningWaterRecordVO.java

@@ -34,9 +34,15 @@ public class NetworkDriverRunningWaterRecordVO{
     @ApiModelProperty("流水类型 10：运单结算 20：提现冻结 30：提现成功")
     private Integer runningWaterType;
 
+    @ApiModelProperty("流水类型简介")
+    private Integer runningWaterTypeMsg;
+
     @ApiModelProperty("资金类型 10：收入 20：冻结 30：支出")
     private Integer fundType;
 
+    @ApiModelProperty("资金类型简介")
+    private Integer fundTypeMsg;
+
     @ApiModelProperty("")
     private Long relationId;
 

performance-web/src/main/java/com/clx/performance/service/impl/settle/NetworkDriverRunningWaterRecordServiceImpl.java

@@ -22,10 +22,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.function.BiConsumer;
-import java.util.stream.Collectors;
 
 /**
  * @author kavin

performance-web/src/main/java/com/clx/performance/sqlProvider/settle/NetworkDriverRunningWaterRecordProvider.java

@@ -14,7 +14,7 @@ public class NetworkDriverRunningWaterRecordProvider {
     public String networkDriverRunningWaterRecordDao(@Param("param") PageNetworkAccountInfoListParam param) {
         String sql = new SQL() {{
             SELECT("a.id, a.running_water_no," +
-                    " a.driver_user_no,a.driver_user_name, a.mobile,a.running_water_type, a.account_balance, " +
+                    " a.driver_user_no,a.driver_user_name, a.mobile,a.running_water_type,a.running_water_type_msg,a.fund_type_msg,a.account_balance, " +
                     " a.fund_type,a.relation_id,a.order_id,a.order_no,a.order_child_id,a.order_child_no,a.alteration_balance" +
                     "a.usable_balance,a.frozen_balance,a.take_out_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
             FROM("network_driver_running_water_record a");
@@ -36,7 +36,7 @@ public class NetworkDriverRunningWaterRecordProvider {
     public String pageFrozenList(@Param("param") NetworkDriverPageParam param) {
         String sql = new SQL() {{
             SELECT("a.id, a.running_water_no," +
-                    " a.driver_user_no,a.driver_user_name, a.mobile,a.running_water_type, a.account_balance,a.frozen_flag, " +
+                    " a.driver_user_no,a.driver_user_name, a.mobile,a.running_water_type,a.running_water_type_msg,a.fund_type_msg, a.account_balance,a.frozen_flag, " +
                     " a.fund_type,a.relation_id,a.order_id,a.order_no,a.order_child_id,a.order_child_no,a.alteration_balance" +
                     "a.usable_balance,a.frozen_balance,a.take_out_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
             FROM("network_driver_running_water_record a");
@@ -53,7 +53,7 @@ public class NetworkDriverRunningWaterRecordProvider {
     public String runningWaterList(@Param("param") NetworkDriverPageParam param) {
         String sql = new SQL() {{
             SELECT("a.id, a.running_water_no," +
-                    " a.driver_user_no,a.driver_user_name, a.mobile,a.running_water_type, a.account_balance, " +
+                    " a.driver_user_no,a.driver_user_name, a.mobile,a.running_water_type,a.running_water_type_msg,a.fund_type_msg,a.account_balance, " +
                     " a.fund_type,a.relation_id,a.order_id,a.order_no,a.order_child_id,a.order_child_no,a.alteration_balance" +
                     "a.usable_balance,a.frozen_balance,a.take_out_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
             FROM("network_driver_running_water_record a");