|
@@ -228,6 +228,9 @@ public class PromotionFactoryBase extends ServiceImpl<PromotionMapper, Promotion
|
|
//判断满减金额
|
|
//判断满减金额
|
|
for (int p = 0; p < promotionList.size(); p++) {
|
|
for (int p = 0; p < promotionList.size(); p++) {
|
|
Promotion promotion = promotionList.get(p);
|
|
Promotion promotion = promotionList.get(p);
|
|
|
|
+ if (!Objects.equals(promotion.getType(), PromotionTypeEnum.T_1.getCode())) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
JSONArray priceJson = JSONUtil.parseArray(promotion.getPrice());
|
|
JSONArray priceJson = JSONUtil.parseArray(promotion.getPrice());
|
|
for (int g = 0; g < goodsList.size(); g++) {
|
|
for (int g = 0; g < goodsList.size(); g++) {
|
|
JMap<String, Object> goods = goodsList.get(g);
|
|
JMap<String, Object> goods = goodsList.get(g);
|