订单修改逻辑调整

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -2712,10 +2712,11 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             BigDecimal realAmount = summary.getRealMoney()==null?BigDecimal.ZERO:summary.getRealMoney()  ;
             BigDecimal freeAmount = tradeOrderDO.getFreeAmount()==null?BigDecimal.ZERO:tradeOrderDO.getFreeAmount();
             BigDecimal orderMoney = summary.getOrderMoney();
+            realAmount = realAmount.subtract(freeAmount);
             Long discountId = summary.getDiscountId();
             shipTradeOrderCreateReqVO.setAmount(orderMoney);
             //减去优惠金额
-            shipTradeOrderCreateReqVO.setPayAmount(realAmount.subtract(freeAmount));
+            shipTradeOrderCreateReqVO.setPayAmount(realAmount);
             shipTradeOrderCreateReqVO.setFreeAmount(freeAmount);
             if (createVO.getSummary().getDeposi() != null && shipTradeOrderCreateReqVO.getDeposi().compareTo(tradeOrderDO.getDeposi())!=0) {
                 // 判断定金金额是否发生变化，记录变更日志