|
|
@@ -117,7 +117,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * to update 18
|
|
|
+ * 只能购买一份
|
|
|
* 后期规则:自营服务订单 、需求订单、其他订单不能同时加入购物车
|
|
|
*/
|
|
|
@Override
|
|
|
@@ -130,7 +130,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
: new BigDecimal(Double.valueOf(bo.getCommodityFirstPayment()));
|
|
|
BigDecimal discountPrice = commodityPrice.multiply(new BigDecimal(DEFAULT_COMMODITY_DISCOUNT));
|
|
|
BigDecimal discountFirstPayment = commodityFirstPayment.multiply(new BigDecimal(DEFAULT_COMMODITY_DISCOUNT));
|
|
|
- BigDecimal orderAmount = discountPrice.multiply(new BigDecimal(commodityQuantity));
|
|
|
TOrder tOrder = new TOrder();
|
|
|
tOrder.setOrderNo(orderNo);
|
|
|
tOrder.setCreater(DEFAULT_CREATER);
|
|
|
@@ -144,10 +143,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
tOrder.setOrderType(commodityType);
|
|
|
tOrder.setBrokerageAmount(discountPrice.multiply(new BigDecimal(DEFAULT_BROKERAGE_PROPORTION)));
|
|
|
+ tOrder.setOrderAmount(commodityPrice);
|
|
|
tOrder.setFirstPayment(commodityFirstPayment);
|
|
|
- tOrder.setOrderAmount(orderAmount);
|
|
|
- tOrder.setSignFirstPayment(discountFirstPayment);
|
|
|
tOrder.setSignTotalAmount(discountPrice);
|
|
|
+ tOrder.setSignFirstPayment(discountFirstPayment);
|
|
|
tOrder.setOrderRemarks(remarks);
|
|
|
tOrder.setDeleteSign(DeleteStatus.UNDELETE.getCode());
|
|
|
tOrder.setOrderChannel(OrderChannel.APP.getCode());
|