소스 검색

查看盲票详情增加优惠券类型

cup 3 년 전
부모
커밋
502a98ebc9

+ 5 - 0
mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketController.java

@@ -41,6 +41,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -107,6 +109,9 @@ public class UserTicketController extends BaseApiController {
    */
   @PostMapping("/mall/ticket/detail")
   @ApiOperation(value = "查看盲票详情", notes = "根据盲票组ID,获取盲票信息")
+  @ApiResponses(
+          @ApiResponse(code = 200, message = "成功", response = TicketBoxVO.class)
+  )
   public AjaxResult getInfo(@RequestBody TicketBoxParam param) {
     if (StringUtils.isBlank(param.getBoxId())) {
       return AjaxResult.error("参数异常,盲票组ID缺失");

+ 4 - 3
mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketAwardsPrizeVO.java

@@ -8,6 +8,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.qs.mp.common.enums.CouponDiscountTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -95,10 +96,10 @@ public class TicketAwardsPrizeVO {
   private String prizeType;
 
   /**
-   * 优惠券类型: 1代金券、2折扣券、3兑换
+   * 优惠券类型: 1用户盲票购买优惠券、2用户门店消费优惠券、3经销商盲票采购优惠
    */
-  @ApiModelProperty("优惠券类型: 1代金券、2折扣券、3兑换券")
-  private String discountType;
+  @ApiModelProperty("优惠券类型: 1用户盲票购买优惠券、2用户门店消费优惠券、3经销商盲票采购优惠券")
+  private String couponType;
 
   /**
    * 奖品价值

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

@@ -25,9 +25,10 @@
     </sql>
 
     <select id="listPrizeVO" resultType="com.qs.mp.admin.domain.vo.TicketAwardsPrizeVO">
-        select t1.*, t2.*
+        select t1.*, t2.*,t3.type couponType
         from mp_ticket_awards t1
         left join mp_ticket_awards_prize t2 on t1.awards_id = t2.awards_id
+        left join mp_coupon t3 on t2.ref_id = t3.coupon_id
             ${ew.customSqlSegment}
     </select>