From 31752a48a2bf32e2a74c71465fe10c7cf7fabb62 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Fri, 2 Jun 2023 15:18:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cweb/controller/TestController.java | 34 ++++++++++--------- .../channel/lakala/LaKaLaWalletService.java | 4 +-- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/cweb/src/main/java/com/cweb/controller/TestController.java b/cweb/src/main/java/com/cweb/controller/TestController.java index d23ba54..7add3ea 100644 --- a/cweb/src/main/java/com/cweb/controller/TestController.java +++ b/cweb/src/main/java/com/cweb/controller/TestController.java @@ -27,6 +27,8 @@ import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.config.CommonSysConst; import com.hfkj.config.device.SoundService; import com.hfkj.config.mqtt.MqttProviderService; +import com.hfkj.dao.BsStoreMapper; +import com.hfkj.dao.BsStoreMapperExt; import com.hfkj.entity.*; import com.hfkj.model.MerBasisModel; import com.hfkj.model.ResponseData; @@ -208,11 +210,12 @@ public class TestController { public ResponseData lklWithdraw() { try { - // return ResponseMsgUtil.success(laKaLaWalletService.ewalletBalanceQuery("8221210701101SB", null,null)); - // return ResponseMsgUtil.success(laKaLaWalletService.ewalletWithdrawD1("8221210701101SB", new BigDecimal("0.01"),"测试提现功能")); - // return ResponseMsgUtil.success(laKaLaWalletService.ewalletSettleProfile("8221210701101SB", "02","08")); - // return ResponseMsgUtil.success(laKaLaWalletService.ewalletSettleQuery("8221210701101SB")); - return ResponseMsgUtil.success(laKaLaWalletService.activeSettleApply("8221210701101SB")); + // return ResponseMsgUtil.success(laKaLaWalletService.ewalletBalanceQuery("8226900581219V0", null,"01")); + // return ResponseMsgUtil.success(laKaLaWalletService.ewalletWithdrawD1("8226900581219V0", new BigDecimal("30193.35"),"提现")); + // return ResponseMsgUtil.success(laKaLaWalletService.ewalletSettleProfile("8226900581219V0", "02","06")); + // return ResponseMsgUtil.success(laKaLaWalletService.ewalletWithdrawQuery("8226900581219V0", "230602150213408367448221")); + return ResponseMsgUtil.success(laKaLaWalletService.ewalletSettleQuery("8226900581219V0")); + // return ResponseMsgUtil.success(laKaLaWalletService.activeSettleApply("8226900581219V0")); } catch (Exception e) { log.error(e.getMessage(), e); @@ -230,7 +233,7 @@ public class TestController { /* // 转换成bas64 String imageUrl = "https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com/merchant/57/1682405639861.jpeg"; String base64ImgUrl = ImageUtils.getBase64ByImgUrl(imageUrl); - String fileType = imageUrl.substring(imageUrl.lastIndexOf(".") + 1); + String fileType = imageUrl.substring(imageUrl.lastIndexOf(".") 1); return ResponseMsgUtil.success(LaKaLaConfig.uploadFile("COOPERATION_QUALIFICATION_PROOF", fileType, base64ImgUrl));*/ } catch (Exception e) { @@ -286,9 +289,9 @@ public class TestController { // return ResponseMsgUtil.success(saasMerService.updateReview(reviewRelatedId); /* int[] idArray = {74,75,76,77,78,79,81,82,85,89,90,92,95,97,98,100,100,101,101,102,104,105}; - for (int i = 0; i < idArray.length; i++) { + for (int i = 0; i < idArray.length; i) { int id = idArray[i]; - // saasMerService.updateFee(Long.parseLong(id+"")); + // saasMerService.updateFee(Long.parseLong(id"")); }*/ // return ResponseMsgUtil.success(""); // return ResponseMsgUtil.success(saasMerService.updateFee(74L)); @@ -460,17 +463,16 @@ public class TestController { @ApiOperation(value = "saasActivity") public ResponseData saasActivity(@RequestParam(value = "code", required = false) String code) { try { - - // return ResponseMsgUtil.success(saasActivityService.queryAgentActivityStatus("73")); + return ResponseMsgUtil.success(saasActivityService.queryAgentActivityStatus("73")); // return ResponseMsgUtil.success(saasActivityService.agentRegisterActivity("73")); // return ResponseMsgUtil.success(saasActivityService.queryAgentActivityList()); // return ResponseMsgUtil.success(saasActivityService.queryCustomerActivityStatus("73", "8226900445800HB")); - /*********** 活动报名 *************/ +/* *//*********** 活动报名 *************//* List externalCustomerNos = new ArrayList<>(); externalCustomerNos.add("8226900723007E8"); return ResponseMsgUtil.success(saasActivityService.customerRegisterActivity("73", null, externalCustomerNos)); - /******* 配置活动费率 *******/ + *//******* 配置活动费率 *******/ /* String activityId = "73"; String externalCustomerNo = code; JSONArray jsonArray = saasActivityService.queryCustomerRates(activityId, externalCustomerNo); @@ -561,8 +563,8 @@ public class TestController { param.put("legalName", merDetail.getLarName()); param.put("licenseName", merDetail.getBlisName()); param.put("identityNo", merDetail.getLarIdCard()); - param.put("address", merDetail.getMerRegion().getProvinceName()+merDetail.getMerRegion().getCityName()+merDetail.getMerRegion().getAreaName()) ; - param.put("identityNoExpire", merDetail.getLarIdCardPeriodStart() + " —— " + merDetail.getLarIdCardPeriodEnd()); + param.put("address", merDetail.getMerRegion().getProvinceName()merDetail.getMerRegion().getCityName()merDetail.getMerRegion().getAreaName()) ; + param.put("identityNoExpire", merDetail.getLarIdCardPeriodStart() " —— " merDetail.getLarIdCardPeriodEnd()); param.put("receiveDetail", merDetail.getMerRegion().getAddress()); } @@ -570,7 +572,7 @@ public class TestController { param.put("accountName", merDetail.getMerSettleAcct().getBankName()); param.put("accountIdCard", merDetail.getMerSettleAcct().getSettleIdCardNo()); param.put("accountNo", merDetail.getMerSettleAcct().getBankCardNo()); - param.put("accountIdDtEnd", merDetail.getMerSettleAcct().getSettleIdCardPeriodStart() + " —— " + merDetail.getMerSettleAcct().getSettleIdCardPeriodEnd()); + param.put("accountIdDtEnd", merDetail.getMerSettleAcct().getSettleIdCardPeriodStart() " —— " merDetail.getMerSettleAcct().getSettleIdCardPeriodEnd()); param.put("bankName", merDetail.getMerSettleAcct().getOpenningBankName()); // 商户信息 @@ -584,7 +586,7 @@ public class TestController { GenerateAgreementUtil.createAgreementPicture(merDetail.getId(),GenerateAgreementUtil.writeHtml(merDetail.getId(),template, param)); */ - return ResponseMsgUtil.success(saasCommon.fileUpload(new File(CommonSysConst.getSysConfig().getFile_url() +"/"+ SaasMerService.generateAddContract(merDetail)), "OPENING_PERMIT", "0").getString("url")); + return ResponseMsgUtil.success(saasCommon.fileUpload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + SaasMerService.generateAddContract(merDetail)), "OPENING_PERMIT", "0").getString("url")); } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/service/src/main/java/com/hfkj/channel/lakala/LaKaLaWalletService.java b/service/src/main/java/com/hfkj/channel/lakala/LaKaLaWalletService.java index f977efa..b4c2304 100644 --- a/service/src/main/java/com/hfkj/channel/lakala/LaKaLaWalletService.java +++ b/service/src/main/java/com/hfkj/channel/lakala/LaKaLaWalletService.java @@ -141,7 +141,7 @@ public class LaKaLaWalletService { * @param merCupNo * @return */ - public JSONObject ewalletWithdrawQuery(String merCupNo,String merOrderNo) { + public JSONObject ewalletWithdrawQuery(String merCupNo,String drawJnl) { // 请求参数 Map param = new HashMap<>(); param.put("timestamp", new Date().getTime()); @@ -152,7 +152,7 @@ public class LaKaLaWalletService { Map map = new HashMap<>(); map.put("orgNo", CommonSysConst.getSysConfig().getLkl_org_code()); map.put("merchantNo", merCupNo); - map.put("drawJnl", merOrderNo); + map.put("drawJnl", drawJnl); param.put("reqData", map); // 生成签名