Merge remote-tracking branch 'origin/pre' into pre

netflix-dao/src/main/java/com/cyksj/mapper/shop/YhShopMapper.java

@@ -1,6 +1,7 @@
 package com.cyksj.mapper.shop;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.dto.YhShopSkuDownInfo;
 import com.cyksj.model.entity.YhShop;
 import com.cyksj.model.entity.YhShopDistributeMoneyApply;
 import com.cyksj.model.views.YhShopDistributeView;
@@ -8,6 +9,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /*
@@ -29,5 +31,5 @@ public interface YhShopMapper extends BaseMapper<YhShop> {
 
 	YhShopDistributeMoneyApply selectRelationBusiness(Long userId);
 
-	String getYhShopSkuSysStatusDownInfo(long userId);
+	List<YhShopSkuDownInfo> getYhShopSkuSysStatusDownInfo(long userId);
 }

netflix-dao/src/main/java/com/cyksj/model/dto/YhShopSkuDownInfo.java

@@ -0,0 +1,18 @@
+package com.cyksj.model.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: YhShopSkuDownInfo
+ * 创建者: JavaZou
+ * 创建时间:2024/4/26 18:19
+ */
+@Getter
+@Setter
+public class YhShopSkuDownInfo {
+	private String title;
+
+	private String specVal;
+}

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

@@ -48,6 +48,11 @@ public class HomeManagementConfig extends BaseEntity{
 	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private AdType adType;
 
+	/**
+	 * 广告是否店铺展示 默认false
+	 */
+	private Boolean isShop;
+
 	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private RgType rgType;
 

netflix-dao/src/main/resources/mapper/YhShopMapper.xml

@@ -62,12 +62,14 @@
                  left join cms_user cu on cu.id = ys.business_id
     </select>
 
-    <select id="getYhShopSkuSysStatusDownInfo" resultType="java.lang.String">
-        select group_CONCAT(g.title, " ", sku.spec_val)
+    <select id="getYhShopSkuSysStatusDownInfo" resultType="com.cyksj.model.dto.YhShopSkuDownInfo">
+        select any_value(g.title) as title, group_concat(sku.spec_val SEPARATOR '') as specVal
         from (select goods_id, sku_id
               from yh_shop_sku_sys_take_down_record
-              where user_id = #{userId} and deleted is true) s
+              where user_id = #{userId}
+                and deleted is true) s
                  inner join goods_don_sku sku on sku.id = s.sku_id
                  inner join goods_don g on g.id = s.goods_id
+        group by g.id
     </select>
 </mapper>

netflix-service/src/main/java/com/cyksj/service/shop/YhShopGoodsSkuService.java

@@ -1,6 +1,7 @@
 package com.cyksj.service.shop;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cyksj.model.dto.YhShopSkuDownInfo;
 import com.cyksj.model.entity.YhShopGoodsSku;
 
 import java.util.List;
@@ -13,7 +14,7 @@ public interface YhShopGoodsSkuService extends IService<YhShopGoodsSku> {
     void saveGoods(List<Long> goodsIds, Long userId);
 
 
-	String yhShopSkuSysStatusDownInfo(long userId);
+	List<YhShopSkuDownInfo> yhShopSkuSysStatusDownInfo(long userId);
 
 	void deleteSkuDownInfo(long userId);
 }

netflix-service/src/main/java/com/cyksj/service/shop/impl/YhShopGoodsSkuServiceImpl.java

@@ -7,6 +7,7 @@ import com.cyksj.mapper.GoodsDonSkuMapper;
 import com.cyksj.mapper.shop.YhShopGoodsSkuMapper;
 import com.cyksj.mapper.shop.YhShopMapper;
 import com.cyksj.mapper.shop.YhShopSkuSysTakeDownRecordMapper;
+import com.cyksj.model.dto.YhShopSkuDownInfo;
 import com.cyksj.model.entity.YhShop;
 import com.cyksj.model.entity.YhShopGoodsSku;
 import com.cyksj.model.entity.YhShopSkuSysTakeDownRecord;
@@ -45,9 +46,9 @@ public class YhShopGoodsSkuServiceImpl extends ServiceImpl<YhShopGoodsSkuMapper,
     }
 
     @Override
-    public String yhShopSkuSysStatusDownInfo(long userId) {
-        String info = yhShopMapper.getYhShopSkuSysStatusDownInfo(userId);
-        return info;
+    public List<YhShopSkuDownInfo> yhShopSkuSysStatusDownInfo(long userId) {
+        List<YhShopSkuDownInfo> infos = yhShopMapper.getYhShopSkuSysStatusDownInfo(userId);
+        return infos;
     }
 
     @Override

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

@@ -5,6 +5,7 @@ import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.shop.YhShopMapper;
+import com.cyksj.model.dto.YhShopSkuDownInfo;
 import com.cyksj.model.entity.YhShop;
 import com.cyksj.model.entity.YhShopGoodsSku;
 import com.cyksj.model.views.YhShopAvailableGoodsView;
@@ -154,10 +155,10 @@ public class YhShopGoodsController {
 	 * @return
 	 */
 	@GetMapping("/get/sku/down/info")
-	public Result<String> yhShopSkuSysStatusDownInfo() {
+	public Result<List<YhShopSkuDownInfo>> yhShopSkuSysStatusDownInfo() {
 		long userId = StpYhShopManageUser.getLoginIdAsLong();
-		String info = yhShopGoodsSkuService.yhShopSkuSysStatusDownInfo(userId);
-		return GatewayResponse.SUCCESS.newBuilder().toResult(info);
+		List<YhShopSkuDownInfo> infos = yhShopGoodsSkuService.yhShopSkuSysStatusDownInfo(userId);
+		return GatewayResponse.SUCCESS.newBuilder().toResult(infos);
 	}
 
 	/**

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

@@ -89,18 +89,16 @@ public class YhShopUserController {
 	 * 设置是否展示广告位
 	 */
 	@PutMapping("/set/shop/ad")
-	public Result<String> setShopAd(@RequestBody YhShop yhShop) {
+	public Result<String> setShopAd() {
 		long userId = StpYhShopManageUser.getLoginIdAsLong();
 		YhShop dbShop = yhShopMapper.selectOne(Wrappers.lambdaQuery(YhShop.class)
 				.eq(YhShop::getUserId, userId).last("limit 1"));
 		if (dbShop == null) {
 			throw BusinessRuntimeException.getInstance("店铺不存在");
 		}
-		if (yhShop.getIsShowAd() != null && dbShop.getIsShowAd() != yhShop.getIsShowAd()) {
-			dbShop.setIsShowAd(yhShop.getIsShowAd());
-			yhShopMapper.updateById(dbShop);
-			refreshCacheService.refreshUserShopMangeCache(dbShop.getCustomId());
-		}
+		dbShop.setIsShowAd(!dbShop.getIsShowAd());
+		yhShopMapper.updateById(dbShop);
+		refreshCacheService.refreshUserShopMangeCache(dbShop.getCustomId());
 		return GatewayResponse.SUCCESS.newBuilder().toResult();
 	}