From 5904eab4657823df6c7f4baa594d91f779a113dc Mon Sep 17 00:00:00 2001 From: 77 <77@77.com> Date: Sat, 27 Apr 2024 23:50:58 +0800 Subject: [PATCH] init --- .../xq/controller/AuthOrderController.java | 5 +- .../xq/controller/app/PayController.java | 47 ------------------- .../com/ruoyi/xq/mapper/AuthOrderMapper.java | 3 +- .../ruoyi/xq/service/AuthOrderService.java | 3 +- .../xq/service/impl/AuthOrderServiceImpl.java | 3 +- .../resources/mapper/xq/AuthOrderMapper.xml | 2 +- 6 files changed, 10 insertions(+), 53 deletions(-) diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/AuthOrderController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/AuthOrderController.java index a47c2cc..e884a26 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/AuthOrderController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/AuthOrderController.java @@ -13,6 +13,7 @@ import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.xq.domain.AuthOrder; +import com.ruoyi.xq.dto.admin.authOrder.AuthOrderAdminVo; import com.ruoyi.xq.service.AuthOrderService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -41,8 +42,8 @@ public class AuthOrderController extends BaseController { */ @SaCheckPermission("xq:authOrder:list") @GetMapping("/list") - public TableDataInfo list(AuthOrder bo, PageQuery pageQuery) { - Page page = authOrderService.pageAdmin(pageQuery, bo); + public TableDataInfo list(AuthOrderAdminVo bo, PageQuery pageQuery) { + Page page = authOrderService.pageAdmin(pageQuery, bo); return TableDataInfo.build(page); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/PayController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/PayController.java index 92293c9..c7d9cfc 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/PayController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/PayController.java @@ -48,53 +48,6 @@ public class PayController { private static final String NOTIFY_WX_URL = "/api/pay/wx/notify"; private static final String NOTIFY_ALI_URL = "/api/pay/ali/notify"; - @PostMapping(value = "/jsapi/wx/test") - @Operation(summary = "微信支付-公众号-测试") - @Log(title = "微信支付-公众号-测试", businessType = BusinessType.OTHER, isSaveDb = true) - public R jsapiPayTest(@RequestBody PayControllerDTO payController){ - String openId = payController.getOpenId(); - if (StrUtil.isEmpty(openId)) { - return R.fail("openid is null"); - } - String ip = ServletUtils.getClientIP(); - Map params = UnifiedOrderModel - .builder() - .appid(wxPayProperties.getAppId()) - .mch_id(wxPayProperties.getMchId()) - .nonce_str(WxPayKit.generateStr()) - .body("测试发起支付") - .out_trade_no(WxPayKit.generateStr()) - .total_fee("1000") - .spbill_create_ip(ip) - .notify_url(wxPayProperties.getNotifyUrl()+NOTIFY_WX_URL) - .trade_type(TradeType.JSAPI.getTradeType()) - .openid(openId) - .build() - .createSign(wxPayProperties.getPartnerKey(), SignType.HMACSHA256); - String xmlResult = WxPayApi.pushOrder(false, params); - log.info(xmlResult); - Map resultMap = WxPayKit.xmlToMap(xmlResult); - String returnCode = resultMap.get("return_code"); - String returnMsg = resultMap.get("return_msg"); - if (!WxPayKit.codeIsOk(returnCode)) { - log.error("j微信支付失败 returnMsg={}",returnMsg); - return R.fail("微信支付失败，请联系客服"); - } - String resultCode = resultMap.get("result_code"); - if (!WxPayKit.codeIsOk(resultCode)) { - log.error("j微信支付失败 returnMsg={}",returnMsg); - return R.fail("微信支付失败，请联系客服"); - } - // 以下字段在 return_code 和 result_code 都为 SUCCESS 的时候有返回 - String prepayId = resultMap.get("prepay_id"); - Map packageParams = WxPayKit.prepayIdCreateSign(prepayId, wxPayProperties.getAppId(), - wxPayProperties.getPartnerKey(), SignType.HMACSHA256); - String jsonStr = JSON.toJSONString(packageParams); - PayReturnResp resp = new PayReturnResp(); - resp.setData(jsonStr); - return R.ok(resp); - } - @PostMapping(value = "/jsapi/wx") @Operation(summary = "微信支付-公众号") @Log(title = "微信支付-公众号", businessType = BusinessType.OTHER, isSaveDb = true) diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/AuthOrderMapper.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/AuthOrderMapper.java index fce88f1..8ab7bb9 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/AuthOrderMapper.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/AuthOrderMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.xq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.xq.domain.AuthOrder; +import com.ruoyi.xq.dto.admin.authOrder.AuthOrderAdminVo; import org.apache.ibatis.annotations.Param; /** @@ -13,5 +14,5 @@ import org.apache.ibatis.annotations.Param; */ public interface AuthOrderMapper extends BaseMapper { - Page pageAdmin(@Param("build") Page build, @Param("bo") AuthOrder bo); + Page pageAdmin(@Param("build") Page build, @Param("bo") AuthOrderAdminVo bo); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/AuthOrderService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/AuthOrderService.java index 17d57f9..96a6399 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/AuthOrderService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/AuthOrderService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.xq.domain.AuthOrder; +import com.ruoyi.xq.dto.admin.authOrder.AuthOrderAdminVo; import com.ruoyi.xq.dto.app.pay.ConsumeResp; import com.ruoyi.xq.enums.pay.PlatformTypeEnum; import org.springframework.transaction.annotation.Transactional; @@ -18,7 +19,7 @@ import java.util.Map; */ public interface AuthOrderService extends IService { - Page pageAdmin(PageQuery pageQuery, AuthOrder bo); + Page pageAdmin(PageQuery pageQuery, AuthOrderAdminVo bo); AuthOrder createVipOrder(Long userId); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AuthOrderServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AuthOrderServiceImpl.java index df4378b..33a0a4a 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AuthOrderServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AuthOrderServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.xq.domain.AuthOrder; import com.ruoyi.xq.domain.User; +import com.ruoyi.xq.dto.admin.authOrder.AuthOrderAdminVo; import com.ruoyi.xq.dto.app.pay.ConsumeResp; import com.ruoyi.xq.enums.common.OrderTypeEnum; import com.ruoyi.xq.enums.common.TraceIdEnum; @@ -39,7 +40,7 @@ public class AuthOrderServiceImpl extends ServiceImpl private UserService userService; @Override - public Page pageAdmin(PageQuery pageQuery, AuthOrder bo) { + public Page pageAdmin(PageQuery pageQuery, AuthOrderAdminVo bo) { return baseMapper.pageAdmin(pageQuery.build(), bo); } diff --git a/ruoyi-xq/src/main/resources/mapper/xq/AuthOrderMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/AuthOrderMapper.xml index 7320326..4d266b0 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/AuthOrderMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/AuthOrderMapper.xml @@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select t1.*, t2.nickname,t2.mobile,t2.avatar from xq_auth_order t1 left join xq_user t2 on t1.user_id = t2.id