|
@@ -108,7 +108,11 @@ public class WebhookServiceImpl implements WebhookService {
|
|
BeanUtils.copyProperties(orderByTradeNo, createOrderManual);
|
|
BeanUtils.copyProperties(orderByTradeNo, createOrderManual);
|
|
createOrderManual.setPaymentMethod(PaymentMethodEnum.fromValue(orderByTradeNo.getPayment()));
|
|
createOrderManual.setPaymentMethod(PaymentMethodEnum.fromValue(orderByTradeNo.getPayment()));
|
|
// 设置实际扣费价格
|
|
// 设置实际扣费价格
|
|
- createOrderManual.setPrice(price);
|
|
|
|
|
|
+ if(ObjectUtils.isNotEmpty(oldPrice)){
|
|
|
|
+ createOrderManual.setPrice(oldPrice);
|
|
|
|
+ }else {
|
|
|
|
+ createOrderManual.setPrice(price);
|
|
|
|
+ }
|
|
createOrderManual.setReducedPrice(price);
|
|
createOrderManual.setReducedPrice(price);
|
|
if(!StringUtils.isEmpty(orderByTradeNo.getCurrency())){
|
|
if(!StringUtils.isEmpty(orderByTradeNo.getCurrency())){
|
|
createOrderManual.setCurrency(orderByTradeNo.getCurrency());
|
|
createOrderManual.setCurrency(orderByTradeNo.getCurrency());
|