zoujiajian 3 роки тому
батько
коміт
5e4b5a7daa

+ 2 - 2
netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonFrontSkuView.java → netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonSkuFrontView.java

@@ -9,14 +9,14 @@ import java.math.BigDecimal;
 
 /*
  *项目名: netflix
- *文件名: GoodsDonFrontSkuView
+ *文件名: GoodsDonSkuFrontView
  *创建者: JavaZou
  *创建时间:2023/4/6 17:58
  */
 @Getter
 @Setter
 @SearchBean(tables = "goods_don_sku")
-public class GoodsDonFrontSkuView {
+public class GoodsDonSkuFrontView {
 
 	private Long id;
 

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonViews.java

@@ -123,7 +123,7 @@ public class GoodsDonViews {
     private String recommendGoods;
 
     @DbIgnore
-    private List<GoodsDonFrontSkuView> skuList;
+    private List<GoodsDonSkuFrontView> skuList;
 
     @DbIgnore
     private GoodsDonSpecFrontView specs;

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/views/GoodsFrontListView.java

@@ -108,7 +108,7 @@ public class GoodsFrontListView {
 	private String notifyMsg;
 
 	@DbIgnore
-	private List<GoodsDonFrontSkuView> skuList;
+	private List<GoodsDonSkuFrontView> skuList;
 
 	@DbIgnore
 	private GoodsDonSpec specs;

+ 7 - 7
netflix-service/src/main/java/com/cyksj/service/mange/goods/CmsGoodsDonServiceImpl.java

@@ -3,7 +3,7 @@ package com.cyksj.service.mange.goods;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cyksj.mapper.GoodsDonMapper;
 import com.cyksj.model.entity.GoodsDon;
-import com.cyksj.model.views.GoodsDonFrontSkuView;
+import com.cyksj.model.views.GoodsDonSkuFrontView;
 import com.cyksj.service.mange.CmsGoodsDonService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.util.MapUtils;
@@ -27,13 +27,13 @@ public class CmsGoodsDonServiceImpl extends ServiceImpl<GoodsDonMapper, GoodsDon
 	@Override
 	public void updateGoodsSkuPrice(Long goodsId, GoodsDon goods) {
 		goods = Optional.ofNullable(goods).orElse(goodsDonMapper.selectById(goodsId));
-		List<GoodsDonFrontSkuView> skuViews = beanSearcher.searchAll(GoodsDonFrontSkuView.class, MapUtils.builder()
-				.field(GoodsDonFrontSkuView::getGoodsId, goodsId)
-				.field(GoodsDonFrontSkuView::getStatus, true)
-				.orderBy(GoodsDonFrontSkuView::getPrice).asc().onlySelect(GoodsDonFrontSkuView::getPrice, GoodsDonFrontSkuView::getMonths, GoodsDonFrontSkuView::getDays)
+		List<GoodsDonSkuFrontView> skuViews = beanSearcher.searchAll(GoodsDonSkuFrontView.class, MapUtils.builder()
+				.field(GoodsDonSkuFrontView::getGoodsId, goodsId)
+				.field(GoodsDonSkuFrontView::getStatus, true)
+				.orderBy(GoodsDonSkuFrontView::getPrice).asc().onlySelect(GoodsDonSkuFrontView::getPrice, GoodsDonSkuFrontView::getMonths, GoodsDonSkuFrontView::getDays)
 				.build());
 		if (!skuViews.isEmpty()) {
-			GoodsDonFrontSkuView min = skuViews.get(0);
+			GoodsDonSkuFrontView min = skuViews.get(0);
 			if (skuViews.size() == 1) {
 				goods.setMinPrice(min.getPrice());
 				goods.setMinMonths(min.getMonths());
@@ -42,7 +42,7 @@ public class CmsGoodsDonServiceImpl extends ServiceImpl<GoodsDonMapper, GoodsDon
 				goods.setMaxPrice(min.getPrice());
 				goods.setMaxMonths(min.getMonths());
 			} else {
-				GoodsDonFrontSkuView max = skuViews.get(skuViews.size() - 1);
+				GoodsDonSkuFrontView max = skuViews.get(skuViews.size() - 1);
 				goods.setMinPrice(min.getPrice());
 				goods.setMinMonths(min.getMonths());
 				goods.setMinDays(min.getDays());

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -83,7 +83,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 			if (isLoginPopularize != null && isLoginPopularize) {
 				GoodsDonViews views = beanSearcher.searchFirst(GoodsDonViews.class, MapUtils.builder().field(GoodsDonViews::getId, ticket.getGoodsId()).build());
 				views.setSpecs(beanSearcher.searchFirst(GoodsDonSpecFrontView.class, MapUtils.builder().field(GoodsDonSpecFrontView::getGoodsId, views.getId()).build()));
-				views.setSkuList(beanSearcher.searchAll(GoodsDonFrontSkuView.class, MapUtils.builder().field(GoodsDonFrontSkuView::getGoodsId, views.getId()).field(GoodsDonFrontSkuView::getStatus, true).build()));
+				views.setSkuList(beanSearcher.searchAll(GoodsDonSkuFrontView.class, MapUtils.builder().field(GoodsDonSkuFrontView::getGoodsId, views.getId()).field(GoodsDonSkuFrontView::getStatus, true).build()));
 				ticket.setGoodsDonViews(views);
 			}
 			if (ticket.getMonths() != null && ticket.getMonths() >= 300) {

+ 2 - 2
netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -179,7 +179,7 @@ public class GoodsDonController {
         DateTime now = DateTime.now();
         list.forEach(data -> {
             data.setSpecs(beanSearcher.searchFirst(GoodsDonSpec.class, MapUtils.builder().field(GoodsDonSpec::getGoodsId, data.getId()).build()));
-            data.setSkuList(beanSearcher.searchAll(GoodsDonFrontSkuView.class, MapUtils.builder().field(GoodsDonFrontSkuView::getGoodsId, data.getId()).field(GoodsDonFrontSkuView::getStatus, true).orderBy(GoodsDonFrontSkuView::getPrice).asc().build()));
+            data.setSkuList(beanSearcher.searchAll(GoodsDonSkuFrontView.class, MapUtils.builder().field(GoodsDonSkuFrontView::getGoodsId, data.getId()).field(GoodsDonSkuFrontView::getStatus, true).orderBy(GoodsDonSkuFrontView::getPrice).asc().build()));
             Integer sold = orderDonMapper.selectCount(Wrappers.lambdaQuery(OrderDon.class)
                     .eq(OrderDon::getGoodsId, data.getId()).notIn(OrderDon::getStatus, Constant.noOrderStatus));
             data.setSold(sold + data.getVirtualSold());
@@ -274,7 +274,7 @@ public class GoodsDonController {
         if (views.getType() == 1) {
             builder.orderBy(GoodsDonSku::getOrderBy).asc();
         }
-        views.setSkuList(beanSearcher.searchAll(GoodsDonFrontSkuView.class, builder.build()));
+        views.setSkuList(beanSearcher.searchAll(GoodsDonSkuFrontView.class, builder.build()));
         return GatewayResponse.SUCCESS.newBuilder().toResult(views);
     }