From 9f111529de555f8cc76a0540ab007324dd909fc4 Mon Sep 17 00:00:00 2001 From: HH Date: Wed, 11 May 2022 20:10:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/pay/AlipayController.java | 6 ++---- .../com/ghy/web/controller/pay/WxPayController.java | 10 ++++------ .../main/java/com/ghy/common/adapay/AdapayService.java | 2 +- .../com/ghy/common/adapay/callback/model/Expend.java | 8 ++------ .../java/com/ghy/order/mapper/OrderMasterMapper.java | 7 +++++++ .../java/com/ghy/order/service/OrderMasterService.java | 8 ++++++++ .../ghy/order/service/impl/OrderMasterServiceImpl.java | 5 +++++ .../src/main/resources/mapper/OrderMasterMapper.xml | 5 +++++ 8 files changed, 34 insertions(+), 17 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java b/ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java index af00a874..9ffffd96 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java @@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; import java.util.Map; /** @@ -36,11 +35,10 @@ public class AlipayController extends BaseController { */ @PostMapping("qr") public AjaxResult qrPay(String orderMasterCode) { - List orderMasters = orderMasterService.selectOrderMasterList(new OrderMaster(orderMasterCode)); - if (orderMasters.isEmpty()) { + OrderMaster orderMaster = orderMasterService.selectByCode(orderMasterCode); + if (orderMaster == null) { return AjaxResult.error("订单不存在"); } - OrderMaster orderMaster = orderMasters.get(0); Map map; try { // TODO 订单里需要补充支付金额、tittle、简要描述、分账信息、description diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java b/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java index eacd3ccc..f77fea12 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java @@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.IOException; -import java.util.List; import java.util.Map; @Controller @@ -44,11 +43,10 @@ public class WxPayController extends BaseController { public AjaxResult litePay(HttpServletRequest request) { String code = request.getParameter("code"); String orderMasterCode = request.getParameter("orderMasterCode"); - List orderMasters = orderMasterService.selectOrderMasterList(new OrderMaster(orderMasterCode)); - if (orderMasters.isEmpty()) { + OrderMaster orderMaster = orderMasterService.selectByCode(orderMasterCode); + if (orderMaster == null) { return AjaxResult.error("订单不存在"); } - OrderMaster orderMaster = orderMasters.get(0); JSONObject wxUser; try { wxUser = WxUtils.getOpenid(code, wxConfig.getAppId(), wxConfig.getSecret()); @@ -59,7 +57,7 @@ public class WxPayController extends BaseController { String openId = wxUser.getString("openid"); //调用adapay微信公众号支付. WxLiteExpend expend = new WxLiteExpend(); - expend.setOpen_id(openId); + expend.setOpenId(openId); Map map; try { // TODO 订单里需要补充支付金额、tittle、简要描述、分账信息、description @@ -94,7 +92,7 @@ public class WxPayController extends BaseController { logger.info("open id is " + openId); //调用adapay微信公众号支付. WxLiteExpend expend = new WxLiteExpend(); - expend.setOpen_id(openId); + expend.setOpenId(openId); Map map = adapayService.wxPubPay(payCallback, expend, "wxPay123456" + Math.ceil(Math.random() * 100), "1.00", "测试商品", "测试商品detail", null, "description"); //拼接消息给前端.前端通过JSAPI调用微信支付 diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java b/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java index b4b890a4..2b6580a9 100644 --- a/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java +++ b/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java @@ -159,7 +159,7 @@ public class AdapayService { } /** - * 微信小程序支付 + * 微信公众号支付 */ public Map wxPubPay(PayCallback callback, WxLiteExpend expend, String orderNo, String payAmt, String goodsTittle, String goodsDesc, String divMembers, String description) throws BaseAdaPayException { diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/callback/model/Expend.java b/ghy-common/src/main/java/com/ghy/common/adapay/callback/model/Expend.java index 35d42572..1761d988 100644 --- a/ghy-common/src/main/java/com/ghy/common/adapay/callback/model/Expend.java +++ b/ghy-common/src/main/java/com/ghy/common/adapay/callback/model/Expend.java @@ -1,14 +1,10 @@ package com.ghy.common.adapay.callback.model; -import lombok.Data; - /** + * 所有支付渠道扩展参数的父类 + * * @author HH 2022/3/31 */ -@Data public class Expend { - private String open_id; - - } diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java index 6825bf1d..81692d6d 100644 --- a/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java +++ b/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java @@ -49,4 +49,11 @@ public interface OrderMasterMapper { */ OrderMaster checkOrderMasterCodeUnique(String orderMasterCode); + /** + * 用 OrderMaster 查询主订单信息 + * + * @param orderMasterCode 主订单code + * @return 主订单信息 + */ + OrderMaster selectByCode(String orderMasterCode); } diff --git a/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java b/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java index 3c64b78b..22039065 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java +++ b/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java @@ -36,6 +36,14 @@ public interface OrderMasterService { */ OrderMaster selectById(Long orderMasterId); + /** + * 用 OrderMaster 查询主订单信息 + * + * @param orderMasterCode 主订单code + * @return 主订单信息 + */ + OrderMaster selectByCode(String orderMasterCode); + /** * @param ids 主订单ids * @return 删除结果 diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java index 3252b917..829ef00b 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java @@ -41,6 +41,11 @@ public class OrderMasterServiceImpl implements OrderMasterService { return orderMasterMapper.selectById(orderMasterId); } + @Override + public OrderMaster selectByCode(String orderMasterCode) { + return orderMasterMapper.selectByCode(orderMasterCode); + } + @Override public int deleteOrderMasterByIds(String ids) { Long[] orderMasterIds = Convert.toLongArray(ids); diff --git a/ghy-order/src/main/resources/mapper/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/OrderMasterMapper.xml index f2f895f8..a1ec8df0 100644 --- a/ghy-order/src/main/resources/mapper/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/OrderMasterMapper.xml @@ -133,4 +133,9 @@ WHERE `code` =#{orderMasterCode} LIMIT 1 + + \ No newline at end of file