修改价格计算

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

@@ -240,21 +240,22 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             if (pre != null && pre.equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())) {
                 writeOffCode = "EMPTY";
             }
-            //获得 商品原价和活动价格
-            priceBase = skuVo.getPrice();
+            //获得 活动原价
+            price = skuVo.getPrice();
             if (isMember) {
-                priceBase = skuVo.getPriceMember();
+                price = skuVo.getPriceMember();
             }
+            //活动价格
             if (pre != null) {
                 GoblinGoodsSkuInfoVo skuMarketVo = redisUtils.getGoodsSkuInfoVo(skuParam.getSkuId().split(pre)[0]);
-                price = skuMarketVo.getPrice();
+                priceBase = skuMarketVo.getPrice();
                 if (isMember) {
-                    price = skuMarketVo.getPriceMember();
+                    priceBase = skuMarketVo.getPriceMember();
                 }
             } else {
-                price = skuVo.getPrice();
+                priceBase = skuVo.getPrice();
                 if (isMember) {
-                    price = skuVo.getPriceMember();
+                    priceBase = skuVo.getPriceMember();
                 }
             }
             //获得活动优惠价格
@@ -343,11 +344,11 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             storeOrder.setPriceExpress(BigDecimal.ZERO);
         }
         storeOrder.setPriceTotal(storeTotalPrice.add(storeOrder.getPriceExpress()));
-        storeOrder.setPriceActual(storeOrder.getPriceTotal().add(voucherMarket).subtract(voucherPrice));
+        storeOrder.setPriceActual(storeOrder.getPriceTotal().subtract(voucherMarket).subtract(voucherPrice));
         storeOrder.setPriceRefund(BigDecimal.ZERO);
         storeOrder.setPriceCoupon(voucherPrice);
         storeOrder.setStorePriceCoupon(storeVoucherPrice);
-        storeOrder.setPriceVoucher(voucherPrice.add(storeVoucherPrice).subtract(voucherMarket));
+        storeOrder.setPriceVoucher(voucherPrice.add(storeVoucherPrice).add(voucherMarket));
         storeOrder.setStatus(0);
         storeOrder.setUcouponId(platVoucherCode);
         storeOrder.setUcouponId(platVoucherCode);