1.提现审核分页

src/main/java/com/ydtech/modules/admin/controller/SysAmountAuditingController.java

@@ -2,25 +2,37 @@ package com.ydtech.modules.admin.controller;
 
 
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.po.SysAmountAuditingEntity;
+import com.ydtech.modules.admin.model.po.SysUserBankCard;
 import com.ydtech.modules.admin.model.vo.SysAmountAuditingVo;
 import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
+import com.ydtech.modules.admin.model.vo.SysUserBankCardVO;
 import com.ydtech.modules.admin.service.SysAmountAuditingService;
 import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.order.entity.BasePageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-@Api(tags = "账户余额")
-@RequestMapping("/sysAmountAuditing")
+import javax.validation.Valid;
+
+@Api(tags = "提现审核")
+    @RequestMapping("/sysAmountAuditing")
 @RestController
 public class SysAmountAuditingController extends BaseController {
     @Autowired
     private SysAmountAuditingService sysAmountAuditingService;
 
+//SysAmountAuditingEntity
+    @PostMapping("/queryPage")
+    @ApiOperation(value = "提现审核分页")
+    public HttpResult<BasePageResult<SysAmountAuditingEntity>> queryPageOrder(@RequestBody @Valid SysAmountAuditingVo sysAmountAuditingVo ) {
+        BasePageResult<SysAmountAuditingEntity> result = sysAmountAuditingService.queryByVo(sysAmountAuditingVo);
+        return HttpResult.ok("success", result);
+    }
+
+
 
 
     @PutMapping("AmountReview")
@@ -29,4 +41,5 @@ public class SysAmountAuditingController extends BaseController {
         sysAmountAuditingService.AmountReview(sysUserAccountVo);
         return HttpResult.ok("审核成功");
     }
+
 }

src/main/java/com/ydtech/modules/admin/dao/SysAmountAuditingMapper.java

@@ -1,11 +1,16 @@
 package com.ydtech.modules.admin.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.admin.model.po.SysAmountAuditingEntity;
+import com.ydtech.modules.admin.model.vo.SysAmountAuditingVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface SysAmountAuditingMapper  extends BaseMapper<SysAmountAuditingEntity> {
     SysAmountAuditingEntity getByUserId(String userId);
 
+    Page<SysAmountAuditingEntity> queryPageOrder(@Param("sysAmountAuditingVo") SysAmountAuditingVo sysAmountAuditingVo, Page<SysAmountAuditingEntity> page);
+
 }

src/main/java/com/ydtech/modules/admin/model/po/SysAmountAuditingEntity.java

