|
|
@@ -957,8 +957,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
|
|
|
@Override
|
|
|
@Transactional
|
|
|
- public int updateOrderCommodity(String detailId,String commodityId, String commodityName,String commodityMode, Integer commodityQuantity,Integer commodityType,
|
|
|
- String commodityPrice, String discountPrice,String commodityFirstPayment,String discountFirstPayment,String remarks) {
|
|
|
+ public int updateOrderCommodity(String detailId,String orderNo,String discountPrice,String discountFirstPayment,Integer commodityQuantity,String remarks) {
|
|
|
TOrderDetail oldDetail = tOrderDetailMapper.selectByPrimaryKey(detailId);
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(oldDetail.getOrderNo());
|
|
|
checkOrder(tOrder);
|
|
|
@@ -968,34 +967,17 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
TOrderDetail detail = new TOrderDetail();
|
|
|
detail.setId(detailId);
|
|
|
detail.setOrderNo(oldDetail.getOrderNo());
|
|
|
- detail.setCommodityId(commodityId);
|
|
|
detail.setCommodityQuantity(commodityQuantity);
|
|
|
- detail.setCommodityType(commodityType);
|
|
|
- detail.setCommodityMode(StringUtils.isBlank(commodityMode) ? DEFAULT_COMMODITY_MODE : commodityMode);
|
|
|
- detail.setCommodityPrice(new BigDecimal(commodityPrice));
|
|
|
detail.setDiscountPrice(new BigDecimal(discountPrice));
|
|
|
- detail.setCommodityFirstPayment(new BigDecimal(commodityFirstPayment));
|
|
|
detail.setDiscountFirstPayment(new BigDecimal(discountFirstPayment));
|
|
|
detail.setRemarks(remarks);
|
|
|
- tOrderDetailMapper.insert(detail);
|
|
|
- new BigDecimal(discountFirstPayment).multiply(new BigDecimal(commodityQuantity)).subtract(
|
|
|
- oldDetail.getDiscountFirstPayment().multiply(new BigDecimal(oldDetail.getCommodityQuantity())));
|
|
|
- // 订单市场价总额
|
|
|
- BigDecimal totalAmountChange = new BigDecimal(commodityPrice).multiply(new BigDecimal(commodityQuantity))
|
|
|
- .subtract(oldDetail.getCommodityPrice().multiply(new BigDecimal(oldDetail.getCommodityQuantity())));
|
|
|
- // 订单市场价首付金额
|
|
|
- BigDecimal firstPaymentChange = new BigDecimal(commodityFirstPayment)
|
|
|
- .multiply(new BigDecimal(commodityQuantity)).subtract(oldDetail.getCommodityFirstPayment()
|
|
|
- .multiply(new BigDecimal(oldDetail.getCommodityQuantity())));
|
|
|
+ tOrderDetailMapper.updateByPrimaryKeySelective(detail);
|
|
|
// 订单签单总额
|
|
|
BigDecimal signTotalAmountChange = new BigDecimal(discountPrice).multiply(new BigDecimal(commodityQuantity))
|
|
|
.subtract(oldDetail.getDiscountPrice().multiply(new BigDecimal(oldDetail.getCommodityQuantity())));
|
|
|
// 订单签单首付金额
|
|
|
- BigDecimal signFirstPaymentChange = new BigDecimal(discountFirstPayment)
|
|
|
- .multiply(new BigDecimal(commodityQuantity)).subtract(oldDetail.getDiscountFirstPayment()
|
|
|
- .multiply(new BigDecimal(oldDetail.getCommodityQuantity())));
|
|
|
- tOrder.setOrderAmount(tOrder.getOrderAmount().add(totalAmountChange));
|
|
|
- tOrder.setFirstPayment(tOrder.getFirstPayment().add(firstPaymentChange));
|
|
|
+ BigDecimal signFirstPaymentChange = new BigDecimal(discountFirstPayment).multiply(new BigDecimal(commodityQuantity))
|
|
|
+ .subtract(oldDetail.getDiscountFirstPayment().multiply(new BigDecimal(oldDetail.getCommodityQuantity())));
|
|
|
tOrder.setSignTotalAmount(tOrder.getSignTotalAmount().add(signTotalAmountChange));
|
|
|
tOrder.setSignFirstPayment(tOrder.getSignFirstPayment().add(signFirstPaymentChange));
|
|
|
tOrder.setUpdateTime(new Date());
|