goodsShop新增vipPromotion字段

db/update_251111.sql

@@ -43,5 +43,5 @@ CREATE TABLE vip_promo_record(
 -- 支付详情添加额外参数字段
 alter table pay_details add extra varchar(100) comment '额外备用参数' after remark;
 
-
-
+-- 商品添加参与vip优惠标识 0否 1是
+alter table goods_shop add vip_promotion varchar(1) not null default 0 comment '是否参与vip优惠 0否 1是';

src/main/java/com/sqx/modules/goods/controller/GoodsController.java

@@ -103,9 +103,9 @@ public class GoodsController extends AbstractController {
 
     @ApiOperation("查看所有商铺")
     @GetMapping(value = "selectAllShop")
-    public Result selectAllShop(Integer page, Integer limit, String shopName,String region,Integer isActivity){
+    public Result selectAllShop(Integer page, Integer limit, String shopName,String region,Integer isActivity, String vipPromotion){
 
-        return goodsService.selectAllShop(page, limit, shopName,region,isActivity);
+        return goodsService.selectAllShop(page, limit, shopName,region,isActivity,vipPromotion);
     }
 
     @ApiOperation("查看商品评价详情")

src/main/java/com/sqx/modules/goods/controller/GoodsShopController.java

@@ -136,7 +136,11 @@ public class GoodsShopController {
         return Result.success();
     }
 
-
-
+    @ApiOperation(value = "修改商品是否参与vip优惠", notes = "vipPromotion 是否参与vip优惠活动，0否1是")
+    @PutMapping("/vip-promotion/{shopId}/{vipPromotion}")
+    public Result updateVipPromotion(@PathVariable Long shopId, @PathVariable String vipPromotion){
+        goodsShopService.updateVipPromotion(shopId, vipPromotion);
+        return Result.success();
+    }
 
 }

src/main/java/com/sqx/modules/goods/controller/app/AppGoodsController.java

@@ -2,7 +2,6 @@ package com.sqx.modules.goods.controller.app;
 
 import cn.hutool.core.util.StrUtil;
 import com.sqx.common.utils.Result;
-import com.sqx.modules.app.annotation.Login;
 import com.sqx.modules.goods.dto.ShopQueryDTO;
 import com.sqx.modules.goods.entity.GoodsShop;
 import com.sqx.modules.goods.service.GoodsService;
@@ -11,7 +10,11 @@ import com.sqx.modules.shop.service.SearchHistoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @Api(tags={"用户端-商品"})
 @RestController
@@ -46,22 +49,6 @@ public class AppGoodsController {
         return goodsService.selectGoodsById(goodsId);
     }
 
-    /*@Login
-    @ApiOperation("获取该商品规格名")
-    @GetMapping(value = "selectSkuByGoodsId")
-    public Result selectSkuByGoodsId(Long goodsId){
-        //goodsService.selectSkuByGoodsId(goodsId)
-        return null;
-    }
-
-    @Login
-    @ApiOperation("获取该商品详细规格")
-    @GetMapping(value = "selectAttrByGoodsId")
-    public Result selectAttrByGoodsId(Long goodsId){
-        //goodsService.selectAttrByGoodsId(goodsId);
-        return null;
-    }*/
-
     @ApiOperation("条件筛选店铺")
     @GetMapping(value = "selectShop")
     public Result selectShop(ShopQueryDTO queryDTO){

src/main/java/com/sqx/modules/goods/dao/GoodsShopDao.java

@@ -17,7 +17,7 @@ import java.util.List;
 @Mapper
 public interface GoodsShopDao extends BaseMapper<GoodsShop> {
 
-    IPage<GoodsShop> selectAllShop(@Param("pages") Page<GoodsShop> pages, @Param("shopName") String shopName, @Param("region") String region, @Param("isActivity") Integer isActivity);
+    IPage<GoodsShop> selectAllShop(@Param("pages") Page<GoodsShop> pages, @Param("shopName") String shopName, @Param("region") String region, @Param("isActivity") Integer isActivity, @Param("vipPromotion") String vipPromotion);
 
     IPage<GoodsShop> selectAllShopByAdmin(Page<GoodsShop> pages,@Param("shopName") String shopName,@Param("userId") Long userId);
 

src/main/java/com/sqx/modules/goods/dto/ShopQueryDTO.java

@@ -1,6 +1,8 @@
 package com.sqx.modules.goods.dto;
 
 import com.sqx.common.query.PageQuery;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,6 +12,7 @@ import lombok.Data;
  * @date : 2024-08-28 13:45
  */
 @Data
+@ApiModel("app店铺查询参数")
 public class ShopQueryDTO extends PageQuery {
     private Long userId;
     /**
@@ -27,4 +30,7 @@ public class ShopQueryDTO extends PageQuery {
 
     private String impotr;
     private Long activityId;
+
+    @ApiModelProperty("是否参与vip优惠 0否 1是")
+    private String vipPromotion;
 }

src/main/java/com/sqx/modules/goods/entity/GoodsShop.java

@@ -204,11 +204,20 @@ public class GoodsShop implements Serializable {
     @ApiModelProperty("商家佣金比例")
     private BigDecimal shopRate;
 
-   /* @ApiModelProperty("商户缴纳保证金订单号")
-    private Integer checkNumber;*/
-
+    @ApiModelProperty("排序")
     private Integer sort;
 
+    @ApiModelProperty("是否供应商 0是  1不是")
+    private Integer isSupplier;
+
+    @ApiModelProperty("消息配置  0开启  1关闭")
+    private Integer messageConfiguration;
+
+    @ApiModelProperty("是否隐藏 0不隐藏 1是隐藏")
+    private Integer isConceal;
+
+    @ApiModelProperty("是否参与vip优惠 0否 1是")
+    private String vipPromotion;
 
     @ApiModelProperty("距离")
     @TableField(exist = false)
@@ -218,7 +227,6 @@ public class GoodsShop implements Serializable {
     @TableField(exist = false)
     private Double errandTime;
 
-
     @ApiModelProperty("商铺类型名称")
     @TableField(exist = false)
     private String shopTypeName;
@@ -259,14 +267,4 @@ public class GoodsShop implements Serializable {
 
     public GoodsShop() {
     }
-
-
-    @ApiModelProperty("是否供应商 0是  1不是")
-    private Integer isSupplier;
-
-    @ApiModelProperty("消息配置  0开启  1关闭")
-    private Integer messageConfiguration;
-
-    @ApiModelProperty("是否隐藏 0不隐藏 1是隐藏")
-    private Integer isConceal;
-}
+}

src/main/java/com/sqx/modules/goods/service/GoodsService.java

@@ -1,6 +1,5 @@
 package com.sqx.modules.goods.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.goods.dto.ShopQueryDTO;
@@ -30,7 +29,7 @@ public interface GoodsService extends IService<Goods> {
 
     Result selectShortShop(double lng, double lat, String shopName, Integer page, Integer limit, Long shopId);
 
-    Result selectAllShop(Integer page, Integer limit, String shopName,String region,Integer isActivity);
+    Result selectAllShop(Integer page, Integer limit, String shopName, String region, Integer isActivity, String vipPromotion);
 
     Result selectAdminGoodsList(Integer page, Integer limit, Integer classifyId, String goodsName, Integer status, Long shopId, String shopName);
 

src/main/java/com/sqx/modules/goods/service/GoodsShopService.java

@@ -63,4 +63,11 @@ public interface GoodsShopService extends IService<GoodsShop> {
      * @return 店铺列表
      */
     List<GoodsShop> getAllShops();
+
+    /**
+     * 修改商品是否参与vip优惠
+     * @param shopId 店铺id
+     * @param vipPromotion 是否参与vip优惠活动，0否1是
+     */
+    void updateVipPromotion(Long shopId, String vipPromotion);
 }

src/main/java/com/sqx/modules/goods/service/impl/GoodsServiceImpl.java

@@ -452,9 +452,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsDao, Goods> implements Go
     }
 
     @Override
-    public Result selectAllShop(Integer page, Integer limit, String shopName, String region, Integer isActivity) {
+    public Result selectAllShop(Integer page, Integer limit, String shopName, String region, Integer isActivity, String vipPromotion) {
         Page<GoodsShop> pages = new Page<>(page, limit);
-        PageUtils pageUtils = new PageUtils(goodsShopDao.selectAllShop(pages, shopName, region, isActivity));
+        PageUtils pageUtils = new PageUtils(goodsShopDao.selectAllShop(pages, shopName, region, isActivity,vipPromotion));
         return Result.success().put("data", pageUtils);
     }
 

src/main/java/com/sqx/modules/goods/service/impl/GoodsShopServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sqx.modules.goods.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -606,4 +607,12 @@ public class GoodsShopServiceImpl extends ServiceImpl<GoodsShopDao, GoodsShop> i
         queryWrapper.eq(GoodsShop::getStatus, 1);
         return list(queryWrapper);
     }
+
+    @Override
+    public void updateVipPromotion(Long shopId, String vipPromotion) {
+        GoodsShop goodsShop = new GoodsShop();
+        goodsShop.setShopId(shopId);
+        goodsShop.setVipPromotion(StrUtil.equals(vipPromotion,"1") ? "1" : "0");
+        baseMapper.updateById(goodsShop);
+    }
 }

src/main/resources/mapper/goods/GoodsShopMapper.xml

@@ -26,6 +26,9 @@
                 and gs.activity_id is not null
             </if>
         </if>
+        <if test="vipPromotion != null and vipPromotion != ''">
+            and gs.vip_promotion = #{vipPromotion}
+        </if>
         order by create_time desc
     </select>
 
@@ -249,6 +252,9 @@
                 <if test="shopTypeId!=null">
                     and FIND_IN_SET(#{shopTypeId},gs.shop_type_id)
                 </if>
+                <if test="vipPromotion !=null and vipPromotion != ''">
+                    and gs.vip_promotion = #{vipPromotion}
+                </if>
                 order by
                     gs.is_recommend desc
                 <if test="screen == 1">