不修改 优惠金额

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreOrderServiceImpl.java

@@ -231,9 +231,9 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             return ResponseDto.failure("已发货");
         }
         BigDecimal voucherExpress = orderVo.getPriceExpress().subtract(price);
-        orderVo.setPriceTotal(orderVo.getPriceModify().subtract(voucherExpress));
+        orderVo.setPriceTotal(orderVo.getPriceTotal().subtract(voucherExpress));
         orderVo.setPriceModify(orderVo.getPriceModify().add(voucherExpress));
-        orderVo.setPriceVoucher(orderVo.getPriceVoucher().add(voucherExpress));
+//        orderVo.setPriceVoucher(orderVo.getPriceVoucher().add(voucherExpress));
         orderVo.setPriceActual(orderVo.getPriceActual().subtract(voucherExpress));
         orderVo.setPriceExpress(price);
         GoblinOrderOperationLog log = initLog(orderId, uid, now);
@@ -323,12 +323,12 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             return ResponseDto.failure("不存在");
         }
         BigDecimal voucherPrice = orderSkuVo.getSkuPriceActual().subtract(price);
-        orderSkuVo.setPriceModify(price);
+        orderSkuVo.setPriceModify(orderSkuVo.getPriceModify().add(price));
         orderSkuVo.setPriceVoucher(orderSkuVo.getPriceVoucher().add(voucherPrice));
         orderSkuVo.setSkuPriceActual(orderSkuVo.getSkuPriceActual().subtract(voucherPrice));
         orderVo.setPriceTotal(orderVo.getPriceTotal().subtract(voucherPrice));
         orderVo.setPriceModify(orderVo.getPriceModify().add(voucherPrice));
-        orderVo.setPriceVoucher(orderVo.getPriceVoucher().add(voucherPrice));
+//        orderVo.setPriceVoucher(orderVo.getPriceVoucher().add(voucherPrice));
         orderVo.setPriceActual(orderVo.getPriceActual().subtract(voucherPrice));
         GoblinOrderOperationLog log = initLog(orderId, uid, now);
         log.setType(GoblinStatusConst.Status.ORDER_LOG_STATUS_12.getValue());