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..850629144 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(); @@ -1335,6 +1324,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 +1398,28 @@ 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; } + AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMemberId(memberId); + if (adapayMemberAccount == null) { + return; + } + adapayMemberAccount.setDelFlag(Constants.ONE); + // 逻辑删除记录,并删除缓存 + adapayMemberAccountService.updateAdapayMemberAccount(adapayMemberAccount); + } + + 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/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); 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..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 @@ -64,4 +64,8 @@ public interface AdapayMemberAccountMapper { AdapayMemberAccount selectByMerchantId(String merchantId); 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 db8fb8720..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,7 +61,11 @@ public interface IAdapayMemberAccountService { AdapayMemberAccount selectByMerchantId(String merchantId); + AdapayMemberAccount selectByMemberId(String memberId); + 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..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; @@ -74,8 +75,13 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi */ @Override public int updateAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount) { - adapayMemberAccount.setUpdateTime(DateUtils.getNowDate()); - return adapayMemberAccountMapper.updateAdapayMemberAccount(adapayMemberAccount); + // adapayMemberAccount.setUpdateTime(DateUtils.getNowDate()); + 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)); @@ -131,4 +143,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..e954098f5 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} @@ -105,4 +121,12 @@ delete from adapay_member_account where adapay_member_id = #{memberId,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue index 0063dcd57..192005c26 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"> @@ -78,7 +78,7 @@ editable v-model="dialogForm.legalCertIdExpires" type="date" - placeholder="输入有效期格式为20190909" + placeholder="有效期格式为20190909" format="yyyyMMdd" value-format="yyyyMMdd"> @@ -361,7 +361,7 @@ editable v-model="adapayCorpMember.socialCreditCodeExpires" type="date" - placeholder="输入有效期格式为20190909" + placeholder="有效期格式为20190909" format="yyyyMMdd" value-format="yyyyMMdd"> @@ -380,7 +380,7 @@ editable v-model="adapayCorpMember.legalCertIdExpires" type="date" - placeholder="输入有效期格式为20190909" + placeholder="有效期格式为20190909" format="yyyyMMdd" value-format="yyyyMMdd">