maxjhandsome
/
ruoyi-vue-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

code review 支付应用的逻辑

This commit is contained in:
YunaiV 2021-12-25 18:53:47 +08:00
parent 4b5c185608
commit f1424aa61e
5 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/app/PayAppController.java
View File

@ -41,7 +41,7 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E
* 支付应用信息 controller 组件
*
* @author aquan
*/
*/ // TODO @aquan：一般 controller 上就不写注释了，因为有 swagger 注解，不然就重复啦
@Slf4j
@Api(tags = "支付应用信息")
@RestController
@ -51,11 +51,8 @@ public class PayAppController {
@Resource
private PayAppService appService;
@Resource
private PayChannelService channelService;
@Resource
private PayMerchantService merchantService;
@ -135,6 +132,7 @@ public class PayAppController {
// 写入商户的数据
respVO.setPayMerchant(PayAppConvert.INSTANCE.convert(deptMap.get(app.getMerchantId())));
// 写入支付渠道信息的数据
// TODO @aquan：VO 里返回的 payChannel，是不是用一个 Set 集合就好了，里面是渠道的枚举值
PayAppPageItemRespVO.PayChannel payChannel = new PayAppPageItemRespVO.PayChannel();
channels.forEach(c -> {
if (c.getAppId().equals(app.getId())) {
@ -177,5 +175,4 @@ public class PayAppController {
return success(PayAppConvert.INSTANCE.convertList(appListDO));
}
}

1
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/app/vo/PayAppPageItemRespVO.java
View File

@ -72,4 +72,5 @@ public class PayAppPageItemRespVO extends PayAppBaseVO {
@ApiModelProperty(value = "支付宝扫码支付", required = true, example = "1")
private Integer alipayQr = CommonStatusEnum.DISABLE.getStatus();
}
}

6
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/service/app/impl/PayAppServiceImpl.java
View File

@ -36,10 +36,6 @@ public class PayAppServiceImpl implements PayAppService {
@Resource
private PayAppMapper appMapper;
/**
* 商户 service 组件
*/
@Resource
private PayMerchantMapper merchantMapper;
@ -151,7 +147,6 @@ public class PayAppServiceImpl implements PayAppService {
*/
@VisibleForTesting
public void checkAppExists(Long id) {
if (id == null) {
return;
}
@ -160,4 +155,5 @@ public class PayAppServiceImpl implements PayAppService {
throw exception(PAY_APP_NOT_FOUND);
}
}
}

1
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/service/channel/impl/PayChannelServiceImpl.java
View File

@ -46,7 +46,6 @@ public class PayChannelServiceImpl implements PayChannelService {
@Override
public Long createChannel(PayChannelCreateReqVO reqVO) {
// 断言是否有重复的
PayChannelDO channelDO = this.getChannelByConditions(reqVO.getMerchantId(), reqVO.getAppId(), reqVO.getCode());
Assert.isNull(channelDO, CHANNEL_EXIST_SAME_CHANNEL_ERROR.getMsg());

2
yudao-admin-ui/src/views/pay/app/index.vue
View File

@ -467,8 +467,6 @@ export default {
this.settingChannelParam(row, payCode, type)
this.channelParam.edit = false;
this.channelParam.loading = false;
},
/**
* 设置支付渠道信息