@@ -18,7 +18,7 @@ public class SysAmountAuditingEntity implements Serializable {
      * id
      */
     @TableId(value = "id")
-    private Integer id;
+    private Long id;
     /**
      * 用户id
      */
@@ -52,4 +52,49 @@ public class SysAmountAuditingEntity implements Serializable {
      */
     @TableField(value = "amount_status")
     private String amountStatus;
+
+
+    /**
+     *   用户当前金额
+     */
+    @TableField(exist = false)
+    private BigDecimal userAmount;
+
+    /**
+     *   提现金额
+     */
+    @TableField(exist = false)
+    private BigDecimal historyAmount;
+
+    /**
+     *   剩余金额
+     */
+    @TableField(exist = false)
+    private BigDecimal surplusAmount;
+
+
+    /**
+     *   用户名称
+     */
+    @TableField(exist = false)
+    private String userName;
+
+
+    /**
+     *   部门id
+     */
+    @TableField(exist = false)
+    private String deptId;
+
+    /**
+     *   部门名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+
+    /**
+     *   开户行
+     */
+    @TableField(exist = false)
+    private String bankAccount;
 }

src/main/java/com/ydtech/modules/admin/model/po/SysUserAccountHistory.java

@@ -21,6 +21,11 @@ public class SysUserAccountHistory implements Serializable {
      */
     @TableId(value = "id")
     private Long id;
+    /**
+     *   用户提现审核id
+     */
+    @TableField(value = "auditiing_id")
+    private Long auditiingId;
 
     /**
      * 金额
@@ -33,6 +38,11 @@ public class SysUserAccountHistory implements Serializable {
      */
     @TableField(value = "surplus_amount")
     private BigDecimal surplusAmount;
+    /**
+     * 用户剩余金额
+     */
+    @TableField(value = "user_amount")
+    private BigDecimal userAmount;
 
     /**
      * 提现 / 收入 1 提现 2 收入

src/main/java/com/ydtech/modules/admin/model/vo/SysAmountAuditingVo.java

@@ -40,6 +40,32 @@ public class SysAmountAuditingVo {
     @ApiModelProperty(value = "金额类型")
     private String amountStatus;
 
+    @ApiModelProperty(value = "用户当前金额")
+    private BigDecimal userAmount;
+
+    @ApiModelProperty(value = "提现金额")
+    private BigDecimal historyAmount;
+
+
+    @ApiModelProperty(value = "剩余金额")
+    private BigDecimal surplusAmount;
+
+
+
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+
+
+
+    @ApiModelProperty(value = "部门id")
+    private String deptId;
+
+    @ApiModelProperty(value = "部门名称")
+    private String deptName;
+
+    @ApiModelProperty(value = "开户行")
+    private String bankAccount;
+
     @ApiModelProperty(value = "每页页数")
     @Min(value = 20, message = "页数最小为20")
     @Max(value = 100, message = "页数最大为100")

src/main/java/com/ydtech/modules/admin/service/SysAmountAuditingService.java

@@ -3,9 +3,13 @@ package com.ydtech.modules.admin.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.admin.model.po.SysAmountAuditingEntity;
 import com.ydtech.modules.admin.model.vo.SysAmountAuditingVo;
+import com.ydtech.modules.order.entity.BasePageResult;
 
 public interface SysAmountAuditingService extends IService<SysAmountAuditingEntity> {
     void AmountReview(SysAmountAuditingVo sysUserAccountVo);
 
     SysAmountAuditingEntity getByUserId(String userId);
+
+    BasePageResult<SysAmountAuditingEntity> queryByVo(SysAmountAuditingVo sysAmountAuditingVo);
+
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysAmountAuditingServiceImpl.java

@@ -1,5 +1,7 @@
 package com.ydtech.modules.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.modules.admin.dao.SysAmountAuditingMapper;
 import com.ydtech.modules.admin.model.po.SysAmountAuditingEntity;
@@ -7,6 +9,7 @@ import com.ydtech.modules.admin.model.po.SysUserAccount;
 import com.ydtech.modules.admin.model.vo.SysAmountAuditingVo;
 import com.ydtech.modules.admin.service.SysAmountAuditingService;
 import com.ydtech.modules.admin.service.SysUserAccountService;
+import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.utils.StringUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
@@ -65,4 +68,14 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     public SysAmountAuditingEntity getByUserId(String userId) {
         return  baseMapper.getByUserId(userId);
     }
+
+    @Override
+    public BasePageResult<SysAmountAuditingEntity> queryByVo(SysAmountAuditingVo sysAmountAuditingVo) {
+        Page<SysAmountAuditingEntity> page = new Page<>(sysAmountAuditingVo.getPageNum(), sysAmountAuditingVo.getPageSize());
+        QueryWrapper<SysAmountAuditingEntity> wrapper = new QueryWrapper<>();
+
+        Page<SysAmountAuditingEntity> sysUserAccountHistoryPage = baseMapper.queryPageOrder(sysAmountAuditingVo, page);
+        return new BasePageResult<>(sysAmountAuditingVo.getPageNum(), page.getSize(), sysUserAccountHistoryPage.getTotal(), page.getPages(),
+                sysUserAccountHistoryPage.getRecords());
+    }
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -141,7 +141,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         BigDecimal afterAmount;
 //       用户当前金额
         BigDecimal amount = sysUserAccountVo.getAmount();
-//       扣减后金额更改
         SysUserAccountHistory sysUserAccountHistory = new SysUserAccountHistory();  // 记录
         sysUserAccountHistory.setDocumentary(1);  // 1提现
         sysUserAccountHistory.setUserId(userId);
@@ -170,6 +169,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         if (StringUtils.isNotEmpty(userId)) {
             SysUserAccount sysUserAccount = baseMapper.getById(userId);
 
+
             if (StringUtils.isNotEmpty(sysUserAccountVo.getAmountStatus())) {
                 sysUserAccountHistory.setProperty(Integer.valueOf(sysUserAccountVo.getAmountStatus()));   //金额类型
 
@@ -191,12 +191,15 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 }
                 sysUserAccountHistory.setAmount(amount);  // 金额
                 sysUserAccountHistory.setSurplusAmount(afterAmount); // 剩余金额
+                sysUserAccountHistory.setUserAmount(beforeAmount);   // 用户剩余金额
                 sysAmountAuditingEntity.setCreateTime(new Date());
                 sysAmountAuditingEntity.setAuditingStatus("2");   // 2  为待审核  3  审核通过
                 sysAmountAuditingEntity.setAmountStatus(sysUserAccountVo.getAmountStatus());
 //              新增金额记录
-                sysUserAccountHistoryService.updayteByUserAccount(sysUserAccountHistory);
                 sysAmountAuditingService.save(sysAmountAuditingEntity);
+                sysUserAccountHistory.setAuditiingId(sysAmountAuditingEntity.getId());
+
+                sysUserAccountHistoryService.updayteByUserAccount(sysUserAccountHistory);
             }
 
         }

src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml

@@ -15,20 +15,52 @@
     </resultMap>
 
 
-
     <select id="getByUserId" resultType="com.ydtech.modules.admin.model.po.SysAmountAuditingEntity">
         select
-            a. id as  "id",
-            a. bank_number as  "bankNumber",
-            a. amount as  "amount",
-            a. user_id as  "userId",
-            a. auditing_status as  "auditingStatus",
-            a. amount_status as  "amountStatus"
-        from  sys_amount_auditing  a
+        a. id as "id",
+        a. bank_number as "bankNumber",
+        a. amount as "amount",
+        a. user_id as "userId",
+        a. auditing_status as "auditingStatus",
+        a. amount_status as "amountStatus"
+        from sys_amount_auditing a
         <where>
-            a.auditing_status  ='2'
+            a.auditing_status ='2'
             <if test="userId !=null and  userId !=''">
-              and  a.user_id =#{userId}
+                and a.user_id =#{userId}
+            </if>
+        </where>
+
+    </select>
+
+    <select id="queryPageOrder" resultType="com.ydtech.modules.admin.model.po.SysAmountAuditingEntity">
+        select
+        a.id as "id",
+        a.bank_number as "bankNumber",
+        a.amount as "amount",
+        a.user_id as "userId",
+        a.create_time as "createTime",
+        a.auditing_status as "auditingStatus",
+        a.amount_status as "amountStatus",
+        b.user_amount as "userAmount",
+        b.amount as "historyAmount",
+        b.surplus_amount as "surplusAmount",
+        su.id as "userName",
+        su.dept_id as "deptId",
+        sd.name as "deptName",
+        bc.bank_account as "bankAccount"
+        from sys_amount_auditing a
+        left join sys_user_account_history b on a.id = b.auditiing_id
+        left join sys_user su on su.id =a.user_id
+        left join sys_dept sd on sd.id =su.dept_id
+        left join sys_user_bank_card bc on bc.bank_number =a.bank_number
+
+        <where>
+            <if test="sysAmountAuditingVo.auditingStatus !=null  and sysAmountAuditingVo.auditingStatus != ''">
+                a.auditing_status=#{sysAmountAuditingVo.auditingStatus}
+            </if>
+            <if test="sysAmountAuditingVo.amountStatus !=null  and sysAmountAuditingVo.amountStatus != ''">
+              and    a.amount_status=#{sysAmountAuditingVo.amountStatus}
             </if>
         </where>