|
|
@@ -14,10 +14,8 @@ import com.cyksj.enums.GatewayResponse;
|
|
|
import com.cyksj.mapper.*;
|
|
|
import com.cyksj.mapper.manage.coupon.CouponSkuMapper;
|
|
|
import com.cyksj.mapper.manage.coupon.CouponUserMapper;
|
|
|
-import com.cyksj.model.entity.OrderDon;
|
|
|
-import com.cyksj.model.entity.UserActivity;
|
|
|
-import com.cyksj.model.entity.UserBenefits;
|
|
|
-import com.cyksj.model.entity.UserCertRecord;
|
|
|
+import com.cyksj.model.entity.*;
|
|
|
+import com.cyksj.model.manage.request.ReqGoodsSkuSpec;
|
|
|
import com.cyksj.model.views.*;
|
|
|
import com.cyksj.redis.RedisService;
|
|
|
import com.cyksj.service.user.UserBindRelationService;
|
|
|
@@ -142,8 +140,13 @@ public class UserBenefitsFrontController {
|
|
|
List<GoodsDonSkuFrontView> comboSkuInfo = null;
|
|
|
try {
|
|
|
comboSkuInfo = beanSearcher.searchAll(GoodsDonSkuFrontView.class, MapUtils.builder().field(GoodsDonSkuFrontView::getId, Jsons.parseList(data.getComboSkuIds(), Long.class)).op(Operator.InList)
|
|
|
- .selectExclude(GoodsDonSkuFrontView::getSpecJson, GoodsDonSkuFrontView::getSpecIds)
|
|
|
+ .selectExclude(GoodsDonSkuFrontView::getSpecJson, GoodsDonSkuFrontView::getSpecIds, GoodsDonSkuFrontView::getImg)
|
|
|
.build());
|
|
|
+ GoodsDonSpec goodsDonSpec = beanSearcher.searchFirst(GoodsDonSpec.class, MapUtils.builder().field(GoodsDonSpec::getId, 15).build());
|
|
|
+ List<ReqGoodsSkuSpec> specs = Jsons.parseList(goodsDonSpec.getSpecsJson(), ReqGoodsSkuSpec.class);
|
|
|
+ Map<String, List<ReqGoodsSkuSpec>> collect = specs.stream().collect(Collectors.groupingBy(ReqGoodsSkuSpec::getKey));
|
|
|
+ ReqGoodsSkuSpec reqGoodsSkuSpec = collect.get("套餐").get(0);
|
|
|
+ data.setGoodsSpecJson(Jsons.toJson(reqGoodsSkuSpec));
|
|
|
} catch (Exception e) {
|
|
|
log.error("解析实物套餐json错误,:{}", StringUtil.getErrorText(e));
|
|
|
}
|