czg_team
/
wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

团购卷支付

This commit is contained in:
wangw 2024-05-21 11:59:50 +08:00
parent 2c8800a0b5
commit 83bffb6c84
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
View File

@ -86,6 +86,7 @@ public class PayController {
}else {
userId = TokenUtil.parseParamFromToken(token).getString("userId");
}
//订单支付 orderId:62,payType=wechatPay,userId:or1l860rwM-rU_j9KrgMOwued
log.info("订单支付 orderId:{},payType={},userId:{}",orderId,payType,userId);
try {
// if(StringUtils.isNotBlank(orderType) && orderType.equals("group")){

4
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@ -376,11 +376,11 @@ public class PayService {
throw new MsgException("生成订单错误");
}
if (ObjectUtil.isNull(tbMerchantAccount.getMerchantId()) || ObjectUtil.isEmpty(tbMerchantAccount.getMerchantId())) {
if (ObjectUtil.isNull(tbMerchantAccount)) {
return Result.fail("没有对应的商户");
}
TbMerchantThirdApply thirdApply = tbMerchantThirdApplyMapper.selectByPrimaryKey(Integer.valueOf(tbMerchantAccount.getMerchantId()));
TbMerchantThirdApply thirdApply = tbMerchantThirdApplyMapper.selectByPrimaryKey(Integer.valueOf(tbMerchantAccount.getId()));
if (ObjectUtil.isEmpty(thirdApply) || ObjectUtil.isNull(thirdApply)) {
return Result.fail("支付通道不存在");