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

nnnn

Browse Source
This commit is contained in:
777
2025-11-29 17:37:28 +08:00
parent 7f9b7bc639
commit 52ea057ea1
15 changed files with 159 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountController.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.Account;
import com.ruoyi.cai.dto.AddRechargeOrderAdminDto;
import com.ruoyi.cai.dto.admin.vo.AccountAdminVo;
import com.ruoyi.cai.manager.ConsumerManager;
import com.ruoyi.cai.service.AccountService;
import com.ruoyi.cai.service.RechargeOrderService;
import com.ruoyi.common.annotation.Log;
@@ -16,6 +17,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.enums.BusinessType;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -58,12 +60,15 @@ public class AccountController extends BaseController {
return R.ok(accountService.getById(id));
}
@Autowired
private ConsumerManager consumerManager;
@SaCheckPermission("cai:account:add")
@Log(title = "用户账户调账", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/updateCoin")
public R<Void> add(@RequestBody AddRechargeOrderAdminDto bo) {
rechargeOrderService.updateAdminRechargeOrder(bo);
consumerManager.rechargeOrderSuccessAdmin(bo);
return R.ok();
}
}

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java
View File

@@ -144,22 +144,22 @@ public class PayController {
@Operation(summary = "微信支付efps")
@Log(title = "微信支付efps", businessType = BusinessType.OTHER, isSaveDb = true)
@SaIgnore
public R<WechatJSAPIResponse> efpsWx(HttpServletRequest request, @RequestBody V14PayDTO payDTO){
public V14R<WechatJSAPIResponse> efpsWx(HttpServletRequest request, @RequestBody V14PayDTO payDTO){
String efpsToken = request.getHeader("Efps-Token");
if(StringUtils.isBlank(efpsToken)){
return R.fail(600,"支付失败，鉴权失败或者未找到订单");
return V14R.fail14(600,"支付失败，鉴权失败或者未找到订单");
}
V14Token v14Token = v14Manager.checkToken(efpsToken);
if(v14Token == null){
return R.fail(600,"支付失败，鉴权失败或者未找到订单");
return V14R.fail14(600,"支付失败，鉴权失败或者未找到订单");
}
PayTrdConfig payTrdConfig = payTrdConfigService.getById(v14Token.getPayTrdConfigId());
if(payTrdConfig == null){
return R.fail(600,"支付失败，未找到支付通道信息");
return V14R.fail14(600,"支付失败，未找到支付通道信息");
}
PayOrderInfoDTO payOrderInfo = payManager.getOrderInfo(v14Token.getOrderNo(),true);
if(payOrderInfo == null){
return R.fail(600,"支付失败，未找到订单");
return V14R.fail14(600,"支付失败，未找到订单");
}
try {
V14ExtendMapDTO extendMap = JSON.parseObject(payTrdConfig.getExtendData(), V14ExtendMapDTO.class);
@@ -167,10 +167,12 @@ public class PayController {
payOrderInfo.setOpenId(openId);
} catch (IOException e) {
log.error("获取openid失败",e);
return R.fail(600,"微信登录失败");
return V14R.fail14(600,"微信登录失败");
}
WechatJSAPIResponse pay = v14Manager.pay(payOrderInfo, payTrdConfig);
return R.ok(pay);
V14R<WechatJSAPIResponse> result = V14R.ok14(pay);
result.setWxJsapiParam(pay.getWxJsapiParam());
return result;
}