diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java index 82d34f6..e866657 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java @@ -574,7 +574,7 @@ public class LaKalaInterfaceImpl { } - public void merchantAudit(String userId) { + public void merchantAudit(String userId,Account account,BankCard bankCard,IdCard accountIdCard) { MerchantBaseInfo merchantBaseInfo = mbiService.getMerchantBaseInfoByUserId(userId); @@ -592,58 +592,60 @@ public class LaKalaInterfaceImpl { AccountDTO accountV4 = getAccountV4(userId, "D1"); //结算人 + MsgException.checkNull(accountV4, "结算信息不存在"); JSONObject object = new JSONObject(); object.put("accountKind", accountV4.getBankCard().getAccountType().equals("01") ? "58" : "57"); - object.put("accountNo", accountV4.getBankCard().getBankCardNo()); //结算人银行卡号 - object.put("accountName", accountV4.getBankCard().getBankHolder()); //结算人账户名称 + object.put("accountNo", bankCard.getBankCardNo()); //结算人银行卡号 + object.put("accountName", bankCard.getBankHolder()); //结算人账户名称 Set> attchmentsVoSet = new HashSet<>(); ConcurrentMap frontLegalPersonMap = new ConcurrentHashMap<>(); - frontLegalPersonMap.put("imgPath", laKaLaFileUpload(accountV4.getIdcard().getImgPositive(), "ID_CARD_FRONT")); + frontLegalPersonMap.put("imgPath", laKaLaFileUpload(accountIdCard.getImgPositive(), "ID_CARD_FRONT")); frontLegalPersonMap.put("imgType", "ID_CARD_FRONT"); attchmentsVoSet.add(frontLegalPersonMap); ConcurrentMap reverseLegalPersonMap = new ConcurrentHashMap<>(); - reverseLegalPersonMap.put("imgPath", laKaLaFileUpload(accountV4.getIdcard().getImgNegative(), "ID_CARD_BEHIND")); + reverseLegalPersonMap.put("imgPath", laKaLaFileUpload(accountIdCard.getImgNegative(), "ID_CARD_BEHIND")); reverseLegalPersonMap.put("imgType", "ID_CARD_BEHIND"); attchmentsVoSet.add(reverseLegalPersonMap); object.put("attachments", attchmentsVoSet); - QueryWrapper accountQueryWrapper1 = new QueryWrapper<>(); - accountQueryWrapper1.eq("userId", userId); - accountQueryWrapper1.eq("channelType", "D1"); - Account accountServiceOne1 = accountService.getOne(accountQueryWrapper1); - MsgException.checkNull(accountServiceOne1, "结算信息未提交"); - - - QueryWrapper bankCardWrapper = new QueryWrapper<>(); - bankCardWrapper.eq("id", accountServiceOne1.getBankCardId()); - BankCard userBrakCard = bankCardService.getOne(bankCardWrapper); +// QueryWrapper accountQueryWrapper1 = new QueryWrapper<>(); +// accountQueryWrapper1.eq("userId", userId); +// accountQueryWrapper1.eq("channelType", "D1"); +// Account accountServiceOne1 = accountService.getOne(accountQueryWrapper1); +// MsgException.checkNull(accountServiceOne1, "结算信息未提交"); +// +// +// QueryWrapper bankCardWrapper = new QueryWrapper<>(); +// bankCardWrapper.eq("id", accountServiceOne1.getBankCardId()); +// BankCard userBrakCard = bankCardService.getOne(bankCardWrapper); QueryWrapper lklEntityQueryWrapper = new QueryWrapper<>(); - lklEntityQueryWrapper.eq("branch_bank_no", userBrakCard.getContactLine()); + lklEntityQueryWrapper.eq("branch_bank_no", bankCard.getContactLine()); TbPlussBankBranchLklEntity lakalaBranchInfo = tbPlussBankBranchLklService.getOne(lklEntityQueryWrapper); MsgException.checkNull(lakalaBranchInfo, "结算卡对应的分行支行信息不存在"); object.put("bankNo", lakalaBranchInfo.getBranchBankNo()); //结算账户开户⾏号 通过【银行列表查询】接口获取 对应 branchBankNo字段 object.put("bankName", lakalaBranchInfo.getBranchBankName()); //结算账户开户⾏名称 通过【银行列表查询】接口获取 对应 branchBankName字段 object.put("clearingBankNo", lakalaBranchInfo.getClearNo()); //结算账户清算⾏号 通过【银行列表查询】接口获取 对应 clearNo字段 - JSONObject req = new JSONObject(); - req.put("dto", object); - req.put("customerNo", Integer.valueOf(mcs.getMerchantId())); +// JSONObject req = new JSONObject(); +// req.put("dto", object); +// req.put("customerNo", Integer.valueOf(mcs.getMerchantId())); + object.put("customerNo",Integer.valueOf(mcs.getMerchantId())); Map map = getModifyToken("19191703856", "klb1qaz"); String result = ""; try { - log.info("修改信息:{}",req.toString()); + log.info("修改信息:{}",object.toString()); String url = "https://tkapi.lakala.com/htkmerchants/channel/customer/update/settle/"; result = cn.hutool.http.HttpRequest.post(url.concat(mcs.getMerchantId())) .header("Authorization", "bearer " + map.get("access_token")).header("content-type", "application/json") - .body(req.toString()).execute().body(); + .body(object.toString()).execute().body(); System.out.println("返回结果:" + result); Map arry = (Map) JSONArray.parse(result);