会员管理代码

baqing-shop/src/main/java/com/ruoyi/web/modules/goods/constant/GoodsConstants.java

@@ -51,6 +51,8 @@ public final class GoodsConstants
 
     public static final String MSG_SHOP_CATEGORY_INVALID = "请选择本店店铺商品二级分类";
 
+    public static final String MSG_ATTR_TEMPLATE_INVALID = "请选择本店有效属性模版";
+
     public static final String MSG_DELETE_INVALID = "当前状态不可删除";
 
     public static final String MSG_UNFINISHED_ORDER = "该商品存在未完成订单，无法下架";

baqing-shop/src/main/java/com/ruoyi/web/modules/goods/domain/BizGoods.java

@@ -19,6 +19,8 @@ public class BizGoods extends BaseEntity
 
     private Long shopCategoryId;
 
+    private Long attrTemplateId;
+
     private String goodsSn;
 
     private String goodsName;
@@ -92,6 +94,16 @@ public class BizGoods extends BaseEntity
         this.shopCategoryId = shopCategoryId;
     }
 
+    public Long getAttrTemplateId()
+    {
+        return attrTemplateId;
+    }
+
+    public void setAttrTemplateId(Long attrTemplateId)
+    {
+        this.attrTemplateId = attrTemplateId;
+    }
+
     public String getGoodsSn()
     {
         return goodsSn;

baqing-shop/src/main/java/com/ruoyi/web/modules/goods/dto/GoodsSaveDTO.java

@@ -15,6 +15,9 @@ public class GoodsSaveDTO
     /** 店铺商品分类（本店二级，可选） */
     private Long shopCategoryId;
 
+    /** 属性模版（可选，用于删模版校验与编辑回显） */
+    private Long attrTemplateId;
+
     private String goodsName;
 
     private String mainPic;
@@ -60,6 +63,16 @@ public class GoodsSaveDTO
         this.shopCategoryId = shopCategoryId;
     }
 
