促销活动bugfix

src/main/java/com/caimei/modules/product/dao/ProductDao.java

@@ -221,4 +221,6 @@ public interface ProductDao extends CrudDao<Product> {
     Integer findSkuIdByPromotionsId(Integer promotionsId);
 
     void deleteProductSkus(@Param("skuIds")List<Integer> skuIds,@Param("productId")Integer productId);
+
+    String findProductIdBySku(String productId);
 }

src/main/java/com/caimei/modules/product/service/ProductService.java

@@ -652,4 +652,8 @@ public class ProductService extends CrudService<ProductDao, Product> {
     public List<CmSku> findHeHeSku(Integer productId) {
         return productDao.findHeHeSku(productId);
     }
+
+    public String getProductIdBySku(String productId) {
+        return productDao.findProductIdBySku(productId);
+    }
 }

src/main/java/com/caimei/modules/product/web/CmPromotionController.java

@@ -175,11 +175,20 @@ public class CmPromotionController extends BaseController {
                     String[] split = cmPromotion.getProductIds().split(",");
                     for (String productId : split) {
                         if (StringUtil.isNotBlank(productId)) {
+                            if(StringUtils.isNotBlank(cmPromotion.getType()) && "2".equals(cmPromotion.getType())){
+                                //凑单促销的时候取的是skuId
+                                productId=productService.getProductIdBySku(productId);
+                            }
                             Product product = productService.get(productId);
                             promotionProducts.add(product);
                         }
                     }
                 } else {
+                    if(StringUtils.isNotBlank(cmPromotion.getType()) && "2".equals(cmPromotion.getType())){
+                        //凑单促销的时候取的是skuId
+                       String productId=productService.getProductIdBySku(cmPromotion.getProductIds());
+                        cmPromotion.setProductIds(productId);
+                    }
                     Product product = productService.get(cmPromotion.getProductIds());
                     promotionProducts.add(product);
                 }
@@ -306,6 +315,7 @@ public class CmPromotionController extends BaseController {
             promotionProducts.forEach(product -> {
                 if (product != null) {
                     product.setMainImage(AppUtils.getImageURL("product", product.getMainImage(), 0, wwwServer));
+                    product.setPrice(productService.findSkuList(product.getProductID()).get(0).getPrice());
                 }
             });
             giftProducts.forEach(product -> {

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

@@ -1183,6 +1183,10 @@
         </foreach>
     </delete>
 
+    <select id="findProductIdBySku" resultType="java.lang.String">
+        select productId from cm_sku where skuId=#{productId}
+    </select>
+
     <select id="toAddProductCustomClassificationList" resultType="product">
         select
         <include refid="productColumns"/>,