From eeffe90fc715932fa238905af12065ddbc8f9c79 Mon Sep 17 00:00:00 2001 From: hankaikai <3233542360@qq.com> Date: Mon, 5 Jun 2023 16:39:07 +0800 Subject: [PATCH] =?UTF-8?q?"=E6=8B=89=E5=8D=A1=E6=8B=89=E8=BF=9B=E4=BB=B6?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BB=A3=E7=A0=81"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../klk/service/LkLPayServiceImpl.java | 52 +++++++++++-------- .../klk/service/impl/LaKalaInterfaceImpl.java | 4 +- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/LkLPayServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/LkLPayServiceImpl.java index d5ed025..ebcf540 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/LkLPayServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/LkLPayServiceImpl.java @@ -7,7 +7,9 @@ import cn.pluss.platform.dto.MerChantOrderDTO; import cn.pluss.platform.entity.*; import cn.pluss.platform.exception.MsgException; import cn.pluss.platform.klk.LakalaConfig; +import cn.pluss.platform.klk.service.impl.LaKalaInterfaceImpl; import cn.pluss.platform.mapper.MerchantBackLklMapper; +import cn.pluss.platform.mapper.MerchantBaseInfoMapper; import cn.pluss.platform.pay.PayService; import cn.pluss.platform.util.DateUtils; import cn.pluss.platform.util.SnowFlakeUtil; @@ -35,10 +37,21 @@ public class LkLPayServiceImpl implements PayService { @Autowired LakalaConfig lakalaConfig; + @Autowired + MerchantBaseInfoMapper merchantBaseInfoMapper; + @Override public JSONObject tradePay(MerchantOrder order, MerchantChannelStatus channel, MerchantBaseInfo merchant) { + + + + + + + + return null; } @@ -46,45 +59,40 @@ public class LkLPayServiceImpl implements PayService { public JSONObject tradePay(MerChantOrderDTO merchantOrderDTO, MerchantOrder order) { + QueryWrapper baseQueyWrapper=new QueryWrapper<>(); + baseQueyWrapper.eq("merchantCode",merchantOrderDTO.getMerchantCode()); + MerchantBaseInfo baseInfo= merchantBaseInfoMapper.selectOne(baseQueyWrapper); + MsgException.checkNull(baseInfo,"商户基本信息错误"); + + + QueryWrapper queryWrapper=new QueryWrapper<>(); queryWrapper.eq("merchant_code",merchantOrderDTO.getMerchantCode()); queryWrapper.eq("channel","5"); - queryWrapper.eq("user_no","20000101"); + queryWrapper.eq("user_no", LaKalaInterfaceImpl.userNo); MerchantBackLkl merchantBackLkl=merchantBackLklMapper.selectOne(queryWrapper); MsgException.checkNull(merchantBackLkl,"进件信息不存在"); + + + + + JSONObject obj = new JSONObject(6); String req_time= DateUtils.getSdfTimes(); Long order_amt = new BigDecimal(order.getConsumeFee()).multiply(new BigDecimal(100)).longValue(); - String out_trade_no= "LKL".concat(SnowFlakeUtil.nextId().toString()); - - -// String body="{\n" + -// "\t\"req_data\": {\n" + -// "\t\t\"out_trade_no\": \""+out_trade_no+"\",\n" + -// "\t\t\"merchant_no\": \""+lakalaConfig.getMerchantNo()+"\",\n" + -// "\t\t\"term_no\": \""+lakalaConfig.getTermNo()+"\",\n" + -// "\t\t\"auth_code\": \""+merchantOrderDTO.getAuthCode()+"\",\n" + -// "\t\t\"total_amount\": \""+order_amt+"\",\n" + -// "\t\t\"notify_url\": \""+lakalaConfig.getCallBackUrl()+"\",\n" + -// "\t\t\"location_info\": \"{\"request_ip\":\""+order.getIp()+"\"}\"\n" + -// "\t},\n" + -// "\t\"version\": \"3.0\",\n" + -// "\t\"req_time\": \""+req_time+"\"\n" + -// "}"; - String body="{\n" + "\t\"req_data\": {\n" + - "\t\t\"merchant_no\": \""+lakalaConfig.getMerchantNo()+"\",\n" + - "\t\t\"term_no\": \""+lakalaConfig.getTermNo()+"\",\n" + - "\t\t\"out_trade_no\": \""+out_trade_no+"\",\n" + + "\t\t\"merchant_no\": \""+merchantBackLkl.getExternalCustomerNo()+"\",\n" + + "\t\t\"term_no\": \""+merchantBackLkl.getTermNos()+"\",\n" + + "\t\t\"out_trade_no\": \""+order.getOrderNumber()+"\",\n" + "\t\t\"total_amount\": \""+order_amt+"\",\n" + - "\t\t\"subject\": \"测试\",\n" + + "\t\t\"subject\": \""+baseInfo.getMccName()+"\",\n" + "\t\t\"acc_busi_fields\": {},\n" + "\t\t\"notify_url\": \""+lakalaConfig.getCallBackUrl()+"\",\n" + "\t\t\"location_info\": {\n" + 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 9c6b7b1..65e22a8 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 @@ -236,9 +236,9 @@ public class LaKalaInterfaceImpl implements LaKalaInterface { object1.put("userNo", userNo); //合作机构信息 由拓客SAAS提供 object1.put("email", "chaozhanggui2023@163.com"); //商户邮箱 object1.put("busiCode", "PAPER_CODE");//业务类型 BPOS:传统POS, ZPOS:电签,ZPOS4G：4G电签,SUPER_POS:智能pos,B_WIZARD:蓝精灵,PAPER_CODE:码牌,WECHAT_PAY:专业化扫码,KLYX:云音箱,QRCODE:收款王,MONEY_BOX:收钱宝盒根据业务开放取值 - object1.put("merRegName", merchantBaseInfo.getMerchantName()); //商户注册名称 不能少于七个中文 + object1.put("merRegName", merchantBaseInfo.getAlias()); //商户注册名称 不能少于七个中文 object1.put("merType", (merchantBaseInfo.getMerchantType().equals(1)||merchantBaseInfo.getMerchantType().equals("2"))?"TP_PERSONAL":"TP_MERCHANT"); //商户注册类型 TP_MERCHANT:企业 TP_PERSONAL:⼩微个⼈ - object1.put("merName", merchantBaseInfo.getMerchantName()); //商户名称(经营名称) 不能少于七个中文 + object1.put("merName", merchantBaseInfo.getAlias()); //商户名称(经营名称) 不能少于七个中文 object1.put("merAddr", merchantBaseInfo.getAddress()); //去掉省，市区后的详细地址 object1.put("provinceCode", tbPlussRegionLklService.getOne(new QueryWrapper().likeRight("name",merchantBaseInfo.getProvince()).last("limit 1")).getCode()); //省代码 通过【地区信息→获取地区查询】接口获取 对应 code字段 object1.put("cityCode", tbPlussRegionLklService.getOne(new QueryWrapper().likeRight("name",merchantBaseInfo.getCity()).last("limit 1")).getCode()); // 市代码 通过【地区信息→获取地区查询】接口获取 对应 code字段