|
|
@@ -764,13 +764,21 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
|
|
|
|
String payOpenId = user.getOpenId();
|
|
|
+ BigDecimal price = sku.getPrice();
|
|
|
+ if ("TWD".equals(payRequest.getCurrency())){
|
|
|
+ price = sku.getTwPrice();
|
|
|
+ }else if ("HKD".equals(payRequest.getCurrency())){
|
|
|
+ price = sku.getHkPrice();
|
|
|
+ }
|
|
|
|
|
|
/* 生成订单 */
|
|
|
String donNo = SEQUENCE.nextId().toString();
|
|
|
OrderDon orderDon = new OrderDon();
|
|
|
orderDon.setOrderNo(donNo);
|
|
|
orderDon.setOpenId(payOpenId);
|
|
|
- orderDon.setMoney(sku.getPrice().multiply(BigDecimal.valueOf(payRequest.getNum())));
|
|
|
+ orderDon.setMoney(price.multiply(BigDecimal.valueOf(payRequest.getNum())));
|
|
|
+ orderDon.setCurrency(payRequest.getCurrency());
|
|
|
+ orderDon.setRate(payRequest.getRate());
|
|
|
orderDon.setSkuId(renewSkuId);
|
|
|
orderDon.setRelationId(relation.getId());
|
|
|
//续费订单
|
|
|
@@ -797,7 +805,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
|
orderDon.setRealMoney(orderDon.getMoney());
|
|
|
//扣除使用优惠券、余额的订单金额
|
|
|
- deductOrderMoney(orderDon, couponUser, payRequest.getBalance(), user, sku.getPrice(), goodsDon.getType());
|
|
|
+ deductOrderMoney(orderDon, couponUser, payRequest.getBalance(), user, price, goodsDon.getType());
|
|
|
this.saveOrUpdate(orderDon);
|
|
|
//订单金额为0 且订单为已完成 更新虚物车票
|
|
|
if (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
|
zwhui