+    public Long getAttrTemplateId()
+    {
+        return attrTemplateId;
+    }
+
+    public void setAttrTemplateId(Long attrTemplateId)
+    {
+        this.attrTemplateId = attrTemplateId;
+    }
+
     public String getGoodsName()
     {
         return goodsName;

baqing-shop/src/main/java/com/ruoyi/web/modules/goods/service/impl/GoodsServiceImpl.java

@@ -45,6 +45,8 @@ import com.ruoyi.web.modules.store.constant.ShopConstants;
 import com.ruoyi.web.modules.store.domain.BizShop;
 import com.ruoyi.web.modules.store.facade.IShopGlobalConfigFacade;
 import com.ruoyi.web.modules.store.mapper.BizShopMapper;
+import com.ruoyi.web.modules.template.domain.BizGoodsAttrTemplate;
+import com.ruoyi.web.modules.template.mapper.BizGoodsAttrTemplateMapper;
 
 @Service
 public class GoodsServiceImpl implements IGoodsService
@@ -82,6 +84,9 @@ public class GoodsServiceImpl implements IGoodsService
     @Autowired
     private IGoodsOrderFacade goodsOrderFacade;
 
+    @Autowired
+    private BizGoodsAttrTemplateMapper attrTemplateMapper;
+
     @Override
     public List<GoodsListVO> selectPlatformList(BizGoods query)
     {
@@ -135,6 +140,7 @@ public class GoodsServiceImpl implements IGoodsService
         validateSaveFields(dto, true);
         assertPlatformCategoryLevel2(dto.getCategoryId());
         assertShopCategoryIfPresent(shopId, dto.getShopCategoryId());
+        assertAttrTemplateIfPresent(shopId, dto.getAttrTemplateId());
         BizGoods goods = buildGoodsFromDto(dto);
         goods.setShopId(shopId);
         goods.setGoodsSn(goodsSnGenerator.nextSn());
@@ -164,6 +170,7 @@ public class GoodsServiceImpl implements IGoodsService
             assertPlatformCategoryLevel2(dto.getCategoryId());
         }
         assertShopCategoryIfPresent(shopId, dto.getShopCategoryId());
+        assertAttrTemplateIfPresent(shopId, dto.getAttrTemplateId());
         BizGoods update = buildGoodsFromDto(dto);
         update.setGoodsId(dto.getGoodsId());
         update.setUpdateBy(operator);
@@ -403,6 +410,7 @@ public class GoodsServiceImpl implements IGoodsService
         vo.setShopId(goods.getShopId());
         vo.setCategoryId(goods.getCategoryId());
         vo.setShopCategoryId(goods.getShopCategoryId());
+        vo.setAttrTemplateId(goods.getAttrTemplateId());
         vo.setGoodsSn(goods.getGoodsSn());
         vo.setGoodsName(goods.getGoodsName());
         vo.setMainPic(goods.getMainPic());
@@ -421,6 +429,14 @@ public class GoodsServiceImpl implements IGoodsService
         {
             vo.setShopCategoryPath(categoryFacade.getCategoryPath(goods.getShopCategoryId()));
         }
+        if (goods.getAttrTemplateId() != null)
+        {
+            BizGoodsAttrTemplate template = attrTemplateMapper.selectById(goods.getAttrTemplateId(), goods.getShopId());
+            if (template != null)
+            {
+                vo.setAttrTemplateName(template.getTemplateName());
+            }
+        }
         vo.setCanAudit(GoodsConstants.STATUS_PENDING.equals(goods.getGoodsStatus()));
         vo.setCanOffShelf(GoodsConstants.STATUS_ON_SALE.equals(goods.getGoodsStatus()));
         vo.setCanSubmit(canSubmitStatus(goods.getGoodsStatus()));
@@ -513,6 +529,7 @@ public class GoodsServiceImpl implements IGoodsService
         BizGoods goods = new BizGoods();
         goods.setCategoryId(dto.getCategoryId());
         goods.setShopCategoryId(dto.getShopCategoryId());
+        goods.setAttrTemplateId(dto.getAttrTemplateId());
         goods.setGoodsName(dto.getGoodsName());
         goods.setMainPic(dto.getMainPic());
         goods.setDetailContent(dto.getDetailContent());
@@ -589,6 +606,19 @@ public class GoodsServiceImpl implements IGoodsService
         }
     }
 
+    private void assertAttrTemplateIfPresent(Long shopId, Long attrTemplateId)
+    {
+        if (attrTemplateId == null)
+        {
+            return;
+        }
+        BizGoodsAttrTemplate template = attrTemplateMapper.selectById(attrTemplateId, shopId);
+        if (template == null)
+        {
+            throw new ServiceException(GoodsConstants.MSG_ATTR_TEMPLATE_INVALID);
+        }
+    }
+
     private boolean canSubmitStatus(String status)
     {
         return GoodsConstants.STATUS_DRAFT.equals(status)

baqing-shop/src/main/java/com/ruoyi/web/modules/goods/vo/GoodsDetailVO.java

@@ -18,6 +18,10 @@ public class GoodsDetailVO extends GoodsListVO
 
     private String shopCategoryPath;
 
+    private Long attrTemplateId;
+
+    private String attrTemplateName;
+
     private String detailContent;
 
     private String rejectReason;
@@ -80,6 +84,26 @@ public class GoodsDetailVO extends GoodsListVO
         this.shopCategoryPath = shopCategoryPath;
     }
 
