diff --git a/payment-base-app/src/main/java/com/base/springcloud/controller/NoticeController.java b/payment-base-app/src/main/java/com/base/springcloud/controller/NoticeController.java index f229833..758bcfe 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/controller/NoticeController.java +++ b/payment-base-app/src/main/java/com/base/springcloud/controller/NoticeController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/notice") public class NoticeController { + @ApiOperation(value = "支付通知", notes = "支付结果通知接口") @PostMapping("/payNotice") public NoticeRspDTO payNotice(@RequestBody NoticeReqDTO noticeReqDTO) { diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java index 4319daa..6c07bb5 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java @@ -2,10 +2,14 @@ package com.base.springcloud.service.imp; import com.base.springcloud.bo.MerchantConfigBO; import com.base.springcloud.bo.OrderBO; +import com.base.springcloud.constant.PaymentConstant; import com.base.springcloud.dao.MerchantConfigMapper; import com.base.springcloud.entity.MerchantConfig; +import com.base.springcloud.entity.WxpayTradeVo; import com.base.springcloud.service.MerchantService; import com.base.springcloud.util.FtpUtil; +import com.base.springcloud.util.WxpayUtils; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -159,4 +163,18 @@ public class MerchantServiceImp implements MerchantService { } return null; } + + /*public static void main(String[] args) { + WxpayTradeVo wxpayTradeVo = new WxpayTradeVo(); + wxpayTradeVo.setAppid("wxd678efh567hg6787"); + wxpayTradeVo.setMchid("1230000109"); + wxpayTradeVo.setDescription("Image形象店-深圳腾大-QQ公仔"); + wxpayTradeVo.setOut_trade_no("20220301095644"); + wxpayTradeVo.setNotify_url("https://www.weixin.qq.com/wxpay/pay.php"); + WxpayTradeVo.WxTradeAmountVo wxTradeAmountVo = new WxpayTradeVo.WxTradeAmountVo(); + wxTradeAmountVo.setTotal(1l); + wxTradeAmountVo.setCurrency("CNY"); + wxpayTradeVo.setAmount(wxTradeAmountVo); + ObjectNode objectNode = WxpayUtils.getWxpay(wxpayTradeVo, PaymentConstant.NATIVE,"114233","1069818635","13587645303"); + }*/ } \ No newline at end of file diff --git a/payment-base-app/src/main/java/com/base/springcloud/util/WxpayUtils.java b/payment-base-app/src/main/java/com/base/springcloud/util/WxpayUtils.java index 3546c82..f12e360 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/util/WxpayUtils.java +++ b/payment-base-app/src/main/java/com/base/springcloud/util/WxpayUtils.java @@ -59,12 +59,9 @@ public class WxpayUtils { String responseBody = response(JSON.toJSONString(tradeVo), getUrl(scene), tradeVo.getMchid(), privateKey, certificate, serialNo); log.info("======>>> wxpay response body: ", responseBody); // parse - @SuppressWarnings("unchecked") Map resultMap = StringHelper.json2map(responseBody); - // ... ObjectMapper objectMapper = new ObjectMapper(); ObjectNode objectNode = objectMapper.createObjectNode(); - // ... if (PaymentConstant.NATIVE.equals(scene)) {// pc - 扫码支付(Native) objectNode.put("code_url", resultMap.get("code_url")); } else if (PaymentConstant.H5.equals(scene)) {// 手机网页(H5)