|
@@ -3,6 +3,7 @@ package com.caimei.service.impl;
|
|
import com.caimei.mapper.ProductMapper;
|
|
import com.caimei.mapper.ProductMapper;
|
|
import com.caimei.model.ResponseJson;
|
|
import com.caimei.model.ResponseJson;
|
|
import com.caimei.model.po.*;
|
|
import com.caimei.model.po.*;
|
|
|
|
+import com.caimei.model.vo.CartProductVo;
|
|
import com.caimei.model.vo.ClubVo;
|
|
import com.caimei.model.vo.ClubVo;
|
|
import com.caimei.model.vo.LadderPriceVo;
|
|
import com.caimei.model.vo.LadderPriceVo;
|
|
import com.caimei.model.vo.ProductVo;
|
|
import com.caimei.model.vo.ProductVo;
|
|
@@ -134,6 +135,11 @@ public class ProductServiceImpl implements ProductService {
|
|
}else {
|
|
}else {
|
|
product.setRetailPrice(product.getPrice());
|
|
product.setRetailPrice(product.getPrice());
|
|
}
|
|
}
|
|
|
|
+ if (activity.getMode() == 3) {
|
|
|
|
+ // 获取赠品
|
|
|
|
+ List<CartProductVo> giftList = productMapper.findProductGifts(activity.getId());
|
|
|
|
+ activity.setProductGifts(giftList);
|
|
|
|
+ }
|
|
} else if (1 == product.getLadderPriceFlag()) {
|
|
} else if (1 == product.getLadderPriceFlag()) {
|
|
// 启用阶梯价格
|
|
// 启用阶梯价格
|
|
getLadderPrice(product);
|
|
getLadderPrice(product);
|