dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-10-14 13:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix 编译错误处理

Browse Source
This commit is contained in:
bootx
2024-10-05 23:24:15 +08:00
parent f28e7807a6
commit 7bfc936ae6
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/unipay/ChannelAuthController.java
View File

@@ -41,7 +41,7 @@ public class ChannelAuthController {
@PostMapping("/generateAuthUrl") @PostMapping("/generateAuthUrl")
public Result<AuthUrlResult> generateAuthUrl(@RequestBody GenerateAuthUrlParam param){ public Result<AuthUrlResult> generateAuthUrl(@RequestBody GenerateAuthUrlParam param){
ValidationUtil.validateParam(param); ValidationUtil.validateParam(param);
paymentAssistService.initMchAndApp(param.getAppId()); paymentAssistService.initMchApp(param.getAppId());
return Res.ok(channelAuthService.generateAuthUrl(param)); return Res.ok(channelAuthService.generateAuthUrl(param));
} }
@@ -55,7 +55,7 @@ public class ChannelAuthController {
@Operation(summary = "通过AuthCode获取并设置认证结果") @Operation(summary = "通过AuthCode获取并设置认证结果")
@PostMapping("/authAndSet") @PostMapping("/authAndSet")
public Result<Void> authAndSet(@RequestBody AuthCodeParam param){ public Result<Void> authAndSet(@RequestBody AuthCodeParam param){
paymentAssistService.initMchAndApp(param.getAppId()); paymentAssistService.initMchApp(param.getAppId());
channelAuthService.auth(param); channelAuthService.auth(param);
return Res.ok(); return Res.ok();
} }

19
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/unipay/ChannelCashierController.java
View File

@@ -9,8 +9,6 @@ import org.dromara.daxpay.core.param.cashier.CashierAuthUrlParam;
import org.dromara.daxpay.core.param.cashier.CashierPayParam; import org.dromara.daxpay.core.param.cashier.CashierPayParam;
import org.dromara.daxpay.core.result.assist.AuthResult; import org.dromara.daxpay.core.result.assist.AuthResult;
import org.dromara.daxpay.core.result.trade.pay.PayResult; import org.dromara.daxpay.core.result.trade.pay.PayResult;
import org.dromara.daxpay.service.common.cache.MerchantCacheService;
import org.dromara.daxpay.service.entity.merchant.Merchant;
import org.dromara.daxpay.service.result.config.ChannelCashierConfigResult; import org.dromara.daxpay.service.result.config.ChannelCashierConfigResult;
import org.dromara.daxpay.service.service.assist.PaymentAssistService; import org.dromara.daxpay.service.service.assist.PaymentAssistService;
import org.dromara.daxpay.service.service.cashier.ChannelCashierService; import org.dromara.daxpay.service.service.cashier.ChannelCashierService;
@@ -38,19 +36,10 @@ public class ChannelCashierController {
private final ChannelCashierConfigService cashierConfigService; private final ChannelCashierConfigService cashierConfigService;
private final MerchantCacheService merchantCacheService;
@Operation(summary = "获取商户名称")
@GetMapping("/getMchName")
public Result<String> getMchName(String mchNo){
Merchant merchant = merchantCacheService.get(mchNo);
return Res.ok(merchant.getMchName());
}
@Operation(summary = "获取收银台信息") @Operation(summary = "获取收银台信息")
@GetMapping("/getCashierType") @GetMapping("/getCashierType")
public Result<ChannelCashierConfigResult> getCashierType(String cashierType,String appId){ public Result<ChannelCashierConfigResult> getCashierType(String cashierType,String appId){
paymentAssistService.initMchAndApp(appId); paymentAssistService.initMchApp(appId);
return Res.ok(cashierConfigService.findByCashierType(cashierType)); return Res.ok(cashierConfigService.findByCashierType(cashierType));
} }
@@ -59,7 +48,7 @@ public class ChannelCashierController {
@PostMapping("/generateAuthUrl") @PostMapping("/generateAuthUrl")
public Result<String> generateAuthUrl(@RequestBody CashierAuthUrlParam param){ public Result<String> generateAuthUrl(@RequestBody CashierAuthUrlParam param){
ValidationUtil.validateParam(param); ValidationUtil.validateParam(param);
paymentAssistService.initMchAndApp(param.getMchNo(), param.getAppId()); paymentAssistService.initMchApp(param.getAppId());
return Res.ok(channelCashierService.generateAuthUrl(param)); return Res.ok(channelCashierService.generateAuthUrl(param));
} }
@@ -67,7 +56,7 @@ public class ChannelCashierController {
@PostMapping("/auth") @PostMapping("/auth")
public Result<AuthResult> auth(@RequestBody CashierAuthCodeParam param){ public Result<AuthResult> auth(@RequestBody CashierAuthCodeParam param){
ValidationUtil.validateParam(param); ValidationUtil.validateParam(param);
paymentAssistService.initMchAndApp(param.getMchNo(), param.getAppId()); paymentAssistService.initMchApp(param.getAppId());
return Res.ok(channelCashierService.auth(param)); return Res.ok(channelCashierService.auth(param));
} }
@@ -75,7 +64,7 @@ public class ChannelCashierController {
@PostMapping("/pay") @PostMapping("/pay")
public Result<PayResult> cashierPay(@RequestBody CashierPayParam param){ public Result<PayResult> cashierPay(@RequestBody CashierPayParam param){
ValidationUtil.validateParam(param); ValidationUtil.validateParam(param);
paymentAssistService.initMchAndApp(param.getMchNo(), param.getAppId()); paymentAssistService.initMchApp(param.getAppId());
return Res.ok(channelCashierService.cashierPay(param)); return Res.ok(channelCashierService.cashierPay(param));
} }
} }