APP司机账户

performance-api/src/main/java/com/clx/performance/param/app/NetworkDriverPageParam.java

+package com.clx.performance.param.app;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class NetworkDriverPageParam extends PageParam {
+
+    private Long userNo;
+
+    @ApiModelProperty("资金类型  全部：不需要传  10：收入 30：支出 ")
+    private Integer fundType;
+}

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

+package com.clx.performance.vo.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class APPNetworkDriverRunningWaterRecordVO {
+
+    private Integer id;
+
+    @ApiModelProperty("流水号")
+    private Long runningWaterNo;
+
+    @ApiModelProperty("司机编码")
+    private Long driverUserNo;
+
+    @ApiModelProperty("司机名称")
+    private String driverUserName;
+
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @ApiModelProperty("流水类型 10：运单结算 20：提现冻结 30：提现成功")
+    private Integer runningWaterType;
+
+    @ApiModelProperty("资金类型 10：收入 20：冻结 30：支出")
+    private Integer fundType;
+
+    @ApiModelProperty("")
+    private Long relationId;
+
+    @ApiModelProperty("订单ID")
+    private Integer orderId;
+
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @ApiModelProperty("运单ID")
+    private Integer orderChildId;
+
+    @ApiModelProperty("运单编号")
+    private String orderChildNo;
+
+    @ApiModelProperty("变动金额")
+    private BigDecimal alterationBalance;
+
+    @ApiModelProperty("冻结金额")
+    private BigDecimal frozenBalance;
+
+    @ApiModelProperty("可用余额")
+    private BigDecimal usableBalance;
+
+    @ApiModelProperty("账户余额")
+    private BigDecimal accountBalance;
+
+    @ApiModelProperty("扣除金额")
+    private BigDecimal takeOutBalance;
+
+    @ApiModelProperty("操作人")
+    private String createBy;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("修改时间")
+    private LocalDateTime modifiedTime;
+
+}

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverAccountController.java

 package com.clx.performance.controller.app;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.NetworkDriverPageParam;
 import com.clx.performance.service.settle.NetworkDriverAccountService;
-import com.clx.user.feign.PaymentServiceFeign;
+import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
+import com.clx.performance.vo.app.APPNetworkDriverRunningWaterRecordVO;
 import com.clx.user.vo.feign.WalletResidueCardVO;
+import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
-import com.msl.user.utils.TokenUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -23,6 +26,8 @@ public class AppDriverAccountController {
 
     private final NetworkDriverAccountService networkDriverAccountService;
 
+    private final NetworkDriverRunningWaterRecordService networkDriverRunningWaterRecordService;
+
 
     @ApiOperation(value = "APP司机账户", notes = "<br>By:胡宇帆")
     @GetMapping("/account")
@@ -32,4 +37,19 @@ public class AppDriverAccountController {
         return Result.ok(walletResidueCardVO);
     }
 
+    @ApiOperation(value = "APP司机账户冻结明细", notes = "<br>By:胡宇帆")
+    @GetMapping("/frozenList")
+    @UnitCovert(param = false)
+    public Result<PageData<APPNetworkDriverRunningWaterRecordVO>> frozenList(@RequestBody NetworkDriverPageParam param) {
+        IPage<APPNetworkDriverRunningWaterRecordVO> page = networkDriverRunningWaterRecordService.pageFrozenList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "APP司机账户流水明细", notes = "<br>By:胡宇帆")
+    @GetMapping("/runningWaterList")
+    @UnitCovert(param = false)
+    public Result<PageData<APPNetworkDriverRunningWaterRecordVO>> runningWaterList(@RequestBody NetworkDriverPageParam param) {
+        IPage<APPNetworkDriverRunningWaterRecordVO> page = networkDriverRunningWaterRecordService.runningWaterList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/impl/settle/NetworkDriverRunningWaterRecordDaoImpl.java

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.settle.NetworkDriverRunningWaterRecordDao;
 import com.clx.performance.mapper.settle.NetworkDriverRunningWaterRecordMapper;
 import com.clx.performance.model.settle.NetworkDriverRunningWaterRecord;
+import com.clx.performance.param.app.NetworkDriverPageParam;
 import com.clx.performance.param.pc.PageNetworkAccountInfoListParam;
+import com.clx.performance.vo.app.APPNetworkDriverRunningWaterRecordVO;
 import com.clx.performance.vo.pc.NetworkDriverRunningWaterRecordVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
@@ -25,4 +27,16 @@ public class NetworkDriverRunningWaterRecordDaoImpl extends BaseDaoImpl<NetworkD
         Page<NetworkDriverRunningWaterRecordVO> page = Page.of(param.getPage(), param.getPageSize());
         return baseMapper.networkDriverRunningWaterRecordDao(page, param);
     }
+
+    @Override
+    public IPage<APPNetworkDriverRunningWaterRecordVO> pageFrozenList(NetworkDriverPageParam param) {
+        Page<APPNetworkDriverRunningWaterRecordVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageFrozenList(page, param);
+    }
+
+    @Override
+    public IPage<APPNetworkDriverRunningWaterRecordVO> runningWaterList(NetworkDriverPageParam param) {
+        Page<APPNetworkDriverRunningWaterRecordVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.runningWaterList(page, param);
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/settle/NetworkDriverRunningWaterRecordDao.java

@@ -4,7 +4,9 @@ package com.clx.performance.dao.settle;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.settle.NetworkDriverRunningWaterRecordMapper;
 import com.clx.performance.model.settle.NetworkDriverRunningWaterRecord;
+import com.clx.performance.param.app.NetworkDriverPageParam;
 import com.clx.performance.param.pc.PageNetworkAccountInfoListParam;
+import com.clx.performance.vo.app.APPNetworkDriverRunningWaterRecordVO;
 import com.clx.performance.vo.pc.NetworkDriverRunningWaterRecordVO;
 import com.msl.common.dao.BaseDao;
 
@@ -16,4 +18,8 @@ import com.msl.common.dao.BaseDao;
 public interface NetworkDriverRunningWaterRecordDao extends BaseDao<NetworkDriverRunningWaterRecordMapper, NetworkDriverRunningWaterRecord, Integer> {
 
     IPage<NetworkDriverRunningWaterRecordVO> networkDriverRunningWaterRecordDao(PageNetworkAccountInfoListParam param);
+
+    IPage<APPNetworkDriverRunningWaterRecordVO> pageFrozenList(NetworkDriverPageParam param);
+
+    IPage<APPNetworkDriverRunningWaterRecordVO> runningWaterList(NetworkDriverPageParam param);
 }

performance-web/src/main/java/com/clx/performance/mapper/settle/NetworkDriverRunningWaterRecordMapper.java

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.settle.NetworkDriverRunningWaterRecord;
+import com.clx.performance.param.app.NetworkDriverPageParam;
 import com.clx.performance.param.pc.PageNetworkAccountInfoListParam;
 import com.clx.performance.sqlProvider.settle.NetworkDriverRunningWaterRecordProvider;
+import com.clx.performance.vo.app.APPNetworkDriverRunningWaterRecordVO;
 import com.clx.performance.vo.pc.NetworkDriverRunningWaterRecordVO;
 import org.apache.ibatis.annotations.SelectProvider;
 
@@ -18,4 +20,10 @@ public interface NetworkDriverRunningWaterRecordMapper extends BaseMapper<Networ
 
     @SelectProvider(type = NetworkDriverRunningWaterRecordProvider.class, method = "networkDriverRunningWaterRecordDao")
     IPage<NetworkDriverRunningWaterRecordVO> networkDriverRunningWaterRecordDao(Page<NetworkDriverRunningWaterRecordVO> page, PageNetworkAccountInfoListParam param);
+
+    @SelectProvider(type = NetworkDriverRunningWaterRecordProvider.class, method = "pageFrozenList")
+    IPage<APPNetworkDriverRunningWaterRecordVO> pageFrozenList(Page<APPNetworkDriverRunningWaterRecordVO> page, NetworkDriverPageParam param);
+
+    @SelectProvider(type = NetworkDriverRunningWaterRecordProvider.class, method = "runningWaterList")
+    IPage<APPNetworkDriverRunningWaterRecordVO> runningWaterList(Page<APPNetworkDriverRunningWaterRecordVO> page, NetworkDriverPageParam param);
 }

performance-web/src/main/java/com/clx/performance/model/settle/NetworkDriverRunningWaterRecord.java

@@ -50,10 +50,23 @@ public class NetworkDriverRunningWaterRecord implements HasKey<Integer> {
     @ApiModelProperty("流水类型 10：运单结算 20：提现冻结 30：提现成功")
     private Integer runningWaterType;
 
+    @TableField("running_water_type_msg")
+    @ApiModelProperty("流水类型简介")
+    private String runningWaterTypeMsg;
+
+    @TableField("frozen_flag")
+    @ApiModelProperty("冻结标记：如果是1代表当前冻结流水已经提现成功")
+    private Integer frozenFlag;
+
+
     @TableField("fund_type")
     @ApiModelProperty("资金类型 10：收入 20：冻结 30：支出")
     private Integer fundType;
 
+    @TableField("fund_type_msg")
+    @ApiModelProperty("资金类型简介")
+    private String fundTypeMsg;
+
     @TableField("relation_id")
     @ApiModelProperty("")
     private Long relationId;

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

@@ -7,9 +7,12 @@ import com.clx.performance.dao.settle.NetworkDriverRunningWaterRecordDao;
 import com.clx.performance.enums.NetworkDriverAccountEnum;
 import com.clx.performance.model.settle.NetworkDriverAccount;
 import com.clx.performance.model.settle.NetworkDriverRunningWaterRecord;
+import com.clx.performance.param.app.NetworkDriverPageParam;
 import com.clx.performance.param.pc.PageNetworkAccountInfoListParam;
 import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
+import com.clx.performance.vo.app.APPNetworkDriverRunningWaterRecordVO;
 import com.clx.performance.vo.pc.NetworkDriverRunningWaterRecordVO;
+import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
@@ -19,8 +22,10 @@ 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
@@ -63,9 +68,13 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                         .alterationBalance(money).accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
                         .fundType(NetworkDriverAccountEnum.FundType.INCOME.getCode())
+                        .fundTypeMsg(NetworkDriverAccountEnum.FundType.INCOME.getMsg())
                         .driverUserName(account.getDriverUserName())
                         .driverUserNo(account.getDriverUserNo())
                         .runningWaterNo(idGenerateSnowFlake.nextId(2L))
+                        .runningWaterTypeMsg(NetworkDriverAccountEnum.RunningWaterStatus.SETTLEMENT.getMsg())
+                        .runningWaterType(NetworkDriverAccountEnum.RunningWaterStatus.SETTLEMENT.getCode())
+
                         .build();
 
                 networkDriverRunningWaterRecordDao.saveEntity(entity);
@@ -92,9 +101,13 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                         .alterationBalance(money).accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
                         .fundType(NetworkDriverAccountEnum.FundType.FROZEN.getCode())
+                        .fundTypeMsg(NetworkDriverAccountEnum.FundType.FROZEN.getMsg())
                         .driverUserName(account.getDriverUserName())
                         .driverUserNo(account.getDriverUserNo())
                         .runningWaterNo(idGenerateSnowFlake.nextId(3L))
+                        .runningWaterTypeMsg(NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_FROZEN.getMsg())
+                        .runningWaterType(NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_FROZEN.getCode())
+
                         .build();
 
                 networkDriverRunningWaterRecordDao.saveEntity(entity);
@@ -120,9 +133,13 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                         .alterationBalance(money).accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
                         .fundType(NetworkDriverAccountEnum.FundType.EXPENDITURE.getCode())
+                        .fundTypeMsg(NetworkDriverAccountEnum.FundType.EXPENDITURE.getMsg())
                         .driverUserName(account.getDriverUserName())
                         .driverUserNo(account.getDriverUserNo())
                         .runningWaterNo(idGenerateSnowFlake.nextId(3L))
+                        .runningWaterTypeMsg(NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_SUCCESS.getMsg())
+                        .runningWaterType(NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_SUCCESS.getCode())
+
                         .build();
 
                 networkDriverRunningWaterRecordDao.saveEntity(entity);
@@ -136,6 +153,20 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
         strategyMap.get(runningWaterType).accept(networkDriverAccount, money);
     }
 
+    @Override
+    public IPage<APPNetworkDriverRunningWaterRecordVO> pageFrozenList(NetworkDriverPageParam param) {
+        Long userNo = TokenUtil.getLoginUserInfo().getUserNo();
+        param.setUserNo(userNo);
+        return networkDriverRunningWaterRecordDao.pageFrozenList(param);
+    }
+
+    @Override
+    public IPage<APPNetworkDriverRunningWaterRecordVO> runningWaterList(NetworkDriverPageParam param) {
+        Long userNo = TokenUtil.getLoginUserInfo().getUserNo();
+        param.setUserNo(userNo);
+        return networkDriverRunningWaterRecordDao.runningWaterList(param);
+    }
+
     @Override
     public void afterPropertiesSet() throws Exception {
         strategyMap.put(NetworkDriverAccountEnum.RunningWaterStatus.SETTLEMENT.getCode(), this::generateSettlementRunningWaterRecord);

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

@@ -2,7 +2,9 @@ package com.clx.performance.service.settle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.settle.NetworkDriverAccount;
+import com.clx.performance.param.app.NetworkDriverPageParam;
 import com.clx.performance.param.pc.PageNetworkAccountInfoListParam;
+import com.clx.performance.vo.app.APPNetworkDriverRunningWaterRecordVO;
 import com.clx.performance.vo.pc.NetworkDriverRunningWaterRecordVO;
 
 import java.math.BigDecimal;
@@ -24,4 +26,7 @@ public interface NetworkDriverRunningWaterRecordService {
 
     void generateNetworkDriverRunningWaterRecord(NetworkDriverAccount networkDriverAccount, BigDecimal money, Integer runningWaterType);
 
+    IPage<APPNetworkDriverRunningWaterRecordVO> pageFrozenList(NetworkDriverPageParam param);
+
+    IPage<APPNetworkDriverRunningWaterRecordVO> runningWaterList(NetworkDriverPageParam param);
 }

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

 package com.clx.performance.sqlProvider.settle;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.clx.performance.enums.NetworkDriverAccountEnum;
+import com.clx.performance.param.app.NetworkDriverPageParam;
 import com.clx.performance.param.pc.PageNetworkAccountInfoListParam;
 import com.clx.performance.param.pc.PageNetworkAccountListParam;
 import org.apache.commons.lang3.StringUtils;
@@ -31,4 +33,38 @@ public class NetworkDriverRunningWaterRecordProvider {
         return sql;
     }
 
+    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.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");
+
+            WHERE("a.driver_user_no = #{param.userNo}");
+            WHERE("a.running_water_type = " + NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_FROZEN.getCode());
+            WHERE("a.frozen_flag != 1");
+
+            ORDER_BY("a.create_time desc");
+        }}.toString();
+        return sql;
+    }
+
+    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.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");
+            if (ObjectUtil.isNotNull(param.getUserNo())) {
+                WHERE("a.driver_user_no = #{param.userNo}");
+            }
+            if (ObjectUtil.isNotNull(param.getFundType())) {
+                WHERE("a.fund_type = #{param.FundType}");
+            }
+            ORDER_BY("a.create_time desc");
+        }}.toString();
+        return sql;
+    }
 }