dianliang/dl_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发布通告功能

Browse Source
This commit is contained in:
13405411873 2025-04-24 17:10:08 +08:00
parent 4e101697cf
commit fbb22469de
7 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/api/PayApi.java
View File

@ -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<MemberOrder> 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<String, String> payNotify(@RequestBody JSONObject jsonObject) throws GeneralSecurityException, IOException {
String key = wechatPayConfig.getApiV3Key();
String json = jsonObject.toString();

2
ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java
View File

@ -35,7 +35,7 @@ public class WxApi {
@Anonymous
public Map<String, String> getCodeUrl(String userType) {
Map<String, String> 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;
}

7
ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberOrderController.java
View File

@ -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);
}
/**

2
ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberOrderService.java
View File

@ -40,5 +40,5 @@ public interface IMemberOrderService extends IService<MemberOrder> {
* @date 14:02 2025/4/8
* @param memberOrder {@link MemberOrder}
**/
void saveOrder(MemberOrder memberOrder);
String saveOrder(MemberOrder memberOrder);
}

4
ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java
View File

@ -89,7 +89,7 @@ public class MemberOrderServiceImpl extends ServiceImpl<MemberOrderMapper, Membe
* @date 14:02 2025/4/8
**/
@Override
public void saveOrder(MemberOrder memberOrder) {
public String saveOrder(MemberOrder memberOrder) {
//获取当前登录用户
LoginUser securityUser = SecurityUtils.getLoginUser();
memberOrder.setUserId(securityUser.getUserId());
@ -97,7 +97,7 @@ public class MemberOrderServiceImpl extends ServiceImpl<MemberOrderMapper, Membe
memberOrder.setOrderNo(generateOrderId());
//保存订单数据
save(memberOrder);
return memberOrder.getOrderNo();
}
/**

1
ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java
View File

@ -274,6 +274,7 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
user = wxUser;
if(!userInfo.get("openid").equals(user.getOpenId())){
user.setWxOpenId((String) userInfo.get("openid"));
user.setUnionId((String) userInfo.get("unionid"));
user.setUpdateTime(DateUtils.getNowDate());
userMapper.updateUser(user);
}

8
ruoyi-admin/src/main/resources/application.yml
View File

@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 8080
port: 8099
servlet:
# 应用的访问路径
context-path: /
@ -157,12 +157,12 @@ wxpay:
# 微信支付V3-url前缀
baseUrl: https://api.mch.weixin.qq.com/v3
# 支付通知回调, pjm6m9.natappfree.cc 为内网穿透地址
notifyUrl: https://www.nuoyunr.com/notice/notify/payNotify
notifyUrl: https://3w823u8516.vicp.fun/noticeApi/payApi/payNotify
# 退款通知回调, pjm6m9.natappfree.cc 为内网穿透地址
refundNotifyUrl: https://www.nuoyunr.com/notice/notify/refundNotify
refundNotifyUrl: https://www.ddtg.site/notice/notify/refundNotify
# 密钥路径,resources根目录下
privateKeyPath: D:/任务平台项目/dl_admin/ruoyi-admin/src/main/resources/apiclient_key.pem
publicKeyPath: D:/任务平台项目/dl_admin/ruoyi-admin/src/main/resources/public_key.pem
publicKeyPath: D:/任务平台项目/dl_admin/ruoyi-admin/src/main/resources/pub_key.pem
#商户证书序列号
serialNo: 7FCDB0E72D6A928013361ACB77FA3F0DCBD370E3
publicKeyId: PUB_KEY_ID_0117124479362025041500321584003200