bugfix

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -2341,14 +2341,12 @@ public class SubmitServiceImpl implements SubmitService {
         AtomicReference<Double> shouldPayShopAmount = new AtomicReference<>(0d);
         // 订单商品列表
         List<OrderProductPo> orderProductList = new ArrayList<>();
-        // 组织id
-        Integer organizeId = null;
 
         for (OrderProductVo orderProduct : orderProducts) {
             Integer skuId = orderProduct.getSkuId();
             Integer productNum = orderProduct.getNum();
             Integer presentNum = orderProduct.getPresentNum();
-            Integer productType = orderProduct.getProductType();
+            Integer giftType = orderProduct.getGiftType();
             if (null == skuId) {
                 return ResponseJson.error("订单商品数据异常！", null);
             }
@@ -2357,7 +2355,6 @@ public class SubmitServiceImpl implements SubmitService {
             }
             // 获取数据库商品信息
             OrderProductPo dbProduct = null;
-            organizeId = orderProduct.getOrganizeId();
             if (0 == orderProduct.getOrganizeId()) {
                 dbProduct = submitMapper.getProductDetails(skuId);
             } else {
@@ -2380,7 +2377,7 @@ public class SubmitServiceImpl implements SubmitService {
             Double shopTax = 0d;
 
             // 是否是促销赠品
-            if (productType == 2) {
+            if (giftType == 2) {
                 // 促销赠品数+1
                 product.setPrice(0d);
                 product.setDiscountPrice(0d);