修改 日志

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/errors.properties

@@ -42,7 +42,7 @@
 149016=请先将商品下架后操作
 149017=请先将活动停用后操作
 
-148001=库存不足
+148001=正在下单库存不足
 
 20003=无权查看
 20018=下单失败
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java

@@ -355,10 +355,10 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         }
         storeOrder.setPriceTotal(storeTotalPrice.add(storeOrder.getPriceExpress()));
         BigDecimal priceActual = storeOrder.getPriceTotal().subtract(voucherPrice).subtract(storeVoucherPrice);
-        if(priceActual.compareTo(storeOrder.getPriceExpress())<0){
+        if (priceActual.compareTo(storeOrder.getPriceExpress()) < 0) {
             priceActual = storeOrder.getPriceExpress();
         }
-        storeOrder.setPriceActual(priceActual.compareTo(BigDecimal.ZERO)<0?BigDecimal.ZERO:priceActual);
+        storeOrder.setPriceActual(priceActual.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : priceActual);
         storeOrder.setPriceRefund(BigDecimal.ZERO);
         storeOrder.setPriceCoupon(voucherPrice);
         storeOrder.setStorePriceCoupon(storeVoucherPrice);
@@ -956,6 +956,9 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 logVo.setSpuId(orderSkuVo.getSpuId());
                 logVo.setSpuName(backOrderSkuVo.getSpuName());
                 logVo.setSkuId(backOrderSkuVo.getSkuId());
+                if (orderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_STATUS_6.getValue())) {
+                    price = price.subtract(orderVo.getPriceExpress());
+                }
                 logVo.setSkuPriceActual(price.multiply(BigDecimal.valueOf(100)).negate().longValue());
                 logVo.setStatus(GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue());
                 logVo.setRemark("订单退款");