zoujiajian před 1 rokem
rodič
revize
d731aff272

+ 2 - 1
netflix-dao/src/main/java/com/cyksj/mapper/GoodsDonSkuMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.dto.OriSkuDto;
 import com.cyksj.model.entity.GoodsDonSku;
 import com.cyksj.model.entity.YhShopGoodsSku;
+import com.cyksj.model.views.GoodsDonSkuDetailView;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -32,5 +33,5 @@ public interface GoodsDonSkuMapper  extends BaseMapper<GoodsDonSku> {
 
 	List<Long> selectGIdsBySkuIds(@Param("ids") List<Long> ids);
 
-	String selectExchangeTitleNoPrice(@Param("ids") List<Long> ids);
+	List<GoodsDonSkuDetailView> selectExchangeTitleSkus(@Param("ids") List<Long> skuIds);
 }

+ 2 - 4
netflix-dao/src/main/java/com/cyksj/model/views/ExchangeCodeDetailView.java

@@ -7,6 +7,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 项目名: yhlxj
@@ -24,11 +25,8 @@ public class ExchangeCodeDetailView {
 	@DbField("ec.sku_ids")
 	private String skuIds;
 
-	/**
-	 * 平台规格
-	 */
 	@DbIgnore
-	private String title;
+	private List<GoodsDonSkuDetailView> skuDetails;
 
 	/**
 	 * 使用状态

+ 3 - 0
netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonSkuDetailView.java

@@ -19,6 +19,9 @@ public class GoodsDonSkuDetailView {
 	@DbField("g.id")
 	private Long goodsId;
 
+	@DbField("g.logo")
+	private String logo;
+
 	@DbField("g.title")
 	private String title;
 

+ 2 - 2
netflix-dao/src/main/resources/mapper/GoodsDonSkuMapper.xml

@@ -72,8 +72,8 @@
         </foreach>
     </select>
 
-    <select id="selectExchangeTitleNoPrice" resultType="java.lang.String">
-        select GROUP_CONCAT(g.title, ifnull(sku.spec_val,''),g.logo) from goods_don_sku sku inner join goods_don g on g.id = sku.goods_id
+    <select id="selectExchangeTitleSkus" resultType="com.cyksj.model.views.GoodsDonSkuDetailView">
+        select g.id as goods_id,g.title,sku.id as sku_id,sku.spec_val,g.logo from goods_don_sku sku inner join goods_don g on g.id = sku.goods_id
         where sku.id in
         <foreach collection="ids" item="item" open="(" separator="," close=")">
             #{item}

+ 2 - 1
netflix-web/src/main/java/com/cyksj/web/controller/user/UserController.java

@@ -127,7 +127,8 @@ public class UserController {
     @GetMapping("/get/ticket/code/detail")
     public Result<ExchangeCodeDetailView> getTicketCodeDetail(String code) throws Exception {
         ExchangeCodeDetailView exchangeCodeDetailView = beanSearcher.searchFirst(ExchangeCodeDetailView.class, MapUtils.flatBuilder(request.getParameterMap()).field(ExchangeCodeDetailView::getCode, code).build());
-        exchangeCodeDetailView.setTitle(skuMapper.selectExchangeTitleNoPrice(Jsons.parseList(exchangeCodeDetailView.getSkuIds(), Long.class)));
+        List<Long> skuIds = Jsons.parseList(exchangeCodeDetailView.getSkuIds(), Long.class);
+        exchangeCodeDetailView.setSkuDetails(skuMapper.selectExchangeTitleSkus(skuIds));
         return GatewayResponse.SUCCESS.newBuilder().toResult(exchangeCodeDetailView);
     }