删除多余绑卡接口 修改提现逻辑

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

@@ -33,14 +33,6 @@ public class SysUserBankController extends BaseController {
         return HttpResult.ok("success", result);
     }
 
-    @PostMapping("/insert")
-    @ApiOperation("提交")
-    public HttpResult<Object> submit(@RequestBody SysUserBankCardVO sysUserBankCardVO) {
-        boolean b = bankCardService.inert(sysUserBankCardVO);
-        AssertionUtils.isSucceed(b, "新增失败");
-        return HttpResult.ok("新增成功");
-    }
-
     @PostMapping("/unbind")
     @ApiOperation("解绑银行卡")
     public HttpResult<Object> unbind(@RequestBody SysUserBankCard sysUserBankCard) {

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

@@ -20,7 +20,7 @@ public interface SysUserBankCardMapper extends BaseMapper<SysUserBankCard> {
 
     HttpResult<SysUserBankCardVO> getByUserId(String userId);
 
-    SysUserBankCard getByBankNumber(@Param("fromBankCardId") String bankNumber);
+    SysUserBankCard getByBankNumber(@Param("fromBankCardId") String bankNumber,@Param("userId") String userId);
 
     List<SysUserBankCard> getUserBankList(@Param("sysUserBankCard") SysUserBankCard sysUserBankCard);
 

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

@@ -20,7 +20,6 @@ public interface SysUserBankCardService extends IService<SysUserBankCard> {
 
     BasePageResult<SysUserBankCard> queryByVo(SysUserBankCardVO sysUserBankCardVO);
 
-    boolean inert(SysUserBankCardVO sysUserBankCardVO);
 
     void deleteSysUserBank(Long id);
 

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

@@ -70,45 +70,6 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
                 insOrdersPage.getRecords());
     }
 
-    @Override
-    @Transactional
-    public boolean inert(SysUserBankCardVO sysUserBankCardVO) {
-        SysUserBankCard findSysUserBankCard = sysUserBankCardService.getOne(new LambdaQueryWrapper<SysUserBankCard>()
-                .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 {
-            SysUserBankCard sysUserBankCard = new SysUserBankCard();
-            BeanUtils.copyProperties(sysUserBankCardVO, sysUserBankCard);
-            sysUserBankCard.setBankNumber(sysUserBankCardVO.getBankNumber().replaceAll("\\s+", ""));
-            sysUserBankCard.setDelFlag("0");
-            sysUserBankCard.setCreateTime(new Date());
-            sysUserBankCard.setAuditStatus("0");
-            sysUserBankCard.setAuditUserName(null);
-            sysUserBankCard.setAuditUserId(null);
-            sysUserBankCard.setAuditTime(null);
-            SysUserBankCardHistory sysUserBankCardHistory = new SysUserBankCardHistory();
-            sysUserBankCardHistory.setBankNumber(sysUserBankCardVO.getBankNumber());
-            sysUserBankCardHistory.setType("add");
-            sysUserBankCardHistory.setCreateTime(new Date());
-            sysUserBankCardHistory.setCreator(BaseController.getUser().getId());
-            sysUserBankCardService.save(sysUserBankCard);
-            return sysUserBankCardHistoryService.save(sysUserBankCardHistory);
-        }
-    }
 
     @Override
     public void deleteSysUserBank(Long id) {
@@ -169,7 +130,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
 
     @Override
     public SysUserBankCard getByBankNumber(String bankNumber, String userId) {
-        return baseMapper.getByBankNumber(bankNumber);
+        return baseMapper.getByBankNumber(bankNumber, userId);
     }
 
     @Override
@@ -184,7 +145,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
             findSysUserBankCard.setAuditUserId(null);
             findSysUserBankCard.setAuditUserName(null);
             findSysUserBankCard.setAuditTime(null);
-            findSysUserBankCard.setRemark(null);
+            findSysUserBankCard.setRemark("");
             sysUserBankCardService.updateById(findSysUserBankCard);
             SysUserBankCardHistory sysUserBankCardHistory = new SysUserBankCardHistory();
             sysUserBankCardHistory.setBankNumber(sysUserBankCardVO.getBankNumber());
@@ -198,8 +159,8 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
                 sysUserBankCardVO.setUserId(id);
             }
             SysUserBankCard sysUserBankCard = new SysUserBankCard();
-            sysUserBankCard.setDelFlag("0");
             BeanUtils.copyProperties(sysUserBankCardVO, sysUserBankCard);
+            sysUserBankCard.setDelFlag("0");
             sysUserBankCard.setCreateTime(new Date());
             sysUserBankCard.setAuditStatus("0"); //待审核
             sysUserBankCard.setBankNumber(sysUserBankCardVO.getBankNumber().replaceAll("\\s+", ""));

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

@@ -42,9 +42,13 @@
         from sys_user_bank_card a
         <where>
             a.audit_status ='1'
+            and a.del_flag ='0'
             <if test="fromBankCardId !=null and  fromBankCardId !=''">
                 and a.bank_number =#{fromBankCardId}
             </if>
+            <if test="userId !=null and  userId !=''">
+                and a.user_id =#{userId}
+            </if>
         </where>
     </select>