协商赠品bugfix

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -434,10 +434,6 @@ public class NewOrderController extends BaseController {
                     if ("2".equals(o.getProductCategory())) {
                         skuId = newOrderProductDao.findSkuIdByProductId(o.getProductID());
                     }
-                    if (null == o.getPrice()) {
-                        Double price = newOrderProductDao.findPriceBySku(skuId);
-                        o.setPrice(price);
-                    }
                     o.setSplitCode(productDao.getSplitCodeByProductId(o.getProductID()));
                     if ("0".equals(productType)) {
                         o.setSkuId(Integer.valueOf(skuId));
@@ -450,7 +446,9 @@ public class NewOrderController extends BaseController {
                             o.setShouldPayTotalTax(o.getTotalAddedValueTax());
                         }
                     } else {
-                        o.setSkuId(productDao.findSkuIdByPromotionsId(o.getPromotionsId()));
+                        if(null==o.getSkuId()){
+                            o.setSkuId(productDao.findSkuIdByPromotionsId(o.getPromotionsId()));
+                        }
                         o.setPreferential(0d);
                         o.setDiscount(100d);
                         o.setDiscountFee(0d);

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -2073,7 +2073,7 @@
         limit 1
     </select>
     <select id="findSkuById" resultType="com.caimei.modules.product.entity.CmSku">
-        select price, costPrice, costCheckFlag, costProportional, unit
+        select skuId, price, costPrice, costCheckFlag, costProportional, unit
         from cm_sku
         where skuId = #{skuId}
     </select>