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

init

Browse Source
This commit is contained in:
dute7liang
2024-01-27 20:12:55 +08:00
parent d0a53c31a5
commit 716b2a2d7a
7 changed files with 92 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/PayController.java
View File

@@ -53,6 +53,10 @@ public class PayController {
return R.fail(600,"支付失败，未找到订单");
}
PayConfig payConfig = payConfigManager.getWxConfig();
if(payConfig == null){
log.error("支付失败，未找到可用的微信支付配置");
return R.fail(600,"支付失败，未找到可用的微信支付");
}
String ip = ServletUtils.getClientIP();
Map<String, String> params = UnifiedOrderModel
.builder()
@@ -103,6 +107,7 @@ public class PayController {
try {
boolean b = payConfigManager.initAliPay();
if(!b){
log.error("支付失败，未找到可用的支付宝配置");
return R.fail(600,"支付宝支付失败！请联系管理员");
}
AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();

7
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java
View File

@@ -8,6 +8,8 @@ import com.ruoyi.cai.domain.WithdrawExchange;
import com.ruoyi.cai.dto.app.vo.AgreementDTO;
import com.ruoyi.cai.dto.app.vo.GiftVo;
import com.ruoyi.cai.dto.app.vo.setting.SettingGoodsVo;
import com.ruoyi.cai.enums.SystemConfigEnum;
import com.ruoyi.cai.manager.SystemConfigManager;
import com.ruoyi.cai.service.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
@@ -37,12 +39,17 @@ public class SettingAppController {
private GiftService giftService;
@Autowired
private AgreementSettingService agreementSettingService;
@Autowired
private SystemConfigManager systemConfigManager;
@GetMapping("/goods")
@Operation(summary = "充值配置")
@Log(title = "充值配置", businessType = BusinessType.OTHER, isSaveDb = false)
public R<SettingGoodsVo> goods(){
SettingGoodsVo vo = new SettingGoodsVo();
vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_ALI_PAY));
vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY));
vo.setAlipayFirst(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.ALI_PAY_FIRST));
List<Goods> list = goodsService.list(Wrappers.lambdaQuery(Goods.class)
.eq(Goods::getStatus,0)
.orderByAsc(Goods::getPrice));