1.提现审核 添加审核人 审核时间

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

@@ -6,7 +6,6 @@ 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;
@@ -18,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 
 @Api(tags = "提现审核")
-    @RequestMapping("/sysAmountAuditing")
+@RequestMapping("/sysAmountAuditing")
 @RestController
 public class SysAmountAuditingController extends BaseController {
     @Autowired
@@ -26,23 +25,21 @@ public class SysAmountAuditingController extends BaseController {
 
     @PostMapping("/queryPage")
     @ApiOperation(value = "提现审核分页")
-    public HttpResult<BasePageResult<SysAmountAuditingEntity>> queryPageOrder(@RequestBody @Valid SysAmountAuditingVo sysAmountAuditingVo ) {
+    public HttpResult<BasePageResult<SysAmountAuditingEntity>> queryPageOrder(@RequestBody @Valid SysAmountAuditingVo sysAmountAuditingVo) {
         BasePageResult<SysAmountAuditingEntity> result = sysAmountAuditingService.queryByVo(sysAmountAuditingVo);
         return HttpResult.ok("success", result);
     }
 
-
-
-
     @PutMapping("AmountReview")
     @ApiOperation("审核提现")
     public HttpResult<Object> AmountReview(@RequestBody SysAmountAuditingVo sysUserAccountVo) {
         sysAmountAuditingService.AmountReview(sysUserAccountVo);
         return HttpResult.ok("审核成功");
     }
+
     @PostMapping("/queryAppPage")
     @ApiOperation(value = "提现审核分页")
-    public HttpResult<BasePageResult<SysAmountAuditingEntity>> queryAppPage(@RequestBody @Valid SysAmountAuditingVo sysAmountAuditingVo ) {
+    public HttpResult<BasePageResult<SysAmountAuditingEntity>> queryAppPage(@RequestBody @Valid SysAmountAuditingVo sysAmountAuditingVo) {
         BasePageResult<SysAmountAuditingEntity> result = sysAmountAuditingService.queryAppPage(sysAmountAuditingVo);
         return HttpResult.ok("success", result);
     }

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

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
-public interface SysAmountAuditingMapper  extends BaseMapper<SysAmountAuditingEntity> {
+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

@@ -9,7 +9,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
-@TableName(value ="sys_amount_auditing")
+@TableName(value = "sys_amount_auditing")
 @Data
 public class SysAmountAuditingEntity implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -67,51 +67,51 @@ public class SysAmountAuditingEntity implements Serializable {
 
 
     /**
-     *   用户当前金额
+     * 用户当前金额
      */
     @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
+     * 部门id
      */
     @TableField(exist = false)
     private String deptId;
 
     /**
-     *   部门名称
+     * 部门名称
      */
     @TableField(exist = false)
     private String deptName;
 
     /**
-     *   开户行
+     * 开户行
      */
     @TableField(exist = false)
     private String bankAccount;
 
     /**
-     *   审核人名称
+     * 审核人名称
      */
     @TableField(exist = false)
     private String auditingUserName;

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

@@ -53,12 +53,10 @@ public class SysAmountAuditingVo {
     private BigDecimal surplusAmount;
 
 
-
     @ApiModelProperty(value = "用户名称")
     private String userName;
 
 
-
     @ApiModelProperty(value = "部门id")
     private String deptId;
 
@@ -96,6 +94,4 @@ public class SysAmountAuditingVo {
     private String auditingUserName;
 
 
-
-
 }

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

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Service
 public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingMapper, SysAmountAuditingEntity> implements SysAmountAuditingService {
@@ -58,6 +59,8 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
                 sysUserAccountService.updateById(sysUserAccountEntity);
             }
             sysAmountAuditingVo.setAuditingStatus("3");
+            sysAmountAuditingVo.setAuditingUserId(BaseController.getUser().getId());
+            sysAmountAuditingVo.setAuditingTime(new Date());
             BeanUtils.copyProperties(sysAmountAuditingVo, sysAmountAuditingEntity);
             baseMapper.updateById(sysAmountAuditingEntity);
         }
@@ -67,7 +70,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
 
     @Override
     public SysAmountAuditingEntity getByUserId(String userId) {
-        return  baseMapper.getByUserId(userId);
+        return baseMapper.getByUserId(userId);
     }
 
     @Override

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

@@ -57,28 +57,29 @@
         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
-        left join sys_user su2  on  su2.id = a.auditing_user_id
+        left join sys_user su2 on su2.id = a.auditing_user_id
         <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}
+                and a.amount_status=#{sysAmountAuditingVo.amountStatus}
             </if>
 
             <if test="sysAmountAuditingVo.id !=null  and sysAmountAuditingVo.id != ''">
-              and    a.id=#{sysAmountAuditingVo.id}
+                and a.id=#{sysAmountAuditingVo.id}
             </if>
 
 
             <if test="sysAmountAuditingVo.userId !=null  and sysAmountAuditingVo.userId != ''">
-              and    a.user_id=#{sysAmountAuditingVo.userId}
+                and a.user_id=#{sysAmountAuditingVo.userId}
             </if>
 
             <if test="sysAmountAuditingVo.startTime !=null and sysAmountAuditingVo.startTime != ''  and  sysAmountAuditingVo.endTime !=null  and sysAmountAuditingVo.endTime!= '' ">
                 and a.create_time BETWEEN #{sysAmountAuditingVo.startTime} AND #{sysAmountAuditingVo.endTime}
             </if>
         </where>
+            order by  a.create_time
 
     </select>