|
@@ -426,10 +426,11 @@ public class XiaoJuService {
|
|
|
|
|
|
BigDecimal total = BigDecimal.valueOf(xiaoJuQueryNewOrderModel.getOriginalAmount()).divide(BigDecimal.valueOf(100));
|
|
BigDecimal total = BigDecimal.valueOf(xiaoJuQueryNewOrderModel.getOriginalAmount()).divide(BigDecimal.valueOf(100));
|
|
BigDecimal payment = BigDecimal.valueOf(xiaoJuQueryNewOrderModel.getPaymentAmount()).divide(BigDecimal.valueOf(100));
|
|
BigDecimal payment = BigDecimal.valueOf(xiaoJuQueryNewOrderModel.getPaymentAmount()).divide(BigDecimal.valueOf(100));
|
|
|
|
+ BigDecimal serviceFee = BigDecimal.valueOf(xiaoJuQueryNewOrderModel.getServiceFee()).divide(BigDecimal.valueOf(100));
|
|
|
|
|
|
createOrder2Model.setTotalAmount(total);
|
|
createOrder2Model.setTotalAmount(total);
|
|
createOrder2Model.setPayAmount(payment);
|
|
createOrder2Model.setPayAmount(payment);
|
|
- createOrder2Model.setDiscountAmount(total.subtract(payment));
|
|
|
|
|
|
+ createOrder2Model.setDiscountAmount(total.subtract(payment).add(serviceFee));
|
|
createOrder2Model.setAccesserUserId("");
|
|
createOrder2Model.setAccesserUserId("");
|
|
|
|
|
|
CreateOrder2Model.Goods goods = new CreateOrder2Model.Goods();
|
|
CreateOrder2Model.Goods goods = new CreateOrder2Model.Goods();
|