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

33333333333

Browse Source
This commit is contained in:
777
2025-01-19 19:30:21 +08:00
parent 0b76e4a123
commit e07f27f595
18 changed files with 123 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PayTotalServiceImpl.java
View File

@@ -49,7 +49,7 @@ public class PayTotalServiceImpl extends ServiceImpl<PayTotalMapper,PayTotal> im
one = new PayTotal();
one.setPayId(appId);
one.setDate(LocalDate.now());
one.setPayType(payTypeEnum.getCode());
one.setPayType(payTypeEnum == null ? PayTypeEnum.ALI.getCode() : payTypeEnum.getCode());
one.setMoney(BigDecimal.ZERO);
this.save(one);
}

3
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PayTrdConfigServiceImpl.java
View File

@@ -10,6 +10,7 @@ import com.ruoyi.cai.mapper.PayTrdConfigMapper;
import com.ruoyi.cai.pay.PayManager;
import com.ruoyi.cai.pay.PayOrderInfoDTO;
import com.ruoyi.cai.pay.PayReturnResp;
import com.ruoyi.cai.pay.PlatformTypeEnum;
import com.ruoyi.cai.service.OrderLogsService;
import com.ruoyi.cai.service.PayTrdConfigService;
import com.ruoyi.cai.trdpay.TrdPayManager;
@@ -87,7 +88,7 @@ public class PayTrdConfigServiceImpl extends ServiceImpl<PayTrdConfigMapper, Pay
throw new ServiceException("未开启支付，请联系客服");
}
log.info("使用支付 {} wx={}", payTrdConfig.getType(), wx);
payManager.updatePayType(dto.getOrderNo(), payTrdConfig.getType());
payManager.updatePayType(dto.getOrderNo(), payTrdConfig.getType(), wx?PlatformTypeEnum.WX:PlatformTypeEnum.ALI);
return trdPayManager.createOrderAliMerge(dto, payTrdConfig, typeEnum, wx);
}