fix 支付规格排序

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

@@ -1,5 +1,8 @@
 package com.cyksj.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,6 +14,7 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
+@SearchBean(tables = "goods_don_sku")
 public class GoodsDonSku extends BaseEntity {
 
     private Long goodsId;
@@ -74,4 +78,8 @@ public class GoodsDonSku extends BaseEntity {
      * 月数
      */
     private Integer months;
+
+    @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;
 }

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

@@ -120,12 +120,13 @@ public class GoodsDonController {
      * 获取商品详情
      */
     @GetMapping("/get/{id}")
-    public Result<GoodsDonViews> getDetail(@PathVariable Long id){
+    public Result<GoodsDonViews> getDetail(@PathVariable Long id) {
         GoodsDonViews views = beanSearcher.searchFirst(GoodsDonViews.class, MapUtils.builder().field(GoodsDonViews::getId, id).build());
 
-        views.setSpecs(beanSearcher.searchFirst(GoodsDonSpec.class,MapUtils.builder().field(GoodsDonSpec::getGoodsId,views.getId()).build()));
-        views.setSkuList(beanSearcher.searchAll(GoodsDonSku.class,MapUtils.builder().field(GoodsDonSku::getGoodsId,views.getId()).field(GoodsDonSku::getStatus,true).build()));
-
+        views.setSpecs(beanSearcher.searchFirst(GoodsDonSpec.class, MapUtils.builder().field(GoodsDonSpec::getGoodsId, views.getId()).build()));
+        views.setSkuList(beanSearcher.searchAll(GoodsDonSku.class, MapUtils.builder().field(GoodsDonSku::getGoodsId, views.getId()).field(GoodsDonSku::getStatus, true)
+                .orderBy(GoodsDonSku::getOrderBy).asc()
+                .build()));
         return GatewayResponse.SUCCESS.newBuilder().toResult(views);
     }