|
|
@@ -26,6 +26,7 @@ import org.springblade.common.config.entity.PlatformConfig;
|
|
|
import org.springblade.common.enums.AppConstant;
|
|
|
import org.springblade.common.enums.TransferStatus;
|
|
|
import org.springblade.common.enums.WithdrawStatus;
|
|
|
+import org.springblade.common.enums.WithdrawType;
|
|
|
import org.springblade.core.log.exception.ServiceException;
|
|
|
import org.springblade.core.tool.api.R;
|
|
|
import org.springblade.core.tool.api.ResultCode;
|
|
|
@@ -183,13 +184,15 @@ public class AppShopServiceImpl extends ServiceImpl<ShopMapper, Shop> implements
|
|
|
throw new ServiceException(ResultCode.NOT_FOUND);
|
|
|
}
|
|
|
|
|
|
- BigDecimal feeRate = getFeeRate(withdrawRec.getPrice());
|
|
|
- //国信手续费
|
|
|
- BigDecimal fee = withdrawRec.getPrice().multiply(feeRate);
|
|
|
- withdrawRec.setPlatformFee(fee);
|
|
|
- //实际提现金额
|
|
|
- BigDecimal actualPrice = withdrawRec.getPrice().subtract(fee);
|
|
|
- withdrawRec.setActualPrice(actualPrice);
|
|
|
+ if (withdrawRec.getType().equals(WithdrawType.POINT_WITHDRAW)) {
|
|
|
+ BigDecimal feeRate = getFeeRate(withdrawRec.getPrice());
|
|
|
+ //国信手续费
|
|
|
+ BigDecimal fee = withdrawRec.getPrice().multiply(feeRate);
|
|
|
+ withdrawRec.setPlatformFee(fee);
|
|
|
+ //实际提现金额
|
|
|
+ BigDecimal actualPrice = withdrawRec.getPrice().subtract(fee);
|
|
|
+ withdrawRec.setActualPrice(actualPrice);
|
|
|
+ }
|
|
|
withdrawRec.setWithdrawStatus(WithdrawStatus.WAITING.getValue());
|
|
|
withdrawRecService.saveOrUpdate(withdrawRec);
|
|
|
|
