账户余额查询返回可用银行卡 审核添加驳回原因

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

@@ -32,6 +32,14 @@ public class SysUserAccountController extends BaseController {
         return HttpResult.ok("success", result);
     }
 
+    @PostMapping("/queryPageList")
+    @ApiOperation(value = "用户账户表分页2")
+    public HttpResult<BasePageResult<SysUserAccount>> queryPageList(@RequestBody SysUserAccountVo sysUserAccountVo ) {
+        BasePageResult<SysUserAccount> result = sysUserAccountService.queryByVo1(sysUserAccountVo);
+        return HttpResult.ok("success", result);
+    }
+
+
     @PostMapping("/insert")
     @ApiOperation("提交")
     public HttpResult<Object> submit(@RequestBody SysUserAccountVo sysUserAccountVo) {
@@ -40,7 +48,7 @@ public class SysUserAccountController extends BaseController {
 
     @PostMapping("/withdraw")
     @ApiOperation("提现")
-    public HttpResult<Object> withdraw(@RequestBody SysUserAccountVo sysUserAccountVo) {
+    public HttpResult withdraw(@RequestBody SysUserAccountVo sysUserAccountVo) {
         return sysUserAccountService.withdraw(sysUserAccountVo);
     }
 

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

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

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

@@ -109,13 +109,8 @@ public class SysUserAccount implements Serializable {
     private  String  documentaryStatus;
     @TableField(exist = false)
     private String  suborderId;
-
-    @TableField(exist = false)
     private  String  deptName;
-    @TableField(exist = false)
     private  String  name;
-
-    @TableField(exist = false)
     private  String  deptId;
 
     @ApiModelProperty(value = "所属账户下的卡")

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

@@ -66,6 +66,12 @@ public class SysUserBankCard implements Serializable {
     @TableField(value = "create_time",fill = FieldFill.INSERT_UPDATE)
     private Date createTime;
 
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
     @TableField(value = "audit_status")
     private String auditStatus;
 

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

@@ -74,6 +74,9 @@ public class SysUserAccountVo {
     @ApiModelProperty(value = "部门id")
     private String  deptName;
 
+    @ApiModelProperty(value = "卡号")
+    private String bankNumber;
+
 
 
 

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

@@ -54,6 +54,8 @@ public class SysUserBankCardVO {
     @TableField(value = "audit_user_id")
     private String auditUserId;
 
+    @TableField(value = "remark")
+    private String remark;
     @ApiModelProperty(value = "每页页数")
     @Min(value = 20, message = "页数最小为20")
     @Max(value = 100, message = "页数最大为100")

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

@@ -18,6 +18,7 @@ public interface SysUserAccountService extends IService<SysUserAccount> {
 
     BasePageResult<SysUserAccount> queryByVo(SysUserAccountVo sysUserAccountVo);
 
+    BasePageResult<SysUserAccount> queryByVo1(SysUserAccountVo sysUserAccountVo);
 
     HttpResult<Object> inert(SysUserAccountVo sysUserAccountVo);
 

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

@@ -189,6 +189,14 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         return new BasePageResult<>(sysUserAccountVo.getPageNum(), page.getSize(), sysUserAccountHistoryPage.getTotal(), page.getPages(),
                 sysUserAccountHistoryPage.getRecords());
     }
+    //
+    @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());
+    }
 
     @Override
     @Transactional
@@ -296,7 +304,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         String fromBankCardId = sysUserAccountVo.getFromBankCardId();
         SysUserBankCard byId = sysUserBankCardService.getByBankNumber(fromBankCardId);
         if (byId == null) {
-            throw new SystemException("该卡未绑定此账号,或输入卡号错误，请检查");
+            throw new SystemException("该卡未绑定此账号,或输入卡号错误,或该账号尚未审核通过,请检查");
         }
         if (fromBankCardId != null && byId.getUserId().equals(userId)) {
             byId.setIsDefault(1);

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

@@ -124,6 +124,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
         sysUserBankCard.setAuditTime(new Date());
         sysUserBankCard.setAuditUserId(BaseController.getUser().getId());
         sysUserBankCard.setAuditUserName(BaseController.getUser().getName());
+        sysUserBankCard.setRemark(sysUserBankCardVO.getRemark());
         sysUserBankCardService.updateById(sysUserBankCard);
     }
 

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

@@ -10,6 +10,9 @@
             <result property="documentary" column="documentary" jdbcType="DECIMAL"/>
             <result property="promotion" column="promotion" jdbcType="DECIMAL"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="deptId" column="deptId" jdbcType="VARCHAR"/>
+            <result property="deptName" column="deptName" jdbcType="VARCHAR"/>
             <result property="handlingAmountWithdrawal" column="handling_amount_withdrawal" jdbcType="DECIMAL"/>
             <result property="handlingAmountAccount" column="handling_amount_account" jdbcType="DECIMAL"/>
             <result property="handlingAmountPayment" column="handling_amount_payment" jdbcType="DECIMAL"/>
@@ -19,7 +22,14 @@
             <result property="promotionAmountWithdrawal" column="promotion_amount_withdrawal" jdbcType="DECIMAL"/>
             <result property="promotionAmountAccount" column="promotion_amount_account" jdbcType="DECIMAL"/>
             <result property="promotionAmountPayment" column="promotion_amount_payment" jdbcType="DECIMAL"/>
+            <collection property="sysUserAccountCardList" ofType="com.ydtech.modules.admin.model.po.SysUserBankCard"
+                    resultMap="sysUserAccountCardList"/>
+    </resultMap>
 
+    <resultMap id="sysUserAccountCardList" type="com.ydtech.modules.admin.model.po.SysUserBankCard">
+        <result property="bankNumber" column="bank_number" jdbcType="VARCHAR"/>
+        <result property="bankAccount" column="bank_account" jdbcType="VARCHAR"/>
+        <result property="bankAddress" column="bank_address" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -83,9 +93,44 @@
         </where>
     </select>
 
-    <select id="selectPromotionBy" resultType="com.ydtech.modules.protocols.entity.po.InsFeeOrderNew">
-        select 
-
+    <select id="queryPageOrder1"  resultMap="BaseResultMap">
+        select
+        a.user_id,
+        a.handling_fee,
+        a.documentary,
+        a.promotion,
+        a.create_time,
+        a.handling_amount_withdrawal,
+        a.handling_amount_account,
+        a.handling_amount_payment,
+        a.documentary_amount_withdrawal,
+        a.documentary_amount_account,
+        a.documentary_amount_payment,
+        a.promotion_amount_withdrawal,
+        a.promotion_amount_account,
+        a.promotion_amount_payment,
+        b.dept_id  as  deptId,
+        b.name  as  name,
+        sd.name  as  deptName,
+        c.bank_number,
+        c.bank_account,
+        c.bank_address
+        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 and c.audit_status = '1'
+        <where>
+            <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},'%')
+            </if>
+            <if test="sysUserAccountVo.deptId != null and sysUserAccountVo.deptId != ''">
+                and c.bank_number = #{sysUserAccountVo.bankNumber}
+            </if>
+        </where>
     </select>
 
 

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

@@ -41,7 +41,7 @@
         a.*
         from sys_user_bank_card a
         <where>
-            1=1
+            a.audit_status ='1'
             <if test="fromBankCardId !=null and  fromBankCardId !=''">
                 and a.bank_number =#{fromBankCardId}
             </if>