shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
77
2024-04-27 23:50:58 +08:00
parent f643d4a8df
commit 5904eab465
6 changed files with 10 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/AuthOrderController.java
View File

@@ -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<AuthOrder> list(AuthOrder bo, PageQuery pageQuery) {
Page<AuthOrder> page = authOrderService.pageAdmin(pageQuery, bo);
public TableDataInfo<AuthOrderAdminVo> list(AuthOrderAdminVo bo, PageQuery pageQuery) {
Page<AuthOrderAdminVo> page = authOrderService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}

47
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/PayController.java
View File

@@ -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<PayReturnResp> jsapiPayTest(@RequestBody PayControllerDTO payController){
String openId = payController.getOpenId();
if (StrUtil.isEmpty(openId)) {
return R.fail("openid is null");
}
String ip = ServletUtils.getClientIP();
Map<String, String> 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<String, String> 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<String, String> 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)

3
ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/AuthOrderMapper.java
View File

@@ -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<AuthOrder> {
Page<AuthOrder> pageAdmin(@Param("build") Page<Object> build, @Param("bo") AuthOrder bo);
Page<AuthOrderAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") AuthOrderAdminVo bo);
}

3
ruoyi-xq/src/main/java/com/ruoyi/xq/service/AuthOrderService.java
View File

@@ -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<AuthOrder> {
Page<AuthOrder> pageAdmin(PageQuery pageQuery, AuthOrder bo);
Page<AuthOrderAdminVo> pageAdmin(PageQuery pageQuery, AuthOrderAdminVo bo);
AuthOrder createVipOrder(Long userId);

3
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AuthOrderServiceImpl.java
View File

@@ -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<AuthOrderMapper,AuthOrder>
private UserService userService;
@Override
public Page<AuthOrder> pageAdmin(PageQuery pageQuery, AuthOrder bo) {
public Page<AuthOrderAdminVo> pageAdmin(PageQuery pageQuery, AuthOrderAdminVo bo) {
return baseMapper.pageAdmin(pageQuery.build(), bo);
}