修改下单

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

@@ -508,7 +508,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             List<String> goblinOrderSkuIdList = CollectionUtil.linkedListString();
             for (int i = 0; i < item.getOrderSkuList().size(); i++) {
                 GoblinOrderSku orderSku = item.getOrderSkuList().get(i);
-                if (item.getStoreOrder().getPriceVoucher().compareTo(BigDecimal.ZERO) > 0) {
+                if (item.getStoreOrder().getPriceVoucher().compareTo(BigDecimal.ZERO) > 0 && i == 0) {
                     orderSku.setPriceVoucher(item.getStoreOrder().getPriceVoucher());
                     BigDecimal skuPriceActual = orderSku.getSkuPrice().subtract(item.getStoreOrder().getPriceVoucher());
                     orderSku.setSkuPriceActual(skuPriceActual.compareTo(BigDecimal.ZERO) > 0 ? skuPriceActual : BigDecimal.ZERO);
@@ -703,12 +703,12 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 log.error("订单号：" + syncOrderParam.getOrderCode() + " 订单不存在");
                 return "fail";//订单不存在
             }
-//            if (orderVo.getStatus() != GoblinStatusConst.Status.ORDER_STATUS_0.getValue()) {
-//                if (orderVo.getPayCode().equals(syncOrderParam.getCode())) {
-//                    log.error("订单号：" + syncOrderParam.getOrderCode() + " 重复支付");
-//                    return "fail";//重复支付
-//                }
-//            }
+            if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_2.getValue()) {
+                if (orderVo.getPayCode().equals(syncOrderParam.getCode())) {
+                    log.error("订单号：" + syncOrderParam.getOrderCode() + " 重复支付");
+                    return "fail";//重复支付
+                }
+            }
 //            if (orderVo.getPriceActual().compareTo(syncOrderParam.getPrice()) != 0) {
 //                log.error("订单号：" + syncOrderParam.getOrderCode() + " 价格不符");
 //                return "fail";//价格不符