优惠卷详情遗漏更改

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/MarketingController.java

@@ -364,7 +364,7 @@ public class MarketingController extends BaseApiController {
                 BeanUtils.copyProperties(marketingAwards, marketingAwardsVO);
 
                 // 获取奖品信息
-                List<MarketingAwardsPrize> prizeList = marketingAwardsPrizeService.list(new LambdaQueryWrapper<MarketingAwardsPrize>()
+                List<MarketingAwardsPrize> prizeList = marketingAwardsPrizeService.listPrizeVO(new LambdaQueryWrapper<MarketingAwardsPrize>()
                         .eq(MarketingAwardsPrize::getMarketingId, id)
                         .eq(MarketingAwardsPrize::getAwardsId, marketingAwards.getId()));
                 marketingAwardsVO.setPrizeList(prizeList);

mp-service/src/main/java/com/qs/mp/admin/domain/MarketingAwardsPrize.java

@@ -123,5 +123,10 @@ public class MarketingAwardsPrize implements Serializable {
     @TableField("updated_time")
     private Date updatedTime;
 
+    /**
+     * 优惠卷详情
+     */
+    @ApiModelProperty(value = "优惠卷详情")
+    private String couponDetail;
 
 }

mp-service/src/main/java/com/qs/mp/admin/mapper/MarketingAwardsPrizeMapper.java

@@ -1,7 +1,12 @@
 package com.qs.mp.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.qs.mp.admin.domain.MarketingAwardsPrize;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @auther quanshu
@@ -10,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MarketingAwardsPrizeMapper extends BaseMapper<MarketingAwardsPrize> {
 
+    List<MarketingAwardsPrize> listPrizeVO(@Param(Constants.WRAPPER) LambdaQueryWrapper<MarketingAwardsPrize> eq);
 }

mp-service/src/main/java/com/qs/mp/admin/service/IMarketingAwardsPrizeService.java

@@ -1,8 +1,11 @@
 package com.qs.mp.admin.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.mp.admin.domain.MarketingAwardsPrize;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 营销活动奖项对应奖品设置 服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IMarketingAwardsPrizeService extends IService<MarketingAwardsPrize> {
 
+    List<MarketingAwardsPrize> listPrizeVO(LambdaQueryWrapper<MarketingAwardsPrize> eq);
 }

mp-service/src/main/java/com/qs/mp/admin/service/impl/MarketingAwardsPrizeServiceImpl.java

@@ -1,11 +1,14 @@
 package com.qs.mp.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.mp.admin.domain.MarketingAwardsPrize;
 import com.qs.mp.admin.mapper.MarketingAwardsPrizeMapper;
 import com.qs.mp.admin.service.IMarketingAwardsPrizeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 营销活动奖项对应奖品设置 服务实现类
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class MarketingAwardsPrizeServiceImpl extends ServiceImpl<MarketingAwardsPrizeMapper, MarketingAwardsPrize> implements IMarketingAwardsPrizeService {
 
+    @Override
+    public List<MarketingAwardsPrize> listPrizeVO(LambdaQueryWrapper<MarketingAwardsPrize> eq) {
+        return getBaseMapper().listPrizeVO(eq);
+    }
 }

mp-service/src/main/resources/mapper/admin/MarketingAwardsPrizeMapper.xml

@@ -23,5 +23,10 @@
     <sql id="Base_Column_List">
         id, marketing_id, awards_id, ref_id, pic_url, title, prize_type, quantity, value, sort_weight, is_deleted, created_time, updated_time
     </sql>
+    <select id="listPrizeVO" resultType="com.qs.mp.admin.domain.MarketingAwardsPrize">
+        select t1.*,if(t2.coupon_detail is not null, t2.coupon_detail, '') as coupon_detail
+        from mp_marketing_awards_prize t1 left join mp_coupon t2 on t1.ref_id = t2.coupon_id
+        ${ew.customSqlSegment}
+    </select>
 
 </mapper>