红包回退

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
 import com.qs.mp.admin.domain.*;
 import com.qs.mp.admin.domain.excel.TicketExcel;
 import com.qs.mp.admin.domain.param.*;
@@ -571,27 +570,6 @@ public class TicketBoxMgrController extends BaseApiController {
 
     }
 
-    /**
-     * 查询单个盲票组绑定的红包奖项或者查询盲票组全部的红包奖项记录
-     * @param jsonObject
-     * @return
-     */
-    @PostMapping(value = "/redEnvelopeAward")
-    @PreAuthorize("@ss.hasPermi('business:awards:query')")
-    @ApiOperation("查询单个盲票组绑定的红包奖项或者查询盲票组全部的红包奖项记录")
-    @com.github.xiaoymin.knife4j.annotations.DynamicParameters(properties = {
-        @DynamicParameter(name = "boxId", value = "盲票组id", required = true, dataTypeClass = Long.class)
-    })
-    @ApiResponses(
-        @ApiResponse(code = 200, message = "查询成功", response = TicketBox.class)
-    )
-    public TableDataInfo redEnvelopeAward(@RequestBody JSONObject jsonObject) {
-        startPage();
-        String boxId = jsonObject.getString("boxId");
-        List<TicketAwardsPrizeVO> TicketAwardsPrizeVO = ticketAwardsPrizeService.listPrizeByBoxIdVO(boxId);
-        return getDataTable(TicketAwardsPrizeVO);
-    }
-
     /**
      * 线下盲票组停售
      * @param

mp-common/src/main/java/com/qs/mp/common/constant/Constants.java

@@ -168,9 +168,4 @@ public class Constants
      * 盲豆默认图片
      */
     public static final String MANGDOU_PIC = "md.png";
-
-    /**
-     * 红包默认图片
-     */
-    public static final String RED_ENVELOPE_PIC = "hb.png";
 }

mp-common/src/main/java/com/qs/mp/common/enums/TicketPrizeTypeEnum.java

@@ -17,7 +17,7 @@ public enum TicketPrizeTypeEnum implements IEnum<String> {
   COUPON("coupon", "优惠券"),
   COUPON_PKG("coupon_pkg", "优惠券包"),
   COIN("coin", "盲豆"),
-  RED_ENVELOPE("red_pkg", "红包");
+  ;
 
   private final String value;
   private final String desc;

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

@@ -29,10 +29,4 @@ public interface TicketAwardsPrizeMapper extends BaseMapper<TicketAwardsPrize> {
 
   List<TicketBox> listTicketDetailRelGoodsId(@Param(Constants.WRAPPER) QueryWrapper<TicketBoxGoodsListVO> queryWrapper);
 
-  /**
-   * 根据商品id查询关联盲票详细信息
-   * @param goodsId
-   * @return
-   */
-  List<TicketBox> listTicketDetailByGoodId(String goodsId);
 }

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

@@ -32,17 +32,4 @@ public interface ITicketAwardsPrizeService extends IService<TicketAwardsPrize> {
 
   List<TicketBox> listTicketDetailRelGoods(QueryWrapper<TicketBoxGoodsListVO> queryWrapper);
 
-  /**
-   * 根据商品id查询关联盲票详细信息
-   * @param goodsId
-   * @return
-   */
-  List<TicketBox> listTicketDetailByGoodId(String goodsId);
-
-  /**
-   * 根据盲票组id查询盲票组红包奖项
-   * @param boxId
-   * @return
-   */
-  List<TicketAwardsPrizeVO> listPrizeByBoxIdVO(String boxId);
 }

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

@@ -649,11 +649,7 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
                     awardsPrize.setTitle(couponPkg.getTitle());
                     awardsPrize.setValue(couponPkg.getFacePrice());
                     awardsPrize.setPicUrl(couponPkg.getPicUrl());
-                }else if(prizeParam.getPrizeType() == TicketPrizeTypeEnum.RED_ENVELOPE){
-                    awardsPrize.setTitle("红包");
-                    awardsPrize.setPicUrl(Constants.RED_ENVELOPE_PIC);
-                }
-                else {
+                } else {
                     awardsPrize.setTitle("盲豆");
                     awardsPrize.setPicUrl(Constants.MANGDOU_PIC);
                 }

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

@@ -13,7 +13,6 @@ import java.util.List;
 
 import com.qs.mp.common.enums.AwardsLabelEnum;
 import org.springframework.stereotype.Service;
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * <p>
@@ -38,11 +37,6 @@ public class TicketAwardsPrizeServiceImpl extends ServiceImpl<TicketAwardsPrizeM
     return getBaseMapper().listTicketDetailRelGoodsId(queryWrapper);
   }
 
