diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/PayApi.java b/ruoyi-admin/src/main/java/com/ruoyi/api/PayApi.java index feb173e..9e8ba68 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/PayApi.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/PayApi.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; @@ -49,7 +50,7 @@ public class PayApi { */ @ApiOperation(value = "统一下单-统一接口", notes = "统一下单-统一接口") @GetMapping("/prepayment") - public PrepayWithRequestPaymentResponse transactions(String type, String orderNo) throws SignatureException, NoSuchAlgorithmException, InvalidKeyException, IOException { + public PrepayWithRequestPaymentResponse transactions( String orderNo) { LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); queryWrapper.eq(MemberOrder::getOrderNo,orderNo).last("limit 1"); MemberOrder memberOrder = memberOrderService.getOne(queryWrapper); @@ -89,6 +90,7 @@ public class PayApi { @ApiOperation(value = "支付回调", notes = "支付回调") @PostMapping("/payNotify") + @Anonymous public Map payNotify(@RequestBody JSONObject jsonObject) throws GeneralSecurityException, IOException { String key = wechatPayConfig.getApiV3Key(); String json = jsonObject.toString(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java b/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java index 2b1134f..111a7cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java @@ -35,7 +35,7 @@ public class WxApi { @Anonymous public Map getCodeUrl(String userType) { Map res = new HashMap<>(); - res.put("codeUrl", weChatUtils.getCodeUrl("https://www.nuoyunr.com/#/pages/mine/member/member-card", userType)); + res.put("codeUrl", weChatUtils.getCodeUrl("https://www.ddtg.site/#/pages/mine/member/member-card", userType)); return res; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberOrderController.java index ddc6a83..1838466 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberOrderController.java @@ -1,5 +1,6 @@ package com.ruoyi.member.controller; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Log; @@ -97,8 +98,10 @@ public class MemberOrderController extends BaseController { @Log(title = "订单", businessType = BusinessType.INSERT) @PostMapping("/uniSaveOrder") public AjaxResult add(@RequestBody MemberOrder memberOrder) { - memberOrderService.saveOrder(memberOrder); - return success(); + String orderNo = memberOrderService.saveOrder(memberOrder); + JSONObject res =new JSONObject(); + res.put("orderNo",orderNo); + return success(res); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberOrderService.java index 5a5391e..dd0700d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberOrderService.java @@ -40,5 +40,5 @@ public interface IMemberOrderService extends IService { * @date 14:02 2025/4/8 * @param memberOrder {@link MemberOrder} **/ - void saveOrder(MemberOrder memberOrder); + String saveOrder(MemberOrder memberOrder); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java index d4d7cba..b68091c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java @@ -89,7 +89,7 @@ public class MemberOrderServiceImpl extends ServiceImpl