Merge branch 'opt_sort_21'

# Conflicts:
#	netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSkuInsert.java

netflix-dao/src/main/java/com/cyksj/model/entity/GoodsDonSku.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.cyksj.model.views.DistributeSearchView;
 import com.cyksj.model.views.GoodsDiscountPlusPurchaseRelationFrontView;
-import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -143,9 +142,9 @@ public class GoodsDonSku extends BaseEntity {
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer days;
 
-    @DbField("case when spec_val like '%月%' and spec_val not like '%年%' then 0 when spec_val like '%季%' then 1 when spec_val like '%半年%' then 2 when spec_val like '%年%' then 3 else 66 end")
-    @TableField(exist = false)
-    private Integer orderBy;
+//    @DbField("case when spec_val like '%月%' and spec_val not like '%年%' then 0 when spec_val like '%季%' then 1 when spec_val like '%半年%' then 2 when spec_val like '%年%' then 3 else 66 end")
+//    @TableField(exist = false)
+//    private Integer orderBy;
 
     /**
      * 加购规格
@@ -200,4 +199,10 @@ public class GoodsDonSku extends BaseEntity {
     @DbIgnore
     @TableField(exist = false)
     private BigDecimal yhShopSkuPrice;
+
+    /**
+     * 排序
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer sorted;
 }

netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSkuInsert.java

@@ -131,6 +131,11 @@ public class ReqGoodsSkuInsert {
          */
         private Boolean isMirror;
 
+        /**
+         * 排序
+         */
+        private Integer sorted;
+
     }
 
 }

netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonSkuFrontView.java

@@ -1,6 +1,5 @@
 package com.cyksj.model.views;
 
-import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -105,8 +104,8 @@ public class GoodsDonSkuFrontView {
 	 */
 	private Integer days;
 
-	@DbField("case when spec_val like '%月%' and spec_val not like '%年%' then 0 when spec_val like '%季%' then 1 when spec_val like '%半年%' then 2 when spec_val like '%年%' then 3 else 66 end")
-	private Integer orderBy;
+//	@DbField("case when spec_val like '%月%' and spec_val not like '%年%' then 0 when spec_val like '%季%' then 1 when spec_val like '%半年%' then 2 when spec_val like '%年%' then 3 else 66 end")
+//	private Integer orderBy;
 
 	private Boolean isDp;
 
@@ -125,4 +124,9 @@ public class GoodsDonSkuFrontView {
 	 * 特定购买平台
 	 */
 	private String specificGoodsIds;
+
+	/**
+	 * 排序
+	 */
+	private Integer sorted;
 }

netflix-dao/src/main/java/com/cyksj/model/views/YhShopGoodsSkuFrontView.java

@@ -98,8 +98,11 @@ public class YhShopGoodsSkuFrontView {
 	@DbField("sku.days")
 	private Integer days;
 
-	@DbField("case when sku.spec_val like '%月%' and sku.spec_val not like '%年%' then 0 when sku.spec_val like '%季%' then 1 when sku.spec_val like '%半年%' then 2 when sku.spec_val like '%年%' then 3 else 66 end")
-	private Integer orderBy;
+//	@DbField("case when sku.spec_val like '%月%' and sku.spec_val not like '%年%' then 0 when sku.spec_val like '%季%' then 1 when sku.spec_val like '%半年%' then 2 when sku.spec_val like '%年%' then 3 else 66 end")
+//	private Integer orderBy;
+
+	@DbField("sku.sorted")
+	private Integer sorted;
 
 	@DbField("sku.is_dp")
 	private Boolean isDp;

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

@@ -354,10 +354,10 @@ public class GoodsDonController {
 					.build());
 
 			views.setSpecs(beanSearcher.searchFirst(GoodsDonSpecFrontView.class, MapUtils.builder().field(GoodsDonSpecFrontView::getGoodsId, views.getId()).build()));
-			MapBuilder builder = MapUtils.builder().field(GoodsDonSku::getGoodsId, views.getId()).field(GoodsDonSku::getStatus, true);
+			MapBuilder builder = MapUtils.builder().field(GoodsDonSkuFrontView::getGoodsId, views.getId()).field(GoodsDonSkuFrontView::getStatus, true);
 
 			if (views.getType() == 1) {
-				builder.orderBy(GoodsDonSku::getOrderBy).asc();
+				builder.orderBy(GoodsDonSkuFrontView::getSorted).asc();
 			}
 			views.setSkuList(beanSearcher.searchAll(GoodsDonSkuFrontView.class, builder.build()));
 			Integer sold = orderDonMapper.selectCount(Wrappers.lambdaQuery(OrderDon.class)
@@ -921,7 +921,7 @@ public class GoodsDonController {
         if (goodsDetailView == null) {
             throw BusinessRuntimeException.getInstance("该平台不存在或已下架,请刷新页面");
         }
-        goodsDetailView.setSkuList(beanSearcher.searchAll(YhShopGoodsSkuFrontView.class, MapUtils.builder().put("condition", condition).orderBy(YhShopGoodsSkuFrontView::getOrderBy).asc().build()));
+        goodsDetailView.setSkuList(beanSearcher.searchAll(YhShopGoodsSkuFrontView.class, MapUtils.builder().put("condition", condition).orderBy(YhShopGoodsSkuFrontView::getSorted).asc().build()));
         goodsDetailView.setSpecs(beanSearcher.searchFirst(GoodsDonSpecFrontView.class, MapUtils.builder().field(GoodsDonSpecFrontView::getGoodsId, goodsDetailView.getId()).build()));
         OrderCommentFrontView comments = beanSearcher.searchFirst(OrderCommentFrontView.class, MapUtils.builder()
                 .field(OrderCommentFrontView::getGoodsId, goodsDetailView.getId())

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonController.java

@@ -84,7 +84,9 @@ public class CmsGoodsDonController {
      */
     @GetMapping("/get/sku/{id}")
     public Result<List<GoodsDonSku>> getSkuById(@PathVariable Long id, HttpServletRequest request) {
-        List<GoodsDonSku> goodsDonSkus = beanSearcher.searchAll(GoodsDonSku.class, MapUtils.flatBuilder(request.getParameterMap()).field(GoodsDonSku::getGoodsId, id).build());
+        List<GoodsDonSku> goodsDonSkus = beanSearcher.searchAll(GoodsDonSku.class, MapUtils.flatBuilder(request.getParameterMap()).field(GoodsDonSku::getGoodsId, id)
+                .orderBy(GoodsDonSku::getSorted).asc()
+                .build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(goodsDonSkus);
     }
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonSkuController.java

@@ -2,6 +2,7 @@ package com.cyksj.web.controller.manage.goods;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.annotation.Log;
 import com.cyksj.common.exception.BusinessRuntimeException;
@@ -245,4 +246,19 @@ public class CmsGoodsDonSkuController {
         }
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }
+
+
+    /**
+     * 规格排序
+     */
+    @PutMapping("/sorted")
+    public Result<String> sorted(@RequestBody GoodsDonSku sku) {
+        Long id = sku.getId();
+        Integer sorted = sku.getSorted();
+        Assert.notNull(id, "请选择指定的规格");
+        goodsDonSkuService.update(null, Wrappers.lambdaUpdate(GoodsDonSku.class)
+                .eq(GoodsDonSku::getId, id)
+                .set(GoodsDonSku::getSorted, sorted));
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
 }