This commit is contained in:
77
2024-03-24 19:07:45 +08:00
parent d0b1f961e8
commit e6611ea05e
45 changed files with 935 additions and 104 deletions

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.AccountChangeLog;
import com.ruoyi.xq.dto.admin.log.AccountChangeLogAdminVo;
import com.ruoyi.xq.service.AccountChangeLogService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -42,8 +43,8 @@ public class AccountChangeLogController extends BaseController {
*/
@SaCheckPermission("xq:accountChangeLog:list")
@GetMapping("/list")
public TableDataInfo<AccountChangeLog> list(AccountChangeLog bo, PageQuery pageQuery) {
Page<AccountChangeLog> page = accountChangeLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<AccountChangeLogAdminVo> list(AccountChangeLogAdminVo bo, PageQuery pageQuery) {
Page<AccountChangeLogAdminVo> page = accountChangeLogService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}

View File

@@ -0,0 +1,33 @@
package com.ruoyi.xq.controller.app;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.xq.domain.VipOrder;
import com.ruoyi.xq.enums.pay.PlatformTypeEnum;
import com.ruoyi.xq.manager.PayManager;
import com.ruoyi.xq.service.VipOrderService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/api/test")
@Tag(name = "测试接口")
public class PayTestController {
@Autowired
private VipOrderService vipOrderService;
@Autowired
private PayManager payManager;
@GetMapping("/vip")
@Operation(summary = "vip支付流程")
public R<Void> testVip(Long vipPriceSettingId){
VipOrder vipOrder = vipOrderService.createVipOrder(LoginHelper.getUserId(), vipPriceSettingId);
payManager.callBack(vipOrder.getOrderNo(),null,null, PlatformTypeEnum.WX);
return R.ok();
}
}