商品搜索相关接口修改

alien-entity/src/main/java/shop/alien/entity/second/SecondGoods.java

@@ -36,9 +36,9 @@ public class SecondGoods implements Serializable {
     @ApiModelProperty(value = "商品封面图片")
     private String homeImage;
 
-    @TableField("describe")
+    @TableField("description")
     @ApiModelProperty(value = "商品描述")
-    private String describe;
+    private String description;
 
     @TableField("price")
     @ApiModelProperty(value = "商品价格（元，保留小数后两位）")
@@ -94,7 +94,7 @@ public class SecondGoods implements Serializable {
     @TableLogic
     private Integer deleteFlag;
 
-    @TableField(value = "created_time", fill = FieldFill.INSERT)
+    @TableField(value = "release_time", fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "发布时间")
     private Date releaseTime;

alien-second/src/main/java/shop/alien/second/controller/SecondGoodsController.java

@@ -47,13 +47,19 @@ public class SecondGoodsController {
     @PostMapping("/save")
     @ApiOperation("发布二手商品")
     public R<Void> addSecondGoods(@ApiParam("二手商品信息") @RequestBody SecondGoodsVo secondGoods) {
-        if(secondGoods.getSaveType().equals(1)){
+        JSONObject data = JwtUtil.getCurrentUserInfo();
+        if (null != data) {
+            int userId = data.getInteger("userId");
+            secondGoods.setUserId(userId);// 设置用户ID （发布者）
+        }
+        if(secondGoods.getSaveType().equals(0)){
             if (!secondGoodsService.saveAsDraft(secondGoods)) {
                 return R.fail("保存商品为草稿失败");
             }
             return R.success("保存商品为草稿成功");
         } else {
-            if (!secondGoodsService.createBasicInfo(secondGoods)) {
+            // 添加商品 0 创建
+            if (!secondGoodsService.createBasicInfo(secondGoods,0)) {
                 return R.fail("添加二手商品失败");
             }
             return R.success("添加二手商品成功");
@@ -66,7 +72,8 @@ public class SecondGoodsController {
     @PostMapping("/edit")
     @ApiOperation("更新二手商品")
     public R<Void> updateSecondGoods(@ApiParam("二手商品信息") @RequestBody SecondGoodsVo secondGoods) {
-        if (!secondGoodsService.createBasicInfo(secondGoods)) {
+        // 添加商品 0 创建 1 更新
+        if (!secondGoodsService.createBasicInfo(secondGoods,1)) {
             return R.fail("添加二手商品失败");
         }
         return R.success("添加二手商品成功");

alien-second/src/main/java/shop/alien/second/service/SecondGoodsService.java

@@ -15,9 +15,10 @@ public interface SecondGoodsService extends IService<SecondGoods> {
     /**
      * 创建二手商品基本信息
      * @param goods 二手商品实体
+     * @param editFlag 编辑标识 0:创建 1:编辑
      * @return 是否成功保存
      */
-    boolean createBasicInfo(SecondGoodsVo goods);
+    boolean createBasicInfo(SecondGoodsVo goods, Integer editFlag);
 
     /**
      * 保存为草稿

alien-second/src/main/java/shop/alien/second/service/impl/SecondGoodsServiceImpl.java

@@ -76,11 +76,10 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
      */
     @Override
     public boolean saveAsDraft(SecondGoodsVo goods) {
+        SecondGoods secondGoods = new SecondGoods();
+        BeanUtils.copyProperties(goods, secondGoods);
         // 设置商品状态为草稿
-        goods.setUserId(1);
         goods.setGoodsStatus(0); // TODO: 使用常量或枚举代替硬编码
-        goods.setCreatedUserId(1);
-        goods.setUpdatedUserId(1);
         // 保存商品基本信息
         if (!save(goods)) {
             return false; // 保存失败直接返回
@@ -96,14 +95,22 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
 
 
     @Override
-    public boolean createBasicInfo(SecondGoodsVo goodsDTO) {
+    public boolean createBasicInfo(SecondGoodsVo goodsDTO,Integer editFlag) {
         // 实现基本信息保存逻辑
         SecondGoods goods = new SecondGoods();
-        BeanUtils.copyProperties(goods, goodsDTO);
+        BeanUtils.copyProperties(goodsDTO, goods);
 
-        // 保存商品基本信息
-        if (!save(goods)) {
-            return false; // 保存失败直接返回
+        if (editFlag == 1){
+            goods.setId(goodsDTO.getId());
+            // 保存商品基本信息
+            if (!updateById(goods)) {
+                return false; // 保存失败直接返回
+            }
+        } else {
+            // 保存商品基本信息
+            if (!save(goods)) {
+                return false; // 保存失败直接返回
+            }
         }
 
         // 获取保存后的商品ID，用于后续业务处理
@@ -153,7 +160,7 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
      */
     private boolean performContentReviews(SecondGoods goods, SecondGoodsVo goodsDTO) {
         // 文本审核
-        Map<String, String> textCheckResult = TextCheckUtil.check(goodsDTO.getDescribe());
+        Map<String, String> textCheckResult = TextCheckUtil.check(goodsDTO.getDescription());
         if (!"200".equals(textCheckResult.get("code"))) {
             // 文本审核不通过
             goods.setGoodsStatus(2); // 审核失败
@@ -399,6 +406,7 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
             if (userId != null) {
                 LambdaUpdateWrapper<LifeCollect> updateWrapper = new LambdaUpdateWrapper<>();
                 updateWrapper.eq(LifeCollect::getUserId, "user_"+phone)
+                        // TODo 商品ID
                         .eq(LifeCollect::getGoodsId, goods.getId());
                         if (lifeCollectMapper.selectCount(updateWrapper) > 0) {
                             goods.setCollectStatus(1);