+    public Long getAttrTemplateId()
+    {
+        return attrTemplateId;
+    }
+
+    public void setAttrTemplateId(Long attrTemplateId)
+    {
+        this.attrTemplateId = attrTemplateId;
+    }
+
+    public String getAttrTemplateName()
+    {
+        return attrTemplateName;
+    }
+
+    public void setAttrTemplateName(String attrTemplateName)
+    {
+        this.attrTemplateName = attrTemplateName;
+    }
+
     public String getDetailContent()
     {
         return detailContent;

baqing-shop/src/main/resources/mapper/goods/BizGoodsMapper.xml

@@ -7,6 +7,7 @@
         <result property="shopId" column="shop_id"/>
         <result property="categoryId" column="category_id"/>
         <result property="shopCategoryId" column="shop_category_id"/>
+        <result property="attrTemplateId" column="attr_template_id"/>
         <result property="goodsSn" column="goods_sn"/>
         <result property="goodsName" column="goods_name"/>
         <result property="mainPic" column="main_pic"/>
@@ -28,7 +29,7 @@
     </resultMap>
 
     <sql id="selectGoodsVo">
-        select goods_id, shop_id, category_id, shop_category_id, goods_sn, goods_name, main_pic, detail_content,
+        select goods_id, shop_id, category_id, shop_category_id, attr_template_id, goods_sn, goods_name, main_pic, detail_content,
                sale_price, stock, sales_count, goods_status, reject_reason, submit_time, audit_time,
                off_shelf_time, del_flag, create_by, create_time, update_by, update_time, remark
         from biz_goods
@@ -149,10 +150,10 @@
 
     <insert id="insert" useGeneratedKeys="true" keyProperty="goodsId">
         insert into biz_goods (
-            shop_id, category_id, shop_category_id, goods_sn, goods_name, main_pic, detail_content,
+            shop_id, category_id, shop_category_id, attr_template_id, goods_sn, goods_name, main_pic, detail_content,
             sale_price, stock, sales_count, goods_status, del_flag, create_by, create_time
         ) values (
-            #{shopId}, #{categoryId}, #{shopCategoryId}, #{goodsSn}, #{goodsName}, #{mainPic}, #{detailContent},
+            #{shopId}, #{categoryId}, #{shopCategoryId}, #{attrTemplateId}, #{goodsSn}, #{goodsName}, #{mainPic}, #{detailContent},
             #{salePrice}, #{stock}, #{salesCount}, #{goodsStatus}, #{delFlag}, #{createBy}, sysdate()
         )
     </insert>
@@ -162,6 +163,7 @@
         <set>
             <if test="categoryId != null">category_id = #{categoryId},</if>
             <if test="shopCategoryId != null">shop_category_id = #{shopCategoryId},</if>
+            <if test="attrTemplateId != null">attr_template_id = #{attrTemplateId},</if>
             <if test="goodsName != null">goods_name = #{goodsName},</if>
             <if test="mainPic != null">main_pic = #{mainPic},</if>
             <if test="detailContent != null">detail_content = #{detailContent},</if>

baqing-shop/src/test/java/com/ruoyi/web/modules/goods/service/GoodsServiceImplTest.java

@@ -8,6 +8,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import org.mockito.ArgumentCaptor;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Collections;
@@ -42,6 +43,8 @@ import com.ruoyi.web.modules.store.constant.ShopConstants;
 import com.ruoyi.web.modules.store.domain.BizShop;
 import com.ruoyi.web.modules.store.facade.IShopGlobalConfigFacade;
 import com.ruoyi.web.modules.store.mapper.BizShopMapper;
+import com.ruoyi.web.modules.template.domain.BizGoodsAttrTemplate;
+import com.ruoyi.web.modules.template.mapper.BizGoodsAttrTemplateMapper;
 
 @ExtendWith(MockitoExtension.class)
 class GoodsServiceImplTest
@@ -79,6 +82,9 @@ class GoodsServiceImplTest
     @Mock
     private IGoodsOrderFacade goodsOrderFacade;
 
+    @Mock
+    private BizGoodsAttrTemplateMapper attrTemplateMapper;
+
     @InjectMocks
     private GoodsServiceImpl goodsService;
 
@@ -378,6 +384,61 @@ class GoodsServiceImplTest
         assertTrue(ex.getMessage().contains("店铺商品二级分类"));
     }
 