-  @Override
-  public List<TicketBox> listTicketDetailByGoodId(String goodsId) {
-    return getBaseMapper().listTicketDetailByGoodId(goodsId);
-  }
-
   @Override
   public List<TicketAwardsPrizeVO> listPrizeVO(Wrapper<TicketAwardsPrize> queryWrapper) {
     return getBaseMapper().listPrizeVO(queryWrapper);
@@ -71,39 +65,4 @@ public class TicketAwardsPrizeServiceImpl extends ServiceImpl<TicketAwardsPrizeM
             .orderByDesc("t2.sort_weight")
             .orderByDesc("t2.value"));
   }
-
-  @Override
-  public List<TicketAwardsPrizeVO> listPrizeByBoxIdVO(String boxId) {
-    StringBuilder sortField = new StringBuilder("FIELD(t1.awards_label,'");
-    int i = 0;
-    for (AwardsLabelEnum awardsLabelEnum : AwardsLabelEnum.values()) {
-      i++;
-      if (i == AwardsLabelEnum.values().length) {
-        sortField.append(awardsLabelEnum.getValue()).append("'");
-      }else {
-        sortField.append(awardsLabelEnum.getValue()).append("','");
-      }
-
-    }
-    sortField.append(")");
-    if (StringUtils.isBlank(boxId)) {
-      //查询盲票组全部的红包记录
-      return listPrizeVO(new QueryWrapper<TicketAwardsPrize>()
-//          .eq("t2.is_deleted", 0)
-          .eq("t2.prize_type","red_pkg")
-          .orderByAsc(sortField.toString())
-          .orderByAsc("t1.sort")
-          .orderByDesc("t2.sort_weight")
-          .orderByDesc("t2.value"));
-    }
-    //查询单个盲票组绑定的红包记录
-    return listPrizeVO(new QueryWrapper<TicketAwardsPrize>()
-        .eq("t1.box_id", boxId)
-        .eq("t2.is_deleted", 0)
-        .eq("t2.prize_type","red_pkg")
-        .orderByAsc(sortField.toString())
-        .orderByAsc("t1.sort")
-        .orderByDesc("t2.sort_weight")
-        .orderByDesc("t2.value"));
-  }
 }

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

@@ -285,10 +285,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
                         awardsPrize.setTitle(couponPkg.getTitle());
                         awardsPrize.setValue(couponPkg.getFacePrice());
                         awardsPrize.setPicUrl(couponPkg.getPicUrl());
-                    } else if(ticketAwardsPrizeParam.getPrizeType() == TicketPrizeTypeEnum.RED_ENVELOPE){
-                        awardsPrize.setTitle("红包");
-                        awardsPrize.setPicUrl(Constants.RED_ENVELOPE_PIC);
-                    } else {
+                    }  else {
                         awardsPrize.setTitle("盲豆");
                         awardsPrize.setPicUrl(Constants.MANGDOU_PIC);
                     }
@@ -539,10 +536,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
                     awardsPrize.setTitle(couponPkg.getTitle());
                     awardsPrize.setValue(couponPkg.getFacePrice());
                     awardsPrize.setPicUrl(couponPkg.getPicUrl());
-                } else if(prizeParam.getPrizeType() == TicketPrizeTypeEnum.RED_ENVELOPE){
-                    awardsPrize.setTitle("红包");
-                    awardsPrize.setPicUrl(Constants.RED_ENVELOPE_PIC);
-                } else {
+                }  else {
                     awardsPrize.setTitle("盲豆");
                     awardsPrize.setPicUrl(Constants.MANGDOU_PIC);
                 }

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

@@ -88,16 +88,4 @@
         from mp_ticket_box t1 left join mp_ticket_awards_prize t2 on t1.box_id = t2.box_id
         ${ew.customSqlSegment}
     </select>
-
-    <select id="listTicketDetailByGoodId" resultType="com.qs.mp.admin.domain.TicketBox">
-        select
-               box_id,title,status
-        from
-             mp_ticket_box
-        where
-              box_id in (
-                  select box_id from mp_ticket_box_goods where ref_id = #{goodsId} and is_deleted = 0
-                  )
-        and is_deleted = 0 order by FIELD(status,'on','wait', 'doing', 'done', 'off','stop')
-    </select>
 </mapper>