update

jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java

@@ -24,6 +24,7 @@ import com.jsowell.common.util.id.IdUtils;
 import com.jsowell.pile.domain.AdapayMemberAccount;
 import com.jsowell.pile.service.IAdapayMemberAccountService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -408,6 +409,14 @@ public class AdapayMemberService {
         if (StringUtils.equals((String) member.get("status"), "failed")) {
             throw new BusinessException("", (String) member.get("error_msg"));
         }
+
+        // 逻辑删除原来审核不通过的记录
+        List<AdapayMemberAccount> accountList = adapayMemberAccountService.selectAdapayMemberAccountList(dto.getMerchantId());
+        if (CollectionUtils.isNotEmpty(accountList)) {
+            Long[] ids = (Long[]) accountList.stream().map(AdapayMemberAccount::getId).toArray();
+            adapayMemberAccountService.deleteAdapayMemberAccountByIds(ids);
+        }
+
         // 保存到数据库
         AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount();
         adapayMemberAccount.setMerchantId(dto.getMerchantId());

jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java

@@ -27,6 +27,8 @@ public interface IAdapayMemberAccountService {
      */
     public List<AdapayMemberAccount> selectAdapayMemberAccountList(AdapayMemberAccount adapayMemberAccount);
 
+    public List<AdapayMemberAccount> selectAdapayMemberAccountList(String merchantId);
+
     /**
      * 新增【请填写功能名称】
      *

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jsowell.pile.service.impl;
 
+import com.google.common.collect.Lists;
 import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.util.DateUtils;
@@ -55,6 +56,16 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
         return adapayMemberAccountMapper.selectAdapayMemberAccountList(adapayMemberAccount);
     }
 
+    @Override
+    public List<AdapayMemberAccount> selectAdapayMemberAccountList(String merchantId) {
+        if (StringUtils.isBlank(merchantId)) {
+            return Lists.newArrayList();
+        }
+        AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount();
+        adapayMemberAccount.setMerchantId(merchantId);
+        return selectAdapayMemberAccountList(adapayMemberAccount);
+    }
+
     /**
      * 新增【请填写功能名称】
      *

jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml

@@ -103,12 +103,21 @@
         delete from adapay_member_account where id = #{id}
     </delete>
 
-    <delete id="deleteAdapayMemberAccountByIds" parameterType="String">
+    <!--<delete id="deleteAdapayMemberAccountByIds" parameterType="String">
         delete from adapay_member_account where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </delete>-->
+
+    <update id="deleteAdapayMemberAccountByIds" parameterType="com.jsowell.pile.domain.AdapayMemberAccount">
+        update adapay_member_account
+        set del_flag = '1'
+        where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 
     <select id="selectByMerchantId" resultMap="AdapayMemberAccountResult">
         select