|
|
@@ -82,14 +82,15 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
@Autowired
|
|
|
private ContractMapper contractMapper;
|
|
|
|
|
|
- private final BigDecimal DEFAULT_FIRST_PAYMENT = new BigDecimal(0);// 默认首付价格
|
|
|
- private final BigDecimal DEFAULT_COMMODITY_PRICE = new BigDecimal(0);// 默认单价
|
|
|
- private final String DEFAULT_PLATFORM_ID = "0"; // 平台默认id
|
|
|
+ private final BigDecimal DEFAULT_FIRST_PAYMENT = new BigDecimal(0);//默认首付价格
|
|
|
+ private final BigDecimal DEFAULT_COMMODITY_PRICE = new BigDecimal(0);//默认单价
|
|
|
+ private final String DEFAULT_PLATFORM_ID = "0"; //平台默认id
|
|
|
private final String DEFAULT_ADMIN_ID = "1"; //默认管理员
|
|
|
private final double DEFAULT_BROKERAGE_PROPORTION = 0; //佣金比例
|
|
|
private final double DEFAULT_COMMODITY_DISCOUNT = 1; //折扣比例
|
|
|
private final String DEFAULT_COMMODITY_MODE = "NO_MODE"; //暂无规格
|
|
|
private final String DEFAULT_CREATER = "PLATFORM";//平台方
|
|
|
+ private final BigDecimal DEFAULT_AMOUNT_UNIT = new BigDecimal(10000); //单位
|
|
|
/*
|
|
|
* -------------------------------------------------- APP管理端 --------------------------------------------------------
|
|
|
*/
|
|
|
@@ -142,6 +143,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setBuyerId(TokenManager.getUserId());
|
|
|
tOrder.setSellerId(StringUtils.isBlank(bo.getSellerId()) ? DEFAULT_PLATFORM_ID : bo.getSellerId());
|
|
|
}
|
|
|
+ tOrder.setOrderType(commodityType);
|
|
|
tOrder.setBrokerageAmount(discountPrice.multiply(new BigDecimal(DEFAULT_BROKERAGE_PROPORTION)));
|
|
|
tOrder.setFirstPayment(DEFAULT_FIRST_PAYMENT);
|
|
|
tOrder.setOrderAmount(orderAmount);
|
|
|
@@ -160,10 +162,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrderDetail.setCommodityMode(StringUtils.isBlank(commodityMode)?DEFAULT_COMMODITY_MODE: commodityMode);
|
|
|
tOrderDetail.setCommodityType(commodityType);
|
|
|
tOrderDetail.setCommodityQuantity(commodityQuantity);
|
|
|
- tOrderDetail.setCommodityPrice(commodityPrice);
|
|
|
- tOrderDetail.setCommodityFirstPayment(commodityFirstPayment);
|
|
|
- tOrderDetail.setDiscountPrice(discountPrice);
|
|
|
- tOrderDetail.setDiscountFirstPayment(discountFirstPayment);
|
|
|
+ tOrderDetail.setCommodityPrice(commodityPrice.multiply(DEFAULT_AMOUNT_UNIT));
|
|
|
+ tOrderDetail.setCommodityFirstPayment(commodityFirstPayment.multiply(DEFAULT_AMOUNT_UNIT));
|
|
|
+ tOrderDetail.setDiscountPrice(discountPrice.multiply(DEFAULT_AMOUNT_UNIT));
|
|
|
+ tOrderDetail.setDiscountFirstPayment(discountFirstPayment.multiply(DEFAULT_AMOUNT_UNIT));
|
|
|
tOrderDetailMapper.insert(tOrderDetail);
|
|
|
tOrderMapper.insert(tOrder);
|
|
|
return 1;
|
|
|
@@ -1015,7 +1017,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
.multiply(new BigDecimal(detail.getCommodityQuantity()));
|
|
|
BigDecimal signTotalAmountChange = detail.getDiscountPrice()
|
|
|
.multiply(new BigDecimal(detail.getCommodityQuantity()));
|
|
|
- BigDecimal signFirstPaymentChange = detail.getCommodityFirstPayment()
|
|
|
+ BigDecimal signFirstPaymentChange = detail.getDiscountFirstPayment()
|
|
|
.multiply(new BigDecimal(detail.getCommodityQuantity()));
|
|
|
tOrder.setOrderAmount(tOrder.getOrderAmount().subtract(totalAmountChange));
|
|
|
tOrder.setFirstPayment(tOrder.getFirstPayment().subtract(firstPaymentChange));
|