+    @Test
+    void insert_withAttrTemplate_persistsTemplateId()
+    {
+        when(goodsSnGenerator.nextSn()).thenReturn("G20260526000003");
+        BizGoodsCategory platformCat = new BizGoodsCategory();
+        platformCat.setCategoryLevel(CategoryConstants.LEVEL_TWO);
+        when(categoryMapper.selectById(100L, null)).thenReturn(platformCat);
+        BizGoodsAttrTemplate template = new BizGoodsAttrTemplate();
+        template.setTemplateId(4L);
+        when(attrTemplateMapper.selectById(4L, 10L)).thenReturn(template);
+        when(goodsMapper.insert(any())).thenAnswer(inv -> {
+            BizGoods g = inv.getArgument(0);
+            g.setGoodsId(101L);
+            return 1;
+        });
+
+        GoodsSaveDTO dto = new GoodsSaveDTO();
+        dto.setCategoryId(100L);
+        dto.setAttrTemplateId(4L);
+        dto.setGoodsName("复合肥");
+        dto.setMainPic("/a.jpg");
+        dto.setDetailContent("detail");
+        dto.setSalePrice(new BigDecimal("10"));
+        dto.setStock(5);
+
+        goodsService.insertSellerGoods(10L, dto, "seller");
+
+        ArgumentCaptor<BizGoods> captor = ArgumentCaptor.forClass(BizGoods.class);
+        verify(goodsMapper).insert(captor.capture());
+        assertEquals(4L, captor.getValue().getAttrTemplateId());
+    }
+
+    @Test
+    void insert_invalidAttrTemplate_fails()
+    {
+        BizGoodsCategory platformCat = new BizGoodsCategory();
+        platformCat.setCategoryLevel(CategoryConstants.LEVEL_TWO);
+        when(categoryMapper.selectById(100L, null)).thenReturn(platformCat);
+        when(attrTemplateMapper.selectById(999L, 10L)).thenReturn(null);
+
+        GoodsSaveDTO dto = new GoodsSaveDTO();
+        dto.setCategoryId(100L);
+        dto.setAttrTemplateId(999L);
+        dto.setGoodsName("复合肥");
+        dto.setMainPic("/a.jpg");
+        dto.setDetailContent("detail");
+        dto.setSalePrice(new BigDecimal("10"));
+        dto.setStock(5);
+
+        ServiceException ex = assertThrows(ServiceException.class,
+                () -> goodsService.insertSellerGoods(10L, dto, "seller"));
+        assertTrue(ex.getMessage().contains("属性模版"));
+        verify(goodsMapper, never()).insert(any());
+    }
+
     @Test
     void delete_draft_success()
     {

sql/biz_goods.sql

@@ -4,6 +4,7 @@ CREATE TABLE IF NOT EXISTS `biz_goods` (
   `shop_id` bigint(20) NOT NULL COMMENT '店铺ID',
   `category_id` bigint(20) NOT NULL COMMENT '平台端二级分类ID',
   `shop_category_id` bigint(20) DEFAULT NULL COMMENT '店铺商品分类ID（本店二级）',
+  `attr_template_id` bigint(20) DEFAULT NULL COMMENT '属性模版ID',
   `goods_sn` varchar(32) NOT NULL COMMENT '商品编号',
   `goods_name` varchar(200) NOT NULL COMMENT '商品名称',
   `main_pic` varchar(512) NOT NULL COMMENT '主图',
@@ -27,6 +28,7 @@ CREATE TABLE IF NOT EXISTS `biz_goods` (
   KEY `idx_shop_status` (`shop_id`,`goods_status`,`del_flag`),
   KEY `idx_category_id` (`category_id`,`del_flag`),
   KEY `idx_shop_category_id` (`shop_category_id`,`del_flag`),
+  KEY `idx_attr_template_id` (`attr_template_id`,`del_flag`),
   KEY `idx_submit_time` (`submit_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品';