提交订单

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

@@ -219,7 +219,6 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         BigDecimal price;//sku应付价格
         BigDecimal priceBase;//sku原价
         BigDecimal storeTotalPrice = BigDecimal.ZERO;//订单总金额
-        BigDecimal voucherMarket = BigDecimal.ZERO;//活动优惠金额
         String writeOffCode = ""; //取货码
         List<GoblinOrderSku> goblinOrderSkuList = ObjectUtil.getGoblinOrderSkuArrayList();
         String marketId = "";
@@ -253,9 +252,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 }
             }
             //获得活动优惠价格
-            priceBase = priceBase.multiply(BigDecimal.valueOf(skuParam.getNumber()));
+//            priceBase = priceBase.multiply(BigDecimal.valueOf(skuParam.getNumber()));
             price = price.multiply(BigDecimal.valueOf(skuParam.getNumber()));
-            voucherMarket = voucherMarket.add(priceBase.subtract(price));
             storeTotalPrice = storeTotalPrice.add(price);
             //订单sku
             GoblinOrderSku orderSku = GoblinOrderSku.getNew();
@@ -272,7 +270,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             orderSku.setSkuNo(skuVo.getSkuNo());
             orderSku.setSkuImage(skuVo.getSkuPic());
             orderSku.setSkuSpecs(JSON.toJSONString(skuVo.getSkuSpecList()));
-            orderSku.setPriceVoucher(priceBase.subtract(price));
+            orderSku.setPriceVoucher(BigDecimal.ZERO);
+//            orderSku.setPriceVoucher(priceBase.subtract(price));
             orderSku.setCreatedAt(now);
             orderSku.setSpuName(spuVo.getName());
             orderSku.setSpuPic(spuVo.getCoverPic());

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

@@ -213,6 +213,7 @@ public class GoblinOrderUtils {
             for (GoblinUserCouponVo vo : voList) {
                 if (vo.getUcouponId().equals(ucouponId)) {
                     //判断券状态 和 触发金额
+                    log.debug("aaa="+(vo.getTriggers().compareTo(totalPrice)));
                     if ((vo.getState().equals(1)) && vo.getTriggers().compareTo(totalPrice) <= 0) {
                         if (vo.getUseScope().equals("0")) {
                             if (vo.getType().equals("1")) {//代金券