diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index a35439841..cfb554eb4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1335,6 +1335,8 @@ public class OrderService { } else if (AdapayEventEnum.corp_member_failed.getValue().equals(type)) { // 开户失败 删除 corpMemberFailed(data); + } else if (AdapayEventEnum.corp_member_succeeded.getValue().equals(type)) { + corpMemberSucceeded(data); } } @@ -1407,9 +1409,22 @@ public class OrderService { // 删除表中的记录 JSONObject jsonObject = JSON.parseObject(data); String memberId = jsonObject.getString("member_id"); - if (StringUtils.isNotBlank(memberId)) { - adapayMemberAccountService.deleteByMemberId(memberId); + if (StringUtils.isBlank(memberId)) { + return; } + adapayMemberAccountService.deleteByMemberId(memberId); + } + + private void corpMemberSucceeded(String data) { + JSONObject jsonObject = JSON.parseObject(data); + String memberId = jsonObject.getString("member_id"); + if (StringUtils.isBlank(memberId)) { + return; + } + AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount(); + adapayMemberAccount.setAdapayMemberId(memberId); + adapayMemberAccount.setStatus(Constants.ONE); + adapayMemberAccountService.updateAdapayMemberAccountByMemberId(adapayMemberAccount); } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapayMemberAccountMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapayMemberAccountMapper.java index d8cd1db44..6d1a26ea0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapayMemberAccountMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapayMemberAccountMapper.java @@ -64,4 +64,6 @@ public interface AdapayMemberAccountMapper { AdapayMemberAccount selectByMerchantId(String merchantId); void deleteByMemberId(String memberId); + + void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java index db8fb8720..2781d05db 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java @@ -64,4 +64,6 @@ public interface IAdapayMemberAccountService { String selectAdapayMemberIdByStationId(String stationId); void deleteByMemberId(String memberId); + + void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java index 00b934234..84d0459d6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java @@ -74,7 +74,7 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi */ @Override public int updateAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount) { - adapayMemberAccount.setUpdateTime(DateUtils.getNowDate()); + // adapayMemberAccount.setUpdateTime(DateUtils.getNowDate()); return adapayMemberAccountMapper.updateAdapayMemberAccount(adapayMemberAccount); } @@ -131,4 +131,9 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi public void deleteByMemberId(String memberId) { adapayMemberAccountMapper.deleteByMemberId(memberId); } + + @Override + public void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount) { + adapayMemberAccountMapper.updateAdapayMemberAccountByMemberId(adapayMemberAccount); + } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml index 6bff73b0a..89e93415f 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml @@ -83,6 +83,22 @@ where id = #{id} + + update adapay_member_account + + status = #{status}, + merchant_id = #{merchantId}, + adapay_member_id = #{adapayMemberId}, + settle_account_id = #{settleAccountId}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + del_flag = #{delFlag}, + + where adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR} + + delete from adapay_member_account where id = #{id} diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue index 00085054a..3a774c6ba 100644 --- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue +++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue @@ -62,6 +62,7 @@ format="yyyyMMdd" value-format="yyyyMMdd"> +