修改商品接口

src/main/java/com/caimei/controller/ProductApi.java

@@ -64,4 +64,14 @@ public class ProductApi {
         }
         return productService.searchHistory(userId);
     }
+
+    @ApiOperation("删除搜索历史记录")
+    @ApiImplicitParam(name = "userId", required = true, value = "用户id")
+    @GetMapping("/delete/history")
+    public ResponseJson<String> deleteHistory(Integer userId) {
+        if (userId == null) {
+            return ResponseJson.error("参数异常", null);
+        }
+        return productService.deleteHistory(userId);
+    }
 }

src/main/java/com/caimei/mapper/ProductMapper.java

@@ -104,10 +104,11 @@ public interface ProductMapper {
     /**
      * 查询历史记录
      *
-     * @param name 搜索关键词
+     * @param userId 用户id
+     * @param name   搜索关键词
      * @return
      */
-    Integer findSearchHistory(String name);
+    Integer findSearchHistory(@Param("userId") Integer userId, @Param("name") String name);
 
     /**
      * 修改关键词时间
@@ -137,4 +138,11 @@ public interface ProductMapper {
      * @param userId
      */
     void deleteHistoryByUserId(Integer userId);
+
+    /**
+     * 删除历史记录
+     *
+     * @param userId
+     */
+    void deleteHistory(Integer userId);
 }

src/main/java/com/caimei/model/vo/ProductDetailsVo.java

@@ -13,6 +13,11 @@ import java.util.List;
  */
 @Data
 public class ProductDetailsVo extends ProductVo {
+    /**
+     * 上架状态:1上架,2下架
+     */
+    private Integer validFlag;
+
     /**
      * 品牌id
      */
@@ -34,9 +39,9 @@ public class ProductDetailsVo extends ProductVo {
     private Integer tinyTypeId;
 
     /**
-     * 包装规格
+     * 库存
      */
-    private String unit;
+    private Integer stock;
 
     /**
      * 商品标签用英文逗号隔开，中文逗号或其它一律不作切割

src/main/java/com/caimei/model/vo/ProductVo.java

@@ -39,6 +39,11 @@ public class ProductVo implements Serializable {
      */
     private String mainImage;
 
+    /**
+     * 包装规格
+     */
+    private String unit;
+
     /**
      * 活动状态:0没有活动,1活动价
      */

src/main/java/com/caimei/service/ProductService.java

@@ -46,4 +46,12 @@ public interface ProductService {
      * @return
      */
     ResponseJson<List<String>> searchHistory(Integer userId);
+
+    /**
+     * 删除搜索历史记录
+     *
+     * @param userId 用户id
+     * @return
+     */
+    ResponseJson<String> deleteHistory(Integer userId);
 }

src/main/java/com/caimei/service/impl/ProductServiceImpl.java

@@ -68,8 +68,8 @@ public class ProductServiceImpl implements ProductService {
         PageInfo<ProductVo> pageInfo = new PageInfo<>(productList);
 
         //搜索关键字
-        if (StringUtils.isNotBlank(name) && userId != null) {
-            Integer recordId = productMapper.findSearchHistory(name);
+        if (StringUtils.isNotBlank(name) && userId != null && userId > 0) {
+            Integer recordId = productMapper.findSearchHistory(userId, name);
             if (recordId != null && recordId > 0) {
                 productMapper.updateHistoryByDate(recordId);
             } else {
@@ -159,4 +159,10 @@ public class ProductServiceImpl implements ProductService {
         }
         return ResponseJson.success(searchList);
     }
+
+    @Override
+    public ResponseJson<String> deleteHistory(Integer userId) {
+        productMapper.deleteHistory(userId);
+        return ResponseJson.success(null);
+    }
 }

src/main/resources/config/beta/application-beta.yml

@@ -47,4 +47,4 @@ caimei:
   #支付链接重定向地址
   redirectLink: https://spi-b.caimei365.com/PayOrder/jumpPage
   #微服务网关地址
-  userUrl: http://localhost:18002
+  userUrl: https://core-b.caimei365.com

src/main/resources/config/prod/application-prod.yml

@@ -48,4 +48,4 @@ caimei:
   #支付链接重定向地址
   redirectLink: https://spi.caimei365.com/PayOrder/jumpPage
   #微服务网关地址
-  userUrl: http://localhost:18002
+  userUrl: https://core.caimei365.com

src/main/resources/mapper/ProductMapper.xml

@@ -23,6 +23,7 @@
           a.invoiceType,
           a.clubTaxPoint,
           p.name,
+          P.unit,
           p.mainImage
         FROM
           cm_hehe_product a
@@ -72,6 +73,7 @@
           a.includedTax,
           a.invoiceType,
           a.clubTaxPoint,
+          a.validFlag,
           p.name,
           p.mainImage,
           p.brandID AS "brandId",
@@ -79,7 +81,8 @@
           p.smallTypeID AS "smallTypeId",
           p.tinyTypeID AS "tinyTypeId",
           P.unit,
-          p.tags,
+          P.stock,
+          p.tags
         FROM
           cm_hehe_product a
           LEFT JOIN product p ON a.productId = p.productID
@@ -151,11 +154,11 @@
     </select>
 
     <select id="findSearchHistory" resultType="integer">
-        SELECT id FROM user_search_history WHERE searchWord = #{name} LIMIT 1
+        SELECT id FROM user_search_history WHERE searchWord = #{name} AND userId = #{userId} LIMIT 1
     </select>
 
     <update id="updateHistoryByDate">
-        UPDATE SET searchDate = NOW() WHERE id = #{recordId}
+        UPDATE user_search_history SET searchDate = NOW() WHERE id = #{recordId}
     </update>
 
     <insert id="insertSearchHistory">
@@ -193,4 +196,8 @@
         )
     </delete>
 
+    <delete id="deleteHistory">
+        DELETE FROM user_search_history WHERE userId + #{userId}
+    </delete>
+
 </mapper>