update 优化汇付开户流程

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

@@ -22,6 +22,9 @@ import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.constant.Constants;
 import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.enums.DelFlagEnum;
+import com.jsowell.common.enums.adapay.AdapayAuditStateEnum;
+import com.jsowell.common.enums.adapay.AdapayOpenActionEnum;
+import com.jsowell.common.enums.adapay.AdapayOpenStatusEnum;
 import com.jsowell.common.enums.adapay.AdapayPayChannelEnum;
 import com.jsowell.common.enums.adapay.AdapayStatusEnum;
 import com.jsowell.common.enums.adapay.MerchantDelayModeEnum;
@@ -269,6 +272,7 @@ public class AdapayService {
      * 创建个人用户
      */
     public void createAdapayMember(CreatePersonalMemberDTO dto) throws BaseAdaPayException, BusinessException {
+        assertActionAllowed(dto.getMerchantId(), AdapayOpenActionEnum.CREATE_PERSONAL_MEMBER);
         SettleAccountDTO request = SettleAccountDTO.builder()
                 .merchantId(dto.getMerchantId())
                 .location(dto.getLocation())
@@ -284,6 +288,7 @@ public class AdapayService {
      * 创建企业用户
      */
     public void createCorpMember(CreateCorpMemberDTO dto) throws BaseAdaPayException, BusinessException {
+        assertActionAllowed(dto.getMerchantId(), AdapayOpenActionEnum.CREATE_CORP_MEMBER);
         SettleAccountDTO request = SettleAccountDTO.builder()
                 .merchantId(dto.getMerchantId())
                 .wechatAppId(pileMerchantInfoService.queryAppIdByMerchantId(dto.getMerchantId()))
@@ -310,6 +315,7 @@ public class AdapayService {
      * 创建结算账户
      */
     public void createSettleAccount(CreateSettleAccountDTO dto) throws BaseAdaPayException, BusinessException {
+        assertActionAllowed(dto.getMerchantId(), AdapayOpenActionEnum.CREATE_SETTLE_ACCOUNT);
         AdapayMemberAccount adapayMemberAccount = requireCurrentMemberAccount(dto.getMerchantId());
         if (CollectionUtils.isNotEmpty(selectSettleAccount(dto.getMerchantId()))) {
             throw new BusinessException("", "当前商户已存在结算账户");
@@ -813,18 +819,20 @@ public class AdapayService {
         // 创建企业用户参数
         Map<String, Object> memberParams = Maps.newHashMap();
         String adapayMemberId = Constants.ADAPAY_CORP_MEMBER_PREFIX + IdUtils.getMemberId();
+        String orderNo = IdUtils.get16UUID("jsdk_order");
 
         // 先保存一条记录
         AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount();
         adapayMemberAccount.setMerchantId(dto.getMerchantId());
         adapayMemberAccount.setAdapayMemberId(adapayMemberId);
         adapayMemberAccount.setStatus(Constants.ZERO);
+        adapayMemberAccount.setAuditState(AdapayAuditStateEnum.AWAIT_AUDIT.getValue());
+        adapayMemberAccount.setLastOrderNo(orderNo);
         adapayMemberAccountService.insertAdapayMemberAccount(adapayMemberAccount);
 
         memberParams.put("member_id", adapayMemberId);
         memberParams.put("app_id", config.getAdapayAppId());
-        // memberParams.put("order_no", "jsdk_order" + System.currentTimeMillis());
-        memberParams.put("order_no", IdUtils.get16UUID("jsdk_order"));
+        memberParams.put("order_no", orderNo);
         memberParams.put("social_credit_code_expires", dto.getSocialCreditCodeExpires());
         memberParams.put("business_scope", dto.getBusinessScope());
         memberParams.put("name", dto.getBusinessName());
@@ -847,6 +855,8 @@ public class AdapayService {
             String error_msg = (String) member.get("error_msg");
             adapayMemberAccount.setStatus(Constants.TWO); // 创建失败，改状态
             adapayMemberAccount.setRemark(error_msg);
+            adapayMemberAccount.setAuditState(AdapayAuditStateEnum.ACCOUNT_OPENING_FAILED.getValue());
+            adapayMemberAccount.setAuditDesc(error_msg);
             adapayMemberAccountService.updateAdapayMemberAccount(adapayMemberAccount);
             throw new BusinessException("", error_msg);
         }
@@ -1007,11 +1017,13 @@ public class AdapayService {
         String merchantId = (String) payload.get("merchantId");
         AdapayMemberAccount adapayMemberAccount = requireCurrentMemberAccount(merchantId);
         if (isPersonalMember(adapayMemberAccount.getAdapayMemberId())) {
+            assertActionAllowed(merchantId, AdapayOpenActionEnum.UPDATE_PERSONAL_MEMBER);
             UpdatePersonalMemberDTO dto = JSON.parseObject(JSON.toJSONString(payload), UpdatePersonalMemberDTO.class);
             updatePersonalMember(dto);
             return;
         }
 
+        assertActionAllowed(merchantId, AdapayOpenActionEnum.UPDATE_CORP_MEMBER);
         UpdateCorpMemberDTO dto = JSON.parseObject(JSON.toJSONString(payload), UpdateCorpMemberDTO.class);
         updateCorpMember(dto);
     }
@@ -1074,12 +1086,13 @@ public class AdapayService {
             return null;
         }
 
+        String orderNo = IdUtils.get16UUID("jsdk_order_");
         Map<String, Object> memberParams = Maps.newHashMap();
         memberParams.put("adapay_func_code", "corp_members.update");
         memberParams.put("member_id", adapayMemberAccount.getAdapayMemberId());
         memberParams.put("app_id", config.getAdapayAppId());
-        // memberParams.put("order_no", "jsdk_order_" + System.currentTimeMillis());
-        memberParams.put("order_no", IdUtils.get16UUID("jsdk_order_"));
+        memberParams.put("order_no", orderNo);
+        memberParams.put("notify_url", ADAPAY_CALLBACK_URL);
         memberParams.put("social_credit_code_expires", dto.getSocialCreditCodeExpires());
         memberParams.put("business_scope", dto.getBusinessScope());
         String name = dto.getBusinessName();
@@ -1103,6 +1116,13 @@ public class AdapayService {
         if (AdapayStatusEnum.FAILED.getValue().equals((String) member.get("status"))) {
             throw new BusinessException("", (String) member.get("error_msg"));
         }
+        // 企业更新同步返回 pending，审核结果通过异步通知返回；写回审核中并记录 order_no
+        AdapayMemberAccount update = new AdapayMemberAccount();
+        update.setId(adapayMemberAccount.getId());
+        update.setStatus(Constants.ZERO);
+        update.setAuditState(AdapayAuditStateEnum.AWAIT_AUDIT.getValue());
+        update.setLastOrderNo(orderNo);
+        adapayMemberAccountService.updateAdapayMemberAccount(update);
         return null;
     }
 
@@ -1748,6 +1768,7 @@ public class AdapayService {
      * @throws BaseAdaPayException
      */
     public void deleteSettleAccount(AdapayMemberInfoDTO dto) throws BaseAdaPayException {
+        assertActionAllowed(dto.getMerchantId(), AdapayOpenActionEnum.DELETE_SETTLE_ACCOUNT);
         AdapayMemberAccount adapayMemberAccount = requireCurrentMemberAccount(dto.getMerchantId());
         String wechatAppId = pileMerchantInfoService.queryAppIdByMerchantId(dto.getMerchantId());
         String adapayMemberId = StringUtils.isNotBlank(dto.getAdapayMemberId()) ? dto.getAdapayMemberId() : adapayMemberAccount.getAdapayMemberId();
@@ -1787,6 +1808,228 @@ public class AdapayService {
         return adapayMemberAccount;
     }
 
+    // ============== 汇付开户 V2 流程 ==============
+
+    /**
+     * 查询 V2 聚合开户详情，统一计算状态、主操作、可用动作。
+     * 文档：docs/汇付开户V2流程计划.md
+     */
+    public AdapayMemberOpenV2VO getAdapayMemberOpenDetailV2(String merchantId) throws BaseAdaPayException {
+        AdapayMemberAccount account = adapayMemberAccountService.selectByMerchantId(merchantId);
+        AdapayMemberOpenV2VO.AdapayMemberOpenV2VOBuilder builder = AdapayMemberOpenV2VO.builder()
+                .merchantId(merchantId)
+                .tips(Lists.newArrayList());
+
+        if (account == null) {
+            return populateV2Response(builder, AdapayOpenStatusEnum.NONE, null, null, null, null, null).build();
+        }
+
+        String adapayMemberId = account.getAdapayMemberId();
+        String wechatAppId = pileMerchantInfoService.queryAppIdByMerchantId(merchantId);
+        boolean corp = isCorpMember(adapayMemberId);
+        boolean personal = isPersonalMember(adapayMemberId);
+
+        AdapayMemberInfoVO personalVO = null;
+        AdapayCorpMemberVO corpVO = null;
+        AdapaySettleAccountVO settleVO = null;
+
+        if (personal) {
+            personalVO = queryAdapayMemberInfo(adapayMemberId, wechatAppId);
+        } else if (corp) {
+            corpVO = queryCorpAdapayMemberInfo(adapayMemberId, wechatAppId);
+        }
+
+        // 结算账户优先取本地，再尝试从企业用户响应中补齐
+        String settleAccountId = account.getSettleAccountId();
+        if (StringUtils.isBlank(settleAccountId) && corpVO != null) {
+            settleAccountId = corpVO.getSettleAccountId();
+        }
+        if (StringUtils.isNotBlank(settleAccountId)) {
+            settleVO = queryAdapaySettleAccount(adapayMemberId, settleAccountId, wechatAppId);
+        }
+
+        String auditState = resolveAuditState(account, corpVO);
+        String auditDesc = resolveAuditDesc(account, corpVO);
+        AdapayOpenStatusEnum status = computeOpenStatus(account, corp, personal, settleVO != null, auditState);
+
+        return populateV2Response(builder, status, adapayMemberId, auditState, auditDesc, personalVO, corpVO)
+                .settleAccount(settleVO)
+                .build();
+    }
+
+    /**
+     * 计算 V2 状态机。文档：docs/汇付开户V2流程计划.md 第 290-299 行
+     */
+    public AdapayOpenStatusEnum computeOpenStatus(AdapayMemberAccount account,
+                                                  boolean corp,
+                                                  boolean personal,
+                                                  boolean hasSettleAccount,
+                                                  String auditState) {
+        if (account == null) {
+            return AdapayOpenStatusEnum.NONE;
+        }
+        if (personal) {
+            return hasSettleAccount
+                    ? AdapayOpenStatusEnum.PERSONAL_COMPLETED
+                    : AdapayOpenStatusEnum.PERSONAL_OPENED_NO_SETTLE;
+        }
+        if (!corp) {
+            return AdapayOpenStatusEnum.NONE;
+        }
+        // 企业用户：先按汇付审核状态判断，其次按本地 status 兜底
+        if (AdapayAuditStateEnum.ACCOUNT_SUCCESSFUL.getValue().equals(auditState) || hasSettleAccount) {
+            return AdapayOpenStatusEnum.CORP_COMPLETED;
+        }
+        if (AdapayAuditStateEnum.ACCOUNT_OPENED_NO_SETTLEMENT_ACCOUNT.getValue().equals(auditState)) {
+            return AdapayOpenStatusEnum.CORP_OPENED_NO_SETTLE;
+        }
+        if (AdapayAuditStateEnum.AUDIT_FAILED.getValue().equals(auditState)
+                || AdapayAuditStateEnum.ACCOUNT_OPENING_FAILED.getValue().equals(auditState)
+                || Constants.TWO.equals(account.getStatus())) {
+            return AdapayOpenStatusEnum.CORP_FAILED;
+        }
+        if (AdapayAuditStateEnum.AWAIT_AUDIT.getValue().equals(auditState)
+                || Constants.ZERO.equals(account.getStatus())) {
+            return AdapayOpenStatusEnum.CORP_AUDITING;
+        }
+        // 审核通过但没拿到汇付细节时（status=1），按已开户但暂无结算账户处理
+        if (Constants.ONE.equals(account.getStatus())) {
+            return AdapayOpenStatusEnum.CORP_OPENED_NO_SETTLE;
+        }
+        return AdapayOpenStatusEnum.CORP_AUDITING;
+    }
+
+    /**
+     * 后端统一动作校验，避免前端绕过状态限制。
+     * 文档：docs/汇付开户V2流程计划.md 第 337-344 行
+     */
+    public void assertActionAllowed(String merchantId, AdapayOpenActionEnum action) throws BaseAdaPayException {
+        AdapayMemberOpenV2VO detail = getAdapayMemberOpenDetailV2(merchantId);
+        AdapayOpenStatusEnum status = AdapayOpenStatusEnum.valueOf(detail.getStatus());
+        if (!detail.getActions().contains(action.getValue())) {
+            throw new BusinessException("", String.format("当前状态[%s]不允许执行[%s]", status.getLabel(), action.getLabel()));
+        }
+    }
+
+    private AdapayMemberOpenV2VO.AdapayMemberOpenV2VOBuilder populateV2Response(
+            AdapayMemberOpenV2VO.AdapayMemberOpenV2VOBuilder builder,
+            AdapayOpenStatusEnum status,
+            String adapayMemberId,
+            String auditState,
+            String auditDesc,
+            AdapayMemberInfoVO personalVO,
+            AdapayCorpMemberVO corpVO) {
+        List<String> actions = resolveActions(status);
+        String primaryAction = actions.isEmpty() ? null : actions.get(0);
+        String memberType = null;
+        if (status.isPersonal()) {
+            memberType = "PERSONAL";
+        } else if (status.isCorp()) {
+            memberType = "CORP";
+        }
+
+        List<String> tips = buildTips(status, auditDesc);
+        boolean hasSettle = status == AdapayOpenStatusEnum.PERSONAL_COMPLETED
+                || status == AdapayOpenStatusEnum.CORP_COMPLETED;
+
+        return builder
+                .status(status.getValue())
+                .statusLabel(status.getLabel())
+                .memberType(memberType)
+                .adapayMemberId(adapayMemberId)
+                .auditState(auditState)
+                .auditDesc(auditDesc)
+                .settleAccountStatus(hasSettle ? "EXISTS" : "NONE")
+                .primaryAction(primaryAction)
+                .actions(actions)
+                .member(personalVO)
+                .corpMember(corpVO)
+                .tips(tips);
+    }
+
+    private List<String> resolveActions(AdapayOpenStatusEnum status) {
+        List<String> actions = Lists.newArrayList();
+        switch (status) {
+            case NONE:
+                actions.add(AdapayOpenActionEnum.CREATE_PERSONAL_MEMBER.getValue());
+                actions.add(AdapayOpenActionEnum.CREATE_CORP_MEMBER.getValue());
+                break;
+            case PERSONAL_OPENED_NO_SETTLE:
+                actions.add(AdapayOpenActionEnum.CREATE_SETTLE_ACCOUNT.getValue());
+                actions.add(AdapayOpenActionEnum.UPDATE_PERSONAL_MEMBER.getValue());
+                actions.add(AdapayOpenActionEnum.DELETE_MEMBER.getValue());
+                break;
+            case PERSONAL_COMPLETED:
+                actions.add(AdapayOpenActionEnum.UPDATE_PERSONAL_MEMBER.getValue());
+                actions.add(AdapayOpenActionEnum.DELETE_SETTLE_ACCOUNT.getValue());
+                break;
+            case CORP_AUDITING:
+                actions.add(AdapayOpenActionEnum.REFRESH.getValue());
+                break;
+            case CORP_FAILED:
+                // 失败态走 createCorpMember 接口：会先逻辑删除失败记录再重新发起开户
+                actions.add(AdapayOpenActionEnum.CREATE_CORP_MEMBER.getValue());
+                actions.add(AdapayOpenActionEnum.DELETE_MEMBER.getValue());
+                break;
+            case CORP_OPENED_NO_SETTLE:
+                actions.add(AdapayOpenActionEnum.CREATE_SETTLE_ACCOUNT.getValue());
+                actions.add(AdapayOpenActionEnum.UPDATE_CORP_MEMBER.getValue());
+                break;
+            case CORP_COMPLETED:
+                actions.add(AdapayOpenActionEnum.UPDATE_CORP_MEMBER.getValue());
+                actions.add(AdapayOpenActionEnum.DELETE_SETTLE_ACCOUNT.getValue());
+                break;
+            default:
+                break;
+        }
+        return actions;
+    }
+
+    private List<String> buildTips(AdapayOpenStatusEnum status, String auditDesc) {
+        List<String> tips = Lists.newArrayList();
+        switch (status) {
+            case CORP_AUDITING:
+                tips.add("企业开户已提交，请耐心等待汇付审核结果，可点击刷新查看最新状态");
+                break;
+            case CORP_FAILED:
+                if (StringUtils.isNotBlank(auditDesc)) {
+                    tips.add("汇付审核失败原因：" + auditDesc);
+                }
+                tips.add("请根据失败原因修改企业资料后重新提交");
+                break;
+            case PERSONAL_OPENED_NO_SETTLE:
+            case CORP_OPENED_NO_SETTLE:
+                tips.add("22:30 后创建的结算账户，结算将延后一个结算日");
+                break;
+            case PERSONAL_COMPLETED:
+            case CORP_COMPLETED:
+                tips.add("更换银行卡需先删除结算账户，再使用原 member_id 重新创建");
+                break;
+            default:
+                break;
+        }
+        return tips;
+    }
+
+    private String resolveAuditState(AdapayMemberAccount account, AdapayCorpMemberVO corpVO) {
+        if (corpVO != null && StringUtils.isNotBlank(corpVO.getAuditState())) {
+            return corpVO.getAuditState();
+        }
+        return account == null ? null : account.getAuditState();
+    }
+
+    private String resolveAuditDesc(AdapayMemberAccount account, AdapayCorpMemberVO corpVO) {
+        if (corpVO != null && StringUtils.isNotBlank(corpVO.getAuditDesc())) {
+            return corpVO.getAuditDesc();
+        }
+        if (account == null) {
+            return null;
+        }
+        return StringUtils.isNotBlank(account.getAuditDesc()) ? account.getAuditDesc() : account.getRemark();
+    }
+
+    // ============== 汇付开户 V2 流程 end ==============
+
     private boolean isPersonalMember(String adapayMemberId) {
         return StringUtils.startsWith(adapayMemberId, Constants.ADAPAY_MEMBER_PREFIX);
     }

jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayMemberOpenV2VO.java

@@ -0,0 +1,65 @@
+package com.jsowell.adapay.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 汇付开户 V2 聚合响应。
+ *
+ * <p>页面进入后只关心 {@code status} 字段，按 {@code actions} 渲染操作按钮，
+ * 不再依赖前端自行判断 memberType / auditState / settleAccountList。
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class AdapayMemberOpenV2VO {
+
+    /** 运营商 id */
+    private String merchantId;
+
+    /** V2 状态，取自 {@link com.jsowell.common.enums.adapay.AdapayOpenStatusEnum} */
+    private String status;
+
+    /** V2 状态对应的中文展示 */
+    private String statusLabel;
+
+    /** PERSONAL / CORP / 未开户时为 null */
+    private String memberType;
+
+    /** 当前汇付会员 id */
+    private String adapayMemberId;
+
+    /** 汇付审核状态 A/B/C/D/E（仅企业有效） */
+    private String auditState;
+
+    /** 汇付审核结果描述 */
+    private String auditDesc;
+
+    /** NONE / EXISTS */
+    private String settleAccountStatus;
+
+    /** 当前阶段的主操作，取自 {@link com.jsowell.common.enums.adapay.AdapayOpenActionEnum} */
+    private String primaryAction;
+
+    /** 所有可用动作列表 */
+    private List<String> actions;
+
+    /** 个人会员详情，仅个人开户时非空 */
+    private AdapayMemberInfoVO member;
+
+    /** 企业会员详情，仅企业开户时非空 */
+    private AdapayCorpMemberVO corpMember;
+
+    /** 当前结算账户，没有时为空 */
+    private AdapaySettleAccountVO settleAccount;
+
+    /** 可见提示，例如审核失败原因、22:30 后创建会延后结算等 */
+    private List<String> tips;
+}

jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayMemberAccount.java

@@ -71,4 +71,19 @@ public class AdapayMemberAccount {
      * 删除标识（0-正常；1-删除）
      */
     private String delFlag;
+
+    /**
+     * 汇付企业审核状态 A/B/C/D/E
+     */
+    private String auditState;
+
+    /**
+     * 汇付企业审核说明
+     */
+    private String auditDesc;
+
+    /**
+     * 最近一次企业开户/更新请求订单号
+     */
+    private String lastOrderNo;
 }

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

@@ -15,11 +15,14 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="del_flag" jdbcType="VARCHAR" property="delFlag" />
+    <result column="audit_state" jdbcType="VARCHAR" property="auditState" />
+    <result column="audit_desc" jdbcType="VARCHAR" property="auditDesc" />
+    <result column="last_order_no" jdbcType="VARCHAR" property="lastOrderNo" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, `status`, merchant_id, adapay_member_id, settle_account_id, remark, create_time,
-    create_by, update_time, update_by, del_flag
+    create_by, update_time, update_by, del_flag, audit_state, audit_desc, last_order_no
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -78,6 +81,15 @@
       <if test="delFlag != null">
         del_flag,
       </if>
+      <if test="auditState != null">
+        audit_state,
+      </if>
+      <if test="auditDesc != null">
+        audit_desc,
+      </if>
+      <if test="lastOrderNo != null">
+        last_order_no,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="status != null">
@@ -110,6 +122,15 @@
       <if test="delFlag != null">
         #{delFlag,jdbcType=VARCHAR},
       </if>
+      <if test="auditState != null">
+        #{auditState,jdbcType=VARCHAR},
+      </if>
+      <if test="auditDesc != null">
+        #{auditDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="lastOrderNo != null">
+        #{lastOrderNo,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.jsowell.pile.domain.AdapayMemberAccount">
@@ -146,6 +167,15 @@
       <if test="delFlag != null">
         del_flag = #{delFlag,jdbcType=VARCHAR},
       </if>
+      <if test="auditState != null">
+        audit_state = #{auditState,jdbcType=VARCHAR},
+      </if>
+      <if test="auditDesc != null">
+        audit_desc = #{auditDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="lastOrderNo != null">
+        last_order_no = #{lastOrderNo,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -464,11 +494,15 @@
             <if test="merchantId != null">merchant_id = #{merchantId},</if>
             <if test="adapayMemberId != null">adapay_member_id = #{adapayMemberId},</if>
             <if test="settleAccountId != null">settle_account_id = #{settleAccountId},</if>
+            <if test="remark != null">remark = #{remark},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="auditState != null">audit_state = #{auditState},</if>
+            <if test="auditDesc != null">audit_desc = #{auditDesc},</if>
+            <if test="lastOrderNo != null">last_order_no = #{lastOrderNo},</if>
         </trim>
         where id = #{id}
     </update>
@@ -480,11 +514,15 @@
             <if test="merchantId != null">merchant_id = #{merchantId},</if>
             <if test="adapayMemberId != null">adapay_member_id = #{adapayMemberId},</if>
             <if test="settleAccountId != null">settle_account_id = #{settleAccountId},</if>
+            <if test="remark != null">remark = #{remark},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="auditState != null">audit_state = #{auditState},</if>
+            <if test="auditDesc != null">audit_desc = #{auditDesc},</if>
+            <if test="lastOrderNo != null">last_order_no = #{lastOrderNo},</if>
         </trim>
         where adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR}
     </update>