fix 实物路由器

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

@@ -21,7 +21,7 @@ public class GoodsDonSpec extends BaseEntity {
     /**
      * 规格属性值最大id
      */
-    private Long maxId;
+    private Integer maxId;
 
     /**
      * 商品规格数量

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

@@ -13,8 +13,6 @@ import java.util.List;
 @Getter
 @Setter
 public class ReqGoodsSkuSpec {
-    private Long id;
-
     private String key;
 
     private List<Node> values;
@@ -22,7 +20,7 @@ public class ReqGoodsSkuSpec {
     @Getter
     @Setter
     public static class Node {
-        private Long id;
+        private Integer id;
 
         private String value;
 

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

@@ -20,10 +20,7 @@ public class ReqGoodsSpecSingle {
     private Long goodsId;
 
     @NotNull(message = "缺少规格属性id")
-    private Long id;
-
-    @NotNull(message = "缺少总规格属性id")
-    private Long keyId;
+    private Integer id;
 
     @NotNull(message = "缺少总规格属性id")
     private Integer keyId;
@@ -34,5 +31,5 @@ public class ReqGoodsSpecSingle {
     @NotBlank(message = "缺少属性名.")
     private String name;
 
-    private Long maxId;
+    private Integer maxId;
 }

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

@@ -0,0 +1,96 @@
+package com.cyksj.model.views;
+
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/*
+ *项目名: netflix
+ *文件名: GoodsDonSkuFrontView
+ *创建者: JavaZou
+ *创建时间:2023/4/6 17:58
+ */
+@Getter
+@Setter
+@SearchBean(tables = "goods_don_sku")
+public class GoodsDonSkuFrontView {
+
+	private Long id;
+
+	private Long goodsId;
+
+
+	private String subTitle;
+
+	/**
+	 * 商品规格 ids
+	 */
+	private String specIds;
+
+	/**
+	 * 商品规格 value
+	 */
+	private String specVal;
+
+	/**
+	 * 商品规格 json
+	 */
+	private String specJson;
+
+	/**
+	 * 规格说明信息
+	 */
+	private String notifyText;
+
+	/**
+	 * 商品预览图
+	 */
+	private String picture;
+
+	/**
+	 * 商品详情图
+	 */
+	private String detail;
+
+	/**
+	 * 标签
+	 */
+	private String tags;
+
+
+	/**
+	 * true 上架 / false 下架
+	 */
+	private Boolean status;
+
+	/**
+	 * 价格
+	 */
+	private BigDecimal price;
+
+	/**
+	 * 月数
+	 */
+	private Integer months;
+
+	/**
+	 * 天数
+	 */
+	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;
+
+	private Boolean isDp;
+
+	/**
+	 * 优惠加购商品
+	 */
+	@DbIgnore
+	private List<GoodsDiscountPlusPurchaseRelationFrontView> dpSkuViews;
+}

netflix-service/src/main/java/com/cyksj/service/mange/goods/CmsGoodsDonSpecServiceImpl.java

@@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cyksj.common.exception.BusinessRuntimeException;
-import com.cyksj.common.snowflake.Sequence;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.mapper.GoodsDonMapper;
 import com.cyksj.mapper.GoodsDonSkuMapper;
@@ -24,6 +23,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -39,13 +39,12 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 public class CmsGoodsDonSpecServiceImpl extends ServiceImpl<GoodsDonSpecMapper, GoodsDonSpec> implements CmsGoodsDonSpecService {
-	private final static Sequence SEQUENCE = new Sequence(0);
-
 	private final GoodsDonMapper goodsDonMapper;
 
 	private final GoodsDonSkuMapper goodsDonSkuMapper;
 
 	@Override
+	@Transactional(rollbackFor = Throwable.class)
 	public void insertOrUpdateSkuSpec(ReqGoodsSkuInsert insert, Boolean isUpdate) throws Exception {
 		GoodsDon goods = goodsDonMapper.selectById(insert.getGoodsId());
 		if (null == goods) {

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

@@ -72,7 +72,7 @@ public class CmsGoodsDonSpecController {
         String specsJson = Jsons.toJson(specs);
 
         JavaType type = Jsons.javaType().constructMapType(HashMap.class, Integer.class, ReqGoodsSpecSingle.class);
-        Map<Long, ReqGoodsSpecSingle> map = Jsons.parseObject(v2spec.getSpecMapping(), type);
+        Map<Integer, ReqGoodsSpecSingle> map = Jsons.parseObject(v2spec.getSpecMapping(), type);
         map.put(specSingle.getId(), specSingle);
         String specMapping = Jsons.toJson(map);