|
@@ -71,6 +71,7 @@ import com.cyksj.mapper.mirrorshop.UserMirrorShopOrderRelateMapper;
|
|
|
import com.cyksj.mapper.mirrorshop.UserMirrorShopUserDistributeSharedMapper;
|
|
import com.cyksj.mapper.mirrorshop.UserMirrorShopUserDistributeSharedMapper;
|
|
|
import com.cyksj.mapper.renew.RenewUpgradePackageMapper;
|
|
import com.cyksj.mapper.renew.RenewUpgradePackageMapper;
|
|
|
import com.cyksj.mapper.shop.YhShopGoodsSkuMapper;
|
|
import com.cyksj.mapper.shop.YhShopGoodsSkuMapper;
|
|
|
|
|
+import com.cyksj.mapper.sys.SysConfigMapper;
|
|
|
import com.cyksj.model.dto.*;
|
|
import com.cyksj.model.dto.*;
|
|
|
import com.cyksj.model.entity.*;
|
|
import com.cyksj.model.entity.*;
|
|
|
import com.cyksj.model.manage.dto.ChannelBaiDuDiscountDto;
|
|
import com.cyksj.model.manage.dto.ChannelBaiDuDiscountDto;
|
|
@@ -234,6 +235,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
|
|
|
|
|
private final SysConfigService sysConfigService;
|
|
private final SysConfigService sysConfigService;
|
|
|
|
|
|
|
|
|
|
+ private final SysConfigMapper sysConfigMapper;
|
|
|
|
|
+
|
|
|
private final UserBusinessFrontService userBusinessFrontService;
|
|
private final UserBusinessFrontService userBusinessFrontService;
|
|
|
|
|
|
|
|
private final UserBindDetailMapper userBindDetailMapper;
|
|
private final UserBindDetailMapper userBindDetailMapper;
|
|
@@ -2924,8 +2927,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
}
|
|
|
//去掉余额 多出的部分
|
|
//去掉余额 多出的部分
|
|
|
BigDecimal subGalxyCoin = toUseGalaxyCoin;
|
|
BigDecimal subGalxyCoin = toUseGalaxyCoin;
|
|
|
- SysConfig galaxyCoinPayConfig = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class)
|
|
|
|
|
- .eq(SysConfig::getSysKey, Constant.GALAXY_COIN_PAY_DEDUCT_KEY).last("limit 1"));
|
|
|
|
|
|
|
+ SysConfig galaxyCoinPayConfig = sysConfigMapper.getConfigByKey(Constant.GALAXY_COIN_PAY_DEDUCT_KEY);
|
|
|
GalaxyCoinPayConfigDto galaxyCoinPayConfigDto = null;
|
|
GalaxyCoinPayConfigDto galaxyCoinPayConfigDto = null;
|
|
|
if (galaxyCoinPayConfig != null && StrUtil.isNotEmpty(galaxyCoinPayConfig.getSysValue())) {
|
|
if (galaxyCoinPayConfig != null && StrUtil.isNotEmpty(galaxyCoinPayConfig.getSysValue())) {
|
|
|
try {
|
|
try {
|