Merge remote-tracking branch 'origin/test' into test

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

@@ -1,6 +1,7 @@
 package com.ydtech.modules.admin.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.dto.*;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
@@ -36,8 +37,8 @@ public class SysUserAccountController extends BaseController {
 
     @PostMapping("/queryPageList")
     @ApiOperation(value = "用户账户表分页2")
-    public HttpResult<BasePageResult<SysUserAccount>> queryPageList(@RequestBody SysUserAccountVo sysUserAccountVo ) {
-        BasePageResult<SysUserAccount> result = sysUserAccountService.queryByVo1(sysUserAccountVo);
+    public HttpResult<IPage<SysUserAccount>> queryPageList(@RequestBody SysUserAccountVo sysUserAccountVo ) {
+            IPage<SysUserAccount> result = sysUserAccountService.queryByVo1(sysUserAccountVo);
         return HttpResult.ok("success", result);
     }
 

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

@@ -20,7 +20,7 @@ public interface SysUserAccountMapper extends BaseMapper<SysUserAccount> {
 
     Page<SysUserAccount> queryPageOrder(SysUserAccountVo sysUserAccountVo,@Param("page") Page page);
 
-    Page<SysUserAccount> queryPageOrder1(SysUserAccountVo sysUserAccountVo,@Param("page") Page page);
+    List<SysUserAccount> queryPageOrder1(@Param("sysUserAccountVo") SysUserAccountVo sysUserAccountVo);
 
     SysUserAccount getById(String userId);
 

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

@@ -1,5 +1,6 @@
 package com.ydtech.modules.admin.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.dto.*;
@@ -21,7 +22,7 @@ public interface SysUserAccountService extends IService<SysUserAccount> {
 
     BasePageResult<SysUserAccount> queryByVo(SysUserAccountVo sysUserAccountVo);
 
-    BasePageResult<SysUserAccount> queryByVo1(SysUserAccountVo sysUserAccountVo);
+    IPage<SysUserAccount> queryByVo1(SysUserAccountVo sysUserAccountVo);
 
     HttpResult<Object> inert(SysUserAccountVo sysUserAccountVo);
 

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

@@ -1,9 +1,11 @@
 package com.ydtech.modules.admin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.core.page.PageRequest;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.constants.MoneyAttrConstants;
 import com.ydtech.modules.admin.constants.WithdrawTypeConstants;
@@ -37,6 +39,7 @@ import org.springframework.util.CollectionUtils;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author Administrator
@@ -228,11 +231,16 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     }
     //
     @Override
-    public BasePageResult<SysUserAccount> queryByVo1(SysUserAccountVo sysUserAccountVo) {
-        Page<SysUserAccount> page = new Page<>(sysUserAccountVo.getPageNum(), sysUserAccountVo.getPageSize());
-        Page<SysUserAccount> sysUserAccountHistoryPage = baseMapper.queryPageOrder1(sysUserAccountVo, page);
-        return new BasePageResult<>(sysUserAccountVo.getPageNum(), page.getSize(), sysUserAccountHistoryPage.getTotal(), page.getPages(),
-                sysUserAccountHistoryPage.getRecords());
+    public IPage<SysUserAccount> queryByVo1(SysUserAccountVo sysUserAccountVo) {
+        PageRequest pageRequest = new PageRequest();
+        pageRequest.setPageNum(sysUserAccountVo.getPageNum());
+        pageRequest.setPageSize(sysUserAccountVo.getPageSize());
+        List<SysUserAccount> sysUserAccountHistoryPage = baseMapper.queryPageOrder1(sysUserAccountVo);
+        IPage ipage = PageRequest.buildPageRequest(pageRequest);
+        ipage.setRecords(sysUserAccountHistoryPage.stream().skip((sysUserAccountVo.getPageNum() - 1) * sysUserAccountVo.getPageSize()).limit(sysUserAccountVo.getPageSize()).
+                collect(Collectors.toList()));
+        ipage.setTotal(sysUserAccountHistoryPage.size());
+        return ipage;
     }
 
     @Override

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

@@ -64,6 +64,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
         if (sysUserBankCardVO.getAuditStatus() != null) {
             wrapper.eq(SysUserBankCard::getAuditStatus, sysUserBankCardVO.getAuditStatus());
         }
+        wrapper.orderByAsc(SysUserBankCard::getAuditTime);
         Page<SysUserBankCard> insOrdersPage = page(page, wrapper);
         return new BasePageResult<>(sysUserBankCardVO.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
                 insOrdersPage.getRecords());
@@ -73,12 +74,23 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
     @Transactional
     public boolean inert(SysUserBankCardVO sysUserBankCardVO) {
         SysUserBankCard findSysUserBankCard = sysUserBankCardService.getOne(new LambdaQueryWrapper<SysUserBankCard>()
-                .eq(SysUserBankCard::getBankNumber, sysUserBankCardVO.getBankNumber()));
+                .eq(SysUserBankCard::getBankNumber, sysUserBankCardVO.getBankNumber())
+                .eq(SysUserBankCard::getUserId, sysUserBankCardVO.getUserId()));
         if (findSysUserBankCard != null) {
             findSysUserBankCard.setDelFlag("0");
             findSysUserBankCard.setAuditStatus("0");
+            findSysUserBankCard.setAuditUserId(null);
+            findSysUserBankCard.setAuditUserName(null);
+            findSysUserBankCard.setAuditTime(null);
+            findSysUserBankCard.setRemark("");
+            SysUserBankCardHistory sysUserBankCardHistory = new SysUserBankCardHistory();
+            sysUserBankCardHistory.setBankNumber(sysUserBankCardVO.getBankNumber());
+            sysUserBankCardHistory.setType("rebind");
+            sysUserBankCardHistory.setCreateTime(new Date());
+            sysUserBankCardHistory.setCreator(BaseController.getUser().getId());
+            sysUserBankCardHistoryService.save(sysUserBankCardHistory);
             return sysUserBankCardService.updateById(findSysUserBankCard);
-        }else {
+        } else {
             SysUserBankCard sysUserBankCard = new SysUserBankCard();
             BeanUtils.copyProperties(sysUserBankCardVO, sysUserBankCard);
             sysUserBankCard.setDelFlag("0");
@@ -92,6 +104,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
             sysUserBankCardHistory.setType("add");
             sysUserBankCardHistory.setCreateTime(new Date());
             sysUserBankCardHistory.setCreator(BaseController.getUser().getId());
+            sysUserBankCardService.save(sysUserBankCard);
             return sysUserBankCardHistoryService.save(sysUserBankCardHistory);
         }
     }
@@ -109,6 +122,11 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
             throw new SystemException("该卡审核还未通过,不可解绑");
         }
         sub.setDelFlag(sysUserBankCard.getDelFlag());
+        sub.setAuditStatus(sub.getAuditStatus());
+        sub.setAuditTime(null);
+        sub.setAuditUserName(null);
+        sub.setAuditUserId(null);
+
         sysUserBankCardService.updateById(sub);
         SysUserBankCardHistory sysUserBankCardHistory = new SysUserBankCardHistory();
         sysUserBankCardHistory.setBankNumber(sysUserBankCard.getBankNumber());
@@ -123,6 +141,10 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
         SysUserBankCard sub = sysUserBankCardService.getOne(new LambdaQueryWrapper<SysUserBankCard>()
                 .eq(SysUserBankCard::getBankNumber, sysUserBankCard.getBankNumber()));
         sub.setDelFlag(sysUserBankCard.getDelFlag());
+        sub.setAuditStatus("0");
+        sub.setAuditTime(null);
+        sub.setAuditUserId(null);
+        sub.setAuditUserName(null);
         sysUserBankCardService.updateById(sub);
         SysUserBankCardHistory sysUserBankCardHistory = new SysUserBankCardHistory();
         sysUserBankCardHistory.setBankNumber(sysUserBankCard.getBankNumber());
@@ -153,11 +175,22 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
     @Transactional
     public void insertByBankNumber(SysUserBankCardVO sysUserBankCardVO) {
         SysUserBankCard findSysUserBankCard = sysUserBankCardService.getOne(new LambdaQueryWrapper<SysUserBankCard>()
-                .eq(SysUserBankCard::getBankNumber, sysUserBankCardVO.getBankNumber()));
+                .eq(SysUserBankCard::getBankNumber, sysUserBankCardVO.getBankNumber())
+                .eq(SysUserBankCard::getUserId, BaseController.getUser().getId()));
         if (findSysUserBankCard != null) {
             findSysUserBankCard.setDelFlag("0");
             findSysUserBankCard.setAuditStatus("0");
+            findSysUserBankCard.setAuditUserId(null);
+            findSysUserBankCard.setAuditUserName(null);
+            findSysUserBankCard.setAuditTime(null);
+            findSysUserBankCard.setRemark(null);
             sysUserBankCardService.updateById(findSysUserBankCard);
+            SysUserBankCardHistory sysUserBankCardHistory = new SysUserBankCardHistory();
+            sysUserBankCardHistory.setBankNumber(sysUserBankCardVO.getBankNumber());
+            sysUserBankCardHistory.setType("rebind");
+            sysUserBankCardHistory.setCreateTime(new Date());
+            sysUserBankCardHistory.setCreator(BaseController.getUser().getId());
+            sysUserBankCardHistoryService.save(sysUserBankCardHistory);
         }else {
             String id = BaseController.getUser().getId();
             if (StringUtils.isNotEmpty(id)) {
@@ -170,6 +203,12 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
             sysUserBankCard.setAuditStatus("0"); //待审核
             sysUserBankCard.setUserName(BaseController.getUser().getName());
             baseMapper.insert(sysUserBankCard);
+            SysUserBankCardHistory sysUserBankCardHistory = new SysUserBankCardHistory();
+            sysUserBankCardHistory.setBankNumber(sysUserBankCardVO.getBankNumber());
+            sysUserBankCardHistory.setType("add");
+            sysUserBankCardHistory.setCreateTime(new Date());
+            sysUserBankCardHistory.setCreator(BaseController.getUser().getId());
+            sysUserBankCardHistoryService.save(sysUserBankCardHistory);
         }
     }
 

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

@@ -35,6 +35,7 @@
         <result property="bankNumber" column="bank_number" jdbcType="VARCHAR"/>
         <result property="bankAccount" column="bank_account" jdbcType="VARCHAR"/>
         <result property="bankAddress" column="bank_address" jdbcType="VARCHAR"/>
+        <result property="auditStatus" column="audit_status" jdbcType="VARCHAR"/>
         <result property="delFlag" column="del_flag" jdbcType="VARCHAR"/>
     </resultMap>
 
@@ -127,22 +128,23 @@
         c.bank_account,
         c.bank_address,
         c.del_flag,
+        c.audit_status,
         a.sum_amount,
         a.sum_amount_withdrawal,
         a.sum_amount_account,
         a.sum_amount_payment
         from
         sys_user_account a
-        left join   sys_user  b  on  a.user_id  = b.id
-        left join   sys_dept  sd  on  sd.id =b.dept_id
-        left join   sys_user_bank_card c on c.user_id = a.user_id
+        left join sys_user b on a.user_id = b.id
+        left join sys_dept sd on sd.id = b.dept_id
+        left join sys_user_bank_card c on c.user_id = a.user_id
         <where>
             1=1
             <if test="sysUserAccountVo.userId != null and sysUserAccountVo.userId != ''">
                 and a.user_id = #{sysUserAccountVo.userId}
             </if>
             <if test="sysUserAccountVo.deptId != null and sysUserAccountVo.deptId != ''">
-                and b.dept_id like concat(#{sysUserAccountVo.deptId},'%')
+                and b.dept_id like concat(#{sysUserAccountVo.deptId}, '%')
             </if>
             <if test="sysUserAccountVo.userName != null and sysUserAccountVo.userName != ''">
                 and b.name = #{sysUserAccountVo.userName}