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 7d58f9890..798a42154 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 @@ -14,7 +14,9 @@ import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.pile.domain.AdapayMemberInfo; +import com.jsowell.pile.domain.AdapaySettleAccount; import com.jsowell.pile.service.AdapayMemberInfoService; +import com.jsowell.pile.service.IAdapaySettleAccountService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -33,52 +35,8 @@ public class AdapayMemberService { @Autowired private AdapayMemberInfoService adapayMemberInfoService; - /** - * 创建汇付会员 - */ - public Map executeCreateMember(String app_id) throws Exception { - log.info("=======execute CreateMember begin======="); - Map memberParams = Maps.newHashMap(); - memberParams.put("member_id", "AM" + IdUtils.getMemberId()); - memberParams.put("app_id", app_id); - memberParams.put("location", "上海市徐汇区宜山路"); - memberParams.put("email", "123@163.com"); - memberParams.put("gender", "MALE"); - // memberParams.put("tel_no", "13153333333"); - // memberParams.put("nickname", "nick_name"); - log.info("创建用户,请求参数:" + JSON.toJSONString(memberParams)); - Map member = Member.create(memberParams); - log.info("创建用户,返回参数:" + JSON.toJSONString(member)); - log.info("=======execute CreateMember end======="); - - // 创建成功保存到数据库 - JSONObject jsonObject = JSON.parseObject(String.valueOf(member)); - ObjectMapper mapper = new ObjectMapper(); - mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE); - AdapayMemberInfo adapayMemberInfo = mapper.readValue(jsonObject.toJSONString(), AdapayMemberInfo.class); - adapayMemberInfoService.insert(adapayMemberInfo); - return member; - } - - /** - * 查询 member - * - * @param member_id 待查询的member_id - * @return 创建的member 对象 - * @throws Exception 异常 - */ - public Map executeQueryMember(String member_id, String app_id) throws Exception { - log.info("=======execute queryMember begin======="); - Map memberParams = Maps.newHashMap(); - memberParams.put("member_id", member_id); - memberParams.put("app_id", app_id); - log.info("查询用户,请求参数:" + JSON.toJSONString(memberParams)); - Map member = Member.query(memberParams); - log.info("查询用户,返回参数:" + JSON.toJSONString(member)); - log.info("=======execute queryMember end======="); - return member; - } - + @Autowired + private IAdapaySettleAccountService adapaySettleAccountService; /** * 创建汇付会员 @@ -167,5 +125,19 @@ public class AdapayMemberService { settleCountParams.put("account_info", accountInfo); Map settleCount = SettleAccount.create(settleCountParams); log.info("创建汇付结算账户result:{}", settleCount); + + AdapaySettleAccount adapaySettleAccount = new AdapaySettleAccount(); + adapaySettleAccount.setMerchantId(dto.getMerchantId()); + adapaySettleAccount.setAdapayMemberId(dto.getAdapayMemberId()); + adapaySettleAccount.setCardId(dto.getCardId()); + adapaySettleAccount.setCardName(dto.getCardName()); + adapaySettleAccount.setCertId(dto.getCertId()); + adapaySettleAccount.setCertType("00"); + adapaySettleAccount.setTelNo(dto.getTelNo()); + adapaySettleAccount.setBankCode(dto.getBankCode()); + adapaySettleAccount.setBankAcctType(dto.getBankAcctType()); + adapaySettleAccount.setProvCode(dto.getProvCode()); + adapaySettleAccount.setAreaCode(dto.getAreaCode()); + adapaySettleAccountService.insertAdapaySettleAccount(adapaySettleAccount); } }