dragon 平台 保存订单id

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinOrderPreParam.java

 package com.liquidnet.service.goblin.param;
 
 import com.liquidnet.service.goblin.dto.vo.GoblinFrontGoodDetailVo;
+import com.liquidnet.service.goblin.entity.GoblinOrderAttr;
+import com.liquidnet.service.goblin.entity.GoblinOrderSku;
+import com.liquidnet.service.goblin.entity.GoblinStoreOrder;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 
 @ApiModel(value = "GoblinOrderPreParam")
@@ -36,6 +40,10 @@ public class GoblinOrderPreParam implements Cloneable{
     private String returnUrl;
     private String showUrl;
 
+    private GoblinStoreOrder storeOrder;
+    private GoblinOrderAttr orderAttr;
+    private List<GoblinOrderSku> orderSkuList;
+
     private static final GoblinOrderPreParam obj = new GoblinOrderPreParam();
 
     public static GoblinOrderPreParam getNew() {

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

@@ -67,12 +67,13 @@ public class GoblinAppOrderServiceImpl implements IGoblinAppOrderService {
         String orderMasterCode = IDGenerator.storeMasterCode();//总订单id
         GoblinOrderPreParam preParam = GoblinOrderPreParam.getNew();
         preParam.setPayType(param.getPayType());
-        preParam.setDeviceFrom(param.getPayType());
+        preParam.setDeviceFrom(param.getDeviceFrom());
         preParam.setOpenId(param.getOpenId());
         preParam.setReturnUrl(param.getReturnUrl());
         preParam.setShowUrl(param.getShowUrl());
         preParam.setOrderMasterCode(orderMasterCode);
         preParam.setExpireTime(5);
+        preParam.setPriceActual(BigDecimal.ZERO);
         preParam.setStoreName("");
         preParam.setSkuName("");
         preParam.setOrderIdList("");
@@ -214,6 +215,8 @@ public class GoblinAppOrderServiceImpl implements IGoblinAppOrderService {
                 }
             }
             //获得活动优惠价格
+            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