|
@@ -236,8 +236,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
|
|
|
// if(data != null) {
|
|
|
// couponAmount = data.getDiscountedPrices();
|
|
|
// }
|
|
|
- if (couponAmount.compareTo(orderParam.getOrderAmount()) > 0) {
|
|
|
- couponAmount = orderParam.getOrderAmount();
|
|
|
+ if (couponAmount.compareTo(amount) > 0) {
|
|
|
+ couponAmount = amount;
|
|
|
}
|
|
|
handleCouponAmount(orderItemList, couponAmount);
|
|
|
}
|
|
@@ -417,7 +417,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
|
|
|
BigDecimal bigDecimal = new BigDecimal(balanceAmount1);
|
|
|
if (BigDecimal.ZERO.compareTo(bigDecimal) !=0 ) {
|
|
|
order.setIntegrationAmount(bigDecimal);
|
|
|
- order.setPayAmount(orderParam.getOrderAmount().subtract(bigDecimal));
|
|
|
+ order.setPayAmount(order.getPayAmount().subtract(bigDecimal));
|
|
|
orderMapper.updateByPrimaryKeySelective(order);
|
|
|
}
|
|
|
result.put("pay",data);
|