From cf5c4179a66d322e433fc6ba4df210b413355138 Mon Sep 17 00:00:00 2001 From: tangqian Date: Thu, 18 May 2023 16:35:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BE=AE=E4=BF=A1=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/buy/TopUpOrderController.java | 23 +++++--- .../shop/service/order/StoreOrderService.java | 2 + .../order/impl/StoreOrderServiceImpl.java | 24 ++++++-- .../shop/support/pay/AliPayStrategy.java | 4 +- .../shop/support/pay/WxPayStrategy.java | 1 + .../src/main/resources/1/apiclient_cert.p12 | Bin 2798 -> 2774 bytes .../src/main/resources/1/apiclient_cert.pem | 42 +++++++------- .../src/main/resources/1/apiclient_key.pem | 52 +++++++++--------- .../src/main/resources/application-local.yaml | 20 +++---- 9 files changed, 95 insertions(+), 73 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/buy/TopUpOrderController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/buy/TopUpOrderController.java index 8db055756..9e1dad4cd 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/buy/TopUpOrderController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/buy/TopUpOrderController.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.shop.controller.app.buy; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated; import cn.iocoder.yudao.module.shop.request.member.OrderContentRequest; import cn.iocoder.yudao.module.shop.request.member.RefundRequest; import cn.iocoder.yudao.module.shop.response.member.InitOrderResponse; @@ -9,11 +10,9 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import javax.annotation.security.PermitAll; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; @@ -32,22 +31,21 @@ public class TopUpOrderController { @Autowired private StoreOrderService storeOrderService; - + @PreAuthenticated @Operation(summary = "会员充值") @RequestMapping(value = "/memberTopUp", method = RequestMethod.POST) public CommonResult memberTopUp(@Valid @RequestBody OrderContentRequest request, HttpServletRequest servletRequest) throws Exception { log.info("initOrder会员充值===>{}", request); return CommonResult.success(storeOrderService.memberTopUp(request, servletRequest)); } - + @PreAuthenticated @Operation(summary = "退款") @RequestMapping(value = "/memberRefund", method = RequestMethod.POST) public CommonResult memberRefund(@Valid @RequestBody RefundRequest request, HttpServletRequest servletRequest) throws Exception { log.info("memberRefund会员退款===>{}", request); return CommonResult.success(storeOrderService.memberRefund(request, servletRequest)); } - - + @PreAuthenticated @Operation(summary = "申请退款") @RequestMapping(value = "/memberApplyRefund", method = RequestMethod.POST) public CommonResult memberApplyRefund(@Valid @RequestBody RefundRequest request){ @@ -55,4 +53,13 @@ public class TopUpOrderController { return CommonResult.success(storeOrderService.memberApplyRefund(request)); } + + @PermitAll + @Operation(summary = "获取openid") + @RequestMapping(value = "/getOpenId", method = RequestMethod.GET) + public CommonResult getOpenId(@RequestParam(value = "code") String code){ + log.info("获取openid===>{}", code); + return CommonResult.success(storeOrderService.getOpenId(code)); + } + } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/StoreOrderService.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/StoreOrderService.java index 295f253ad..c14a08a89 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/StoreOrderService.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/StoreOrderService.java @@ -403,4 +403,6 @@ public interface StoreOrderService extends IService { Boolean wxPayNotify(WxPayOrderNotifyV3Result.DecryptNotifyResult result); Boolean memberApplyRefund(RefundRequest request); + + String getOpenId(String code); } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java index 6af19f45a..ebe288fc5 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java @@ -46,7 +46,6 @@ import cn.iocoder.yudao.module.shop.utils.RedisUtil; import cn.iocoder.yudao.module.shop.vo.order.LogisticsResultVo; import cn.iocoder.yudao.module.shop.vo.order.StoreDateRangeSqlPram; import cn.iocoder.yudao.module.shop.vo.order.StoreOrderInfoOldVo; -import cn.iocoder.yudao.module.shop.vo.product.MyRecord; import com.alipay.api.AlipayApiException; import com.alipay.api.internal.util.AlipaySignature; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -59,6 +58,10 @@ import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; +import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken; +import me.chanjar.weixin.common.error.WxErrorException; +import me.chanjar.weixin.common.service.WxOAuth2Service; +import me.chanjar.weixin.mp.api.WxMpService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -130,12 +133,9 @@ public class StoreOrderServiceImpl extends ServiceImpl 0; } + @Override + public String getOpenId(String code) { + WxOAuth2AccessToken accessToken = null; + try { + accessToken = wxMpService.getOAuth2Service().getAccessToken(code); + return accessToken.getOpenId(); + } catch (WxErrorException e) { + e.printStackTrace(); + } + return null; + } + private RechargeOrderDO initializeOrder(OrderContentRequest request, String code, MemberUserRespDTO user) { RechargeOrderDO orderDO = new RechargeOrderDO(); diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/support/pay/AliPayStrategy.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/support/pay/AliPayStrategy.java index 43143873d..e8992adf6 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/support/pay/AliPayStrategy.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/support/pay/AliPayStrategy.java @@ -52,11 +52,11 @@ public class AliPayStrategy implements IPayStrategy { bizContent.put("total_amount", orderDO.getPayPrice()); //订单标题，不可使用特殊符号 bizContent.put("subject", "会员充值"); - bizContent.put("product_code", "FAST_INSTANT_TRADE_PAY"); + bizContent.put("product_code", "QUICK_WAP_WAY"); request.setBizContent(bizContent.toString()); AlipayTradeWapPayResponse response = null; try { - response = alipayClient.pageExecute(request); + response = alipayClient.pageExecute(request,"get"); orderResponse.setBody(response.getBody()); } catch (AlipayApiException e) { e.printStackTrace(); diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/support/pay/WxPayStrategy.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/support/pay/WxPayStrategy.java index 790a70c2a..1e95a8279 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/support/pay/WxPayStrategy.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/support/pay/WxPayStrategy.java @@ -36,6 +36,7 @@ public class WxPayStrategy implements IPayStrategy{ private WxPayOneAutoConfiguration wxPayOneAutoConfiguration; @Autowired private WxPayProperties payProperties; + @Override public InitOrderResponse pay(RechargeOrderDO orderDO, HttpServletRequest servletRequest,String openid) { InitOrderResponse response = new InitOrderResponse(); diff --git a/yudao-server/src/main/resources/1/apiclient_cert.p12 b/yudao-server/src/main/resources/1/apiclient_cert.p12 index 68aaa88cda12faa117b44ed5e5396d59591a2060..c63d0f08feaf5e2f3015778807ee12719821b454 100644 GIT binary patch delta 2643 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