货主流水相关接口

performance-api/src/main/java/com/clx/performance/enums/OwnerAccountEnum.java

@@ -86,7 +86,7 @@ public enum OwnerAccountEnum {
         THAW(30, "解冻"),
         CASE_OUT_FROZEN(40, "提现冻结"),
         CASE_OUT_SUCCESS(50, "提现成功"),
-        TAKE_OUT(60, "扣除"),
+        TAKE_OUT(60, "扣款"),
         CASE_OUT_FAIL(70, "提现失败"),
 
         ;

performance-api/src/main/java/com/clx/performance/param/pc/PageAppPrepaidFreightAccountParam.java

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author huyufan
+ * @create 2023-09-19 13:33
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageAppPrepaidFreightAccountParam extends PageParam {
+
+    @ApiModelProperty(value="货主编码",example = "20145787812312312")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value="1: 全部 2：收入 3：支出",example = "10")
+    private Integer queryWaterType;
+
+    @ApiModelProperty(value="操作开始时间",example = "2020-01-01 10:10:10")
+    private String beginTime;
+
+    @ApiModelProperty(value = "操作结束时间",example = "2020-01-01 10:10:10")
+    private String endTime;
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerAccountController.java

@@ -166,4 +166,12 @@ public class OwnerAccountController {
         ownerAccountService.createAccount(param);
         return Result.ok();
     }
+
+    @ApiOperation(value = "预付金账户详情流水列表", notes = "<br>By:胡宇帆")
+    @PostMapping("/prepaidFreightOwnerAccountPageList")
+    @UnitCovert(param = false)
+    public Result<PageData<OwnerAccountRunningWaterRecordVO>> prepaidFreightOwnerAccountPageList(@RequestBody PageAppPrepaidFreightAccountParam param) {
+        IPage<OwnerAccountRunningWaterRecordVO> page = ownerAccountService.prepaidFreightOwnerAccountPageList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/OwnerRunningWaterRecordDao.java

@@ -3,6 +3,7 @@ package com.clx.performance.dao;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.OwnerRunningWaterRecordMapper;
 import com.clx.performance.model.OwnerRunningWaterRecord;
+import com.clx.performance.param.pc.PageAppPrepaidFreightAccountParam;
 import com.clx.performance.param.pc.PageOwnerAccountRunningWaterParam;
 import com.clx.performance.param.pc.PagePlatformMarginAccountParam;
 import com.clx.performance.param.pc.PagePlatformPrepaidFreightAccountParam;
@@ -18,6 +19,9 @@ public interface OwnerRunningWaterRecordDao extends BaseDao<OwnerRunningWaterRec
 
     IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountPageList(PagePlatformPrepaidFreightAccountParam param);
 
+    IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightOwnerAccountPageList(PageAppPrepaidFreightAccountParam param);
+
+
     List<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountList(PagePlatformPrepaidFreightAccountParam param);
 
 

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

@@ -6,6 +6,7 @@ import com.clx.performance.dao.OwnerRunningWaterRecordDao;
 import com.clx.performance.enums.OwnerAccountEnum;
 import com.clx.performance.mapper.OwnerRunningWaterRecordMapper;
 import com.clx.performance.model.OwnerRunningWaterRecord;
+import com.clx.performance.param.pc.PageAppPrepaidFreightAccountParam;
 import com.clx.performance.param.pc.PageOwnerAccountRunningWaterParam;
 import com.clx.performance.param.pc.PagePlatformMarginAccountParam;
 import com.clx.performance.param.pc.PagePlatformPrepaidFreightAccountParam;
@@ -30,6 +31,12 @@ public class OwnerRunningWaterRecordDaoImpl extends BaseDaoImpl<OwnerRunningWate
         return baseMapper.prepaidFreightAccountPageList(page, param);
     }
 
+    @Override
+    public IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightOwnerAccountPageList(PageAppPrepaidFreightAccountParam param) {
+        Page<OwnerAccountRunningWaterRecordVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.prepaidFreightOwnerAccountPageList(page, param);
+    }
+
     @Override
     public List<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountList(PagePlatformPrepaidFreightAccountParam param) {
         return baseMapper.prepaidFreightAccountList(param);

performance-web/src/main/java/com/clx/performance/mapper/OwnerRunningWaterRecordMapper.java

@@ -4,6 +4,7 @@ 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.OwnerRunningWaterRecord;
+import com.clx.performance.param.pc.PageAppPrepaidFreightAccountParam;
 import com.clx.performance.param.pc.PageOwnerAccountRunningWaterParam;
 import com.clx.performance.param.pc.PagePlatformMarginAccountParam;
 import com.clx.performance.param.pc.PagePlatformPrepaidFreightAccountParam;
@@ -27,6 +28,10 @@ public interface OwnerRunningWaterRecordMapper extends BaseMapper<OwnerRunningWa
     @SelectProvider(type = OwnerRunningWaterRecordSqlProvider.class, method = "prepaidFreightAccountPageList")
     IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountPageList(Page<OwnerAccountRunningWaterRecordVO> page, PagePlatformPrepaidFreightAccountParam param);
 
+    @SelectProvider(type = OwnerRunningWaterRecordSqlProvider.class, method = "prepaidFreightOwnerAccountPageList")
+    IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightOwnerAccountPageList(Page<OwnerAccountRunningWaterRecordVO> page, PageAppPrepaidFreightAccountParam param);
+
+
     @SelectProvider(type = OwnerRunningWaterRecordSqlProvider.class, method = "ownerAccountRunningWaterPageList")
     IPage<OwnerAccountRunningWaterRecordVO> ownerAccountRunningWaterPageList(Page<OwnerAccountRunningWaterRecordVO> page, PageOwnerAccountRunningWaterParam param);
 

performance-web/src/main/java/com/clx/performance/service/OwnerAccountService.java

@@ -26,6 +26,9 @@ public interface OwnerAccountService {
 
     IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountPageList(PagePlatformPrepaidFreightAccountParam param);
 
+    IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightOwnerAccountPageList(PageAppPrepaidFreightAccountParam param);
+
+
     OwnerAccountAllVO accountInfo(Long ownerUserNo);
 
     Long accountTopUp(OwnerTopUpParam param);

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

@@ -85,6 +85,11 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         return ownerRunningWaterRecordDao.prepaidFreightAccountPageList(param);
     }
 
+    @Override
+    public IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightOwnerAccountPageList(PageAppPrepaidFreightAccountParam param) {
+        return ownerRunningWaterRecordDao.prepaidFreightOwnerAccountPageList(param);
+    }
+
     @Override
     public OwnerAccountAllVO accountInfo(Long ownerUserNo) {
         OwnerAccountAllVO result = new OwnerAccountAllVO();

performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerRunningWaterRecordSqlProvider.java

@@ -2,6 +2,7 @@ package com.clx.performance.sqlProvider;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.clx.performance.enums.OwnerAccountEnum;
+import com.clx.performance.param.pc.PageAppPrepaidFreightAccountParam;
 import com.clx.performance.param.pc.PageOwnerAccountRunningWaterParam;
 import com.clx.performance.param.pc.PagePlatformMarginAccountParam;
 import com.clx.performance.param.pc.PagePlatformPrepaidFreightAccountParam;
@@ -84,6 +85,37 @@ public class OwnerRunningWaterRecordSqlProvider {
         return sql;
     }
 
+    public String prepaidFreightOwnerAccountPageList(@Param("param") PageAppPrepaidFreightAccountParam param) {
+        String sql = new SQL() {{
+            SELECT("a.id, a.owner_user_no," +
+                    " a.owner_user_name,a.running_water_no, a.mobile, a.account_type, a.running_water_type,a.order_id,a.order_no,a.order_child_id,a.order_child_no,a.alteration_balance," +
+                    " a.account_balance,a.usable_balance,a.take_out_balance,a.frozen_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
+            FROM("owner_running_water_record a");
+            WHERE("a.account_type =" + OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
+            WHERE("a.owner_user_no = #{param.ownerUserNo}");
+
+            if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
+                WHERE("a.create_time >= #{param.beginTime} and a.create_time <= #{param.endTime}");
+            }
+            if (ObjectUtil.isNotNull(param.getQueryWaterType())) {
+                if (1 == param.getQueryWaterType()) {
+                    WHERE("a.running_water_type !=" + OwnerAccountEnum.RunningWaterStatus.CASE_OUT_FAIL.getCode());
+                }
+                if (2 == param.getQueryWaterType()) {
+                    WHERE("a.running_water_type =" + OwnerAccountEnum.RunningWaterStatus.TOP_UP.getCode());
+                }
+                if (param.getQueryWaterType() == 3) {
+                    WHERE("a.running_water_type in (" + OwnerAccountEnum.RunningWaterStatus.TAKE_OUT.getCode() +
+                            "," + OwnerAccountEnum.RunningWaterStatus.CASE_OUT_SUCCESS.getCode() + " )"
+                            );
+                }
+            }
+
+            ORDER_BY("a.create_time desc");
+        }}.toString();
+        return sql;
+    }
+
     public String prepaidFreightAccountList(@Param("param") PagePlatformPrepaidFreightAccountParam param) {
         String sql = new SQL() {{
             SELECT("a.id, a.owner_user_no," +