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

数据

Browse Source
This commit is contained in:
77
2024-11-25 14:56:41 +08:00
parent f57a8d41f6
commit ab685878b7
14 changed files with 181 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java
View File

@@ -1,7 +1,9 @@
package com.ruoyi.web.controller.cai.admin.init;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.cai.service.CitysService;
import com.ruoyi.cai.trdpay.TrdPayManager;
import com.ruoyi.common.core.domain.R;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,10 +20,24 @@ public class CityController {
@Autowired
private CitysService citysService;
@Autowired
private TrdPayManager trdPayManager;
@GetMapping("/resetRedis")
public R<Void> resetRedis(){
citysService.resetRedis();
return R.ok();
}
@GetMapping("/resetOrder")
public R<JSONObject> resetOrder(String orderNo){
JSONObject jsonObject = trdPayManager.resetOrder(orderNo);
return R.ok(jsonObject);
}
@GetMapping("/queryOrder")
public R<JSONObject> queryOrder(String orderNo){
JSONObject jsonObject = trdPayManager.queryOrder(orderNo);
return R.ok(jsonObject);
}
}

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

@@ -15,6 +15,7 @@ import com.ijpay.core.kit.WxPayKit;
import com.ijpay.wxpay.WxPayApi;
import com.ijpay.wxpay.model.UnifiedOrderModel;
import com.ruoyi.cai.domain.PayConfig;
import com.ruoyi.cai.dto.app.vo.pay.OrderPayStatusResp;
import com.ruoyi.cai.enums.SystemConfigEnum;
import com.ruoyi.cai.manager.SystemConfigManager;
import com.ruoyi.cai.pay.*;
@@ -30,10 +31,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
@@ -56,21 +54,28 @@ public class PayController {
private TrdPayManager trdPayManager;
@Autowired
private SystemConfigManager systemConfigManager;
private static final String NOTIFY_WX_URL = "/api/pay/wx/notify";
private static final String NOTIFY_ALI_URL = "/api/pay/ali/notify";
@PostMapping(value = "/trdAli")
@Operation(summary = "第三方支付宝支付")
@Log(title = "第三方支付宝支付", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Map<String,Object>> checkPayType(){
Integer payInit = systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.COS_DOMAIN);
@GetMapping(value = "/checkPay")
@Operation(summary = "检查使用的支付方式")
@Log(title = "检查使用的支付方式", businessType = BusinessType.OTHER, isSaveDb = true)
public R<UsePayResp> checkPayType(){
Long userId = LoginHelper.getUserId();
boolean userTrdPay = trdPayManager.useTrdPay(userId);
UsePayResp usePayResp = new UsePayResp();
usePayResp.setPayType(userTrdPay?2:1);
return R.ok(usePayResp);
}
@GetMapping(value = "/findOrderPay")
@Operation(summary = "查询订单支付状态")
@Log(title = "查询订单支付状态", businessType = BusinessType.OTHER, isSaveDb = true)
public R<OrderPayStatusResp> findOrderPay(String orderNo){
OrderPayStatusResp orderPayStatusResp = payManager.getOrderPayStatus(orderNo);
return R.ok(orderPayStatusResp);
}
@PostMapping(value = "/trdAli")
@Operation(summary = "第三方支付宝支付")

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java
View File

@@ -15,9 +15,11 @@ import com.ruoyi.cai.enums.SystemConfigEnum;
import com.ruoyi.cai.enums.account.AccountCateEnum;
import com.ruoyi.cai.manager.SystemConfigManager;
import com.ruoyi.cai.service.*;
import com.ruoyi.cai.trdpay.TrdPayManager;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.BeanConvertUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -46,6 +48,8 @@ public class SettingAppController {
private AgreementSettingService agreementSettingService;
@Autowired
private SystemConfigManager systemConfigManager;
@Autowired
private TrdPayManager trdPayManager;
@GetMapping("/goods")
@Operation(summary = "充值配置")
@@ -55,6 +59,8 @@ public class SettingAppController {
vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_ALI_PAY));
vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY));
vo.setAlipayFirst(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.ALI_PAY_FIRST));
boolean useTrdPay = trdPayManager.useTrdPay(LoginHelper.getUserId());
vo.setUseTrdPay(useTrdPay?1:0);
List<Goods> list = goodsService.list(Wrappers.lambdaQuery(Goods.class)
.eq(Goods::getStatus,0)
.orderByAsc(Goods::getPrice));