From 858568d3c1bf39743bd2b55e60a3e822da85cadb Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 10 Jul 2023 17:19:30 +0800 Subject: [PATCH 1/6] update --- .../src/views/pile/merchant/components/adapayMember.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue index 033b47efb..00085054a 100644 --- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue +++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue @@ -58,7 +58,7 @@ editable v-model="dialogForm.socialCreditCodeExpires" type="date" - placeholder="输入有效期格式为20190909" + placeholder="有效期格式为20190909" format="yyyyMMdd" value-format="yyyyMMdd"> @@ -77,7 +77,7 @@ editable v-model="dialogForm.legalCertIdExpires" type="date" - placeholder="输入有效期格式为20190909" + placeholder="有效期格式为20190909" format="yyyyMMdd" value-format="yyyyMMdd"> @@ -360,7 +360,7 @@ editable v-model="adapayCorpMember.socialCreditCodeExpires" type="date" - placeholder="输入有效期格式为20190909" + placeholder="有效期格式为20190909" format="yyyyMMdd" value-format="yyyyMMdd"> @@ -379,7 +379,7 @@ editable v-model="adapayCorpMember.legalCertIdExpires" type="date" - placeholder="输入有效期格式为20190909" + placeholder="有效期格式为20190909" format="yyyyMMdd" value-format="yyyyMMdd"> From c41adbe3b36f480513b51eb37135193db8a5507c Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 10 Jul 2023 17:39:08 +0800 Subject: [PATCH 2/6] =?UTF-8?q?update=20=E5=88=9B=E5=BB=BA=E6=B1=87?= =?UTF-8?q?=E4=BB=98=E4=BC=81=E4=B8=9A=E4=BC=9A=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/OrderService.java | 19 +++++++++++++++++-- .../mapper/AdapayMemberAccountMapper.java | 2 ++ .../service/IAdapayMemberAccountService.java | 2 ++ .../impl/AdapayMemberAccountServiceImpl.java | 7 ++++++- .../mapper/pile/AdapayMemberAccountMapper.xml | 16 ++++++++++++++++ .../pile/merchant/components/adapayMember.vue | 1 + 6 files changed, 44 insertions(+), 3 deletions(-) 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"> + From ae739659fffa1b8b419b77b004f18c3be22f83cf Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 10 Jul 2023 17:41:21 +0800 Subject: [PATCH 3/6] update --- .../com/jsowell/adapay/service/AdapayMemberService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java index bae1b394a..e89855150 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java @@ -43,7 +43,10 @@ public class AdapayMemberService { @Value("${adapay.appId}") private String ADAPAY_APP_ID; - private final String CALLBACK_URL = "https://api.jsowellcloud.com/uniapp/pay/callbackAdapay"; + // private final String CALLBACK_URL = "https://api.jsowellcloud.com/uniapp/pay/callbackAdapay"; + + @Value("${adapay.callback}") + private String ADAPAY_CALLBACK_URL; @Autowired private IAdapayMemberAccountService adapayMemberAccountService; @@ -385,7 +388,7 @@ public class AdapayMemberService { memberParams.put("bank_acct_type", dto.getBankAcctType()); memberParams.put("card_no", dto.getCardNo()); memberParams.put("card_name", dto.getCardName()); - memberParams.put("notify_url", CALLBACK_URL); + memberParams.put("notify_url", ADAPAY_CALLBACK_URL); File file = ZipUtil.createZipFileFromImages(dto.getImgList()); log.info("创建企业账户param:{}", memberParams); Map member = CorpMember.create(memberParams, file); From 01971a712d6c0b1b8d07fb0a8a6ff99c21c6ba12 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 10 Jul 2023 17:45:02 +0800 Subject: [PATCH 4/6] update --- .../main/java/com/jsowell/service/OrderService.java | 11 ----------- 1 file changed, 11 deletions(-) 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 cfb554eb4..71412d6b1 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -127,7 +127,6 @@ public class OrderService { @Value("${adapay.callback}") private String ADAPAY_CALLBACK_URL; - @Autowired private IAdapayMemberAccountService adapayMemberAccountService; @@ -138,16 +137,6 @@ public class OrderService { * @return */ public String generateOrder(GenerateOrderDTO dto) throws ParseException { - // log.info("generateOrder param:{}", JSONObject.toJSONString(dto)); - // // 处理前端传的参数 - // analysisPileParameter(dto); - // - // // 校验充电桩相关的信息 - // checkPileInfo(dto); - // - // // 保存订单到数据库 saveOrder2Database - // String orderCode = saveOrder2Database(dto); - OrderBasicInfo basicInfo = orderBasicInfoService.generateOrder(dto); if (basicInfo != null) { return basicInfo.getOrderCode(); From 9dd8b633ef14c4229f72ab8541c09e62a86af7da Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 10 Jul 2023 17:55:26 +0800 Subject: [PATCH 5/6] update --- .../java/com/jsowell/service/OrderService.java | 8 +++++++- .../pile/mapper/AdapayMemberAccountMapper.java | 2 ++ .../pile/service/IAdapayMemberAccountService.java | 2 ++ .../impl/AdapayMemberAccountServiceImpl.java | 14 +++++++++++++- .../mapper/pile/AdapayMemberAccountMapper.xml | 8 ++++++++ 5 files changed, 32 insertions(+), 2 deletions(-) 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 71412d6b1..865a76e85 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1401,7 +1401,13 @@ public class OrderService { if (StringUtils.isBlank(memberId)) { return; } - adapayMemberAccountService.deleteByMemberId(memberId); + AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMemberId(memberId); + if (adapayMemberAccount == null) { + return; + } + adapayMemberAccount.setDelFlag(Constants.ONE); + adapayMemberAccountService.updateAdapayMemberAccount(adapayMemberAccount); + } private void corpMemberSucceeded(String data) { 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 6d1a26ea0..0f1901c18 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 @@ -66,4 +66,6 @@ public interface AdapayMemberAccountMapper { void deleteByMemberId(String memberId); void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount); + + AdapayMemberAccount selectByMemberId(String memberId); } 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 2781d05db..6f0a7c71e 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 @@ -61,6 +61,8 @@ public interface IAdapayMemberAccountService { AdapayMemberAccount selectByMerchantId(String merchantId); + AdapayMemberAccount selectByMemberId(String memberId); + String selectAdapayMemberIdByStationId(String stationId); void deleteByMemberId(String memberId); 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 84d0459d6..fe4ace2fb 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 @@ -3,6 +3,7 @@ package com.jsowell.pile.service.impl; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.util.DateUtils; +import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.AdapayMemberAccount; import com.jsowell.pile.domain.PileStationInfo; import com.jsowell.pile.mapper.AdapayMemberAccountMapper; @@ -75,7 +76,12 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi @Override public int updateAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount) { // adapayMemberAccount.setUpdateTime(DateUtils.getNowDate()); - return adapayMemberAccountMapper.updateAdapayMemberAccount(adapayMemberAccount); + int i = adapayMemberAccountMapper.updateAdapayMemberAccount(adapayMemberAccount); + if (StringUtils.isNotBlank(adapayMemberAccount.getMerchantId())) { + String redisKey = CacheConstants.ADAPAY_MEMBER_ACCOUNT + adapayMemberAccount.getMerchantId(); + redisCache.deleteObject(redisKey); + } + return i; } /** @@ -113,6 +119,12 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi return adapayMemberAccount; } + + @Override + public AdapayMemberAccount selectByMemberId(String memberId) { + return adapayMemberAccountMapper.selectByMemberId(memberId); + } + @Override public String selectAdapayMemberIdByStationId(String stationId) { PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(Long.parseLong(stationId)); diff --git a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml index 89e93415f..e954098f5 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml @@ -121,4 +121,12 @@ delete from adapay_member_account where adapay_member_id = #{memberId,jdbcType=VARCHAR} + + \ No newline at end of file From 251f45970604ba6d27759cbacb71c0c6a7a473aa Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 10 Jul 2023 17:56:19 +0800 Subject: [PATCH 6/6] update --- .../src/main/java/com/jsowell/service/OrderService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 865a76e85..850629144 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1406,8 +1406,8 @@ public class OrderService { return; } adapayMemberAccount.setDelFlag(Constants.ONE); + // 逻辑删除记录，并删除缓存 adapayMemberAccountService.updateAdapayMemberAccount(adapayMemberAccount); - } private void corpMemberSucceeded(String data) {