|
|
@@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.poi.excel.ExcelUtil;
|
|
|
import cn.hutool.poi.excel.ExcelWriter;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.kym.common.utils.CommUtil;
|
|
|
@@ -167,7 +168,6 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
|
|
|
|
|
|
@Override
|
|
|
public ChargeOrderVo orderDetailForApp(String startChargeSeq) {
|
|
|
- // TODO: 2023-08-24 后面跟上面接口合并
|
|
|
var chargeOrder = lambdaQuery().eq(ChargeOrder::getStartChargeSeq, startChargeSeq).one();
|
|
|
// 订单对应的优惠信息
|
|
|
var orderVo = new ChargeOrderVo();
|
|
|
@@ -175,7 +175,9 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
|
|
|
if (chargeOrder.getDiscountAmount() > 0) {
|
|
|
// 充值权益
|
|
|
var orderRechargeRight = orderRechargeRightsService.lambdaQuery().eq(OrderRechargeRights::getStartChargeSeq, startChargeSeq).one();
|
|
|
+ DynamicDataSourceContextHolder.push("db-admin");
|
|
|
var rechargeRights = rechargeRightsService.lambdaQuery().eq(RechargeRights::getId, orderRechargeRight.getRightsId()).one();
|
|
|
+ DynamicDataSourceContextHolder.poll();
|
|
|
var desc = rechargeRights.getRightsDesc();
|
|
|
orderVo.setRightsDesc(desc);
|
|
|
}
|
skyline