소스 검색

修改奖品字段

chunping 3 년 전
부모
커밋
31bcc0a42d

+ 2 - 8
mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelCartController.java

@@ -11,18 +11,12 @@
 package com.qs.mp.web.controller.api.channel.mall;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.mp.admin.domain.TicketBox;
-import com.qs.mp.admin.domain.param.TicketBoxListVO;
-import com.qs.mp.admin.domain.param.TicketBoxParam;
-import com.qs.mp.admin.service.ITicketBoxService;
 import com.qs.mp.channel.domain.ChannelCart;
 import com.qs.mp.channel.domain.param.ChannelCartParam;
 import com.qs.mp.channel.domain.vo.ChannelCartVO;
 import com.qs.mp.channel.service.IChannelCartService;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.domain.param.BatchLongIdsParam;
-import com.qs.mp.common.enums.TicketBoxStatusEnum;
-import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
@@ -73,9 +67,9 @@ public class ChannelCartController extends BaseApiController {
   public AjaxResult add(@RequestBody ChannelCartParam param) {
     boolean rtn = channelCartService.addToCart(param);
     if (!rtn) {
-      return AjaxResult.success("操作成功");
+      return AjaxResult.error("操作失败");
     }
-    return AjaxResult.error("操作失败");
+    return AjaxResult.success("操作成功");
   }
 
   /**

+ 1 - 8
mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelTicketController.java

@@ -12,23 +12,16 @@ package com.qs.mp.web.controller.api.channel.mall;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.mp.admin.domain.TicketBox;
-import com.qs.mp.admin.domain.param.TicketBoxListVO;
+import com.qs.mp.admin.domain.vo.TicketBoxListVO;
 import com.qs.mp.admin.domain.param.TicketBoxParam;
 import com.qs.mp.admin.service.ITicketBoxService;
-import com.qs.mp.channel.domain.ChannelAddr;
-import com.qs.mp.channel.domain.param.AddrParam;
-import com.qs.mp.channel.service.IChannelAddrService;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.enums.TicketBoxStatusEnum;
 import com.qs.mp.common.utils.StringUtils;
-import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import javax.validation.Valid;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
 import org.springframework.beans.factory.annotation.Autowired;

+ 15 - 3
mp-service/src/main/java/com/qs/mp/admin/domain/TicketAwardsPrize.java

@@ -25,6 +25,12 @@ public class TicketAwardsPrize implements Serializable {
   @TableId(value = "prize_id" , type = IdType.INPUT)
   private String prizeId;
 
+  /**
+   * 盲票组ID
+   */
+  @TableField("box_id")
+  private String boxId;
+
   /**
    * 奖项ID
    */
@@ -38,10 +44,10 @@ public class TicketAwardsPrize implements Serializable {
   private String refId;
 
   /**
-   * 奖品类型(GOODS或COUPON或COIN)
+   * 奖品类型 1 实物商品 2优惠券 3平台代币
    */
-  @TableField("ref_type")
-  private String refType;
+  @TableField("prize_type")
+  private String prizeType;
 
   /**
    * 奖品数
@@ -55,6 +61,12 @@ public class TicketAwardsPrize implements Serializable {
   @TableField("cashed_qty")
   private Integer cashedQty;
 
+  /**
+   * 奖品价值
+   */
+  @TableField("value")
+  private Integer value;
+
   /**
    * 创建时间
    */

+ 1 - 1
mp-service/src/main/java/com/qs/mp/admin/domain/param/TicketBoxListVO.java → mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketBoxListVO.java

@@ -1,4 +1,4 @@
-package com.qs.mp.admin.domain.param;
+package com.qs.mp.admin.domain.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 11 - 0
mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketBoxVO.java

@@ -0,0 +1,11 @@
+package com.qs.mp.admin.domain.vo;
+
+import com.qs.mp.admin.domain.TicketBox;
+
+/**
+ * @author zhongcp
+ * @Date 2022/3/5
+ */
+public class TicketBoxVO extends TicketBox {
+
+}

+ 1 - 1
mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelCartVO.java

@@ -1,6 +1,6 @@
 package com.qs.mp.channel.domain.vo;
 
-import com.qs.mp.admin.domain.param.TicketBoxListVO;
+import com.qs.mp.admin.domain.vo.TicketBoxListVO;
 import lombok.Data;
 
 /**

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

@@ -5,18 +5,20 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.qs.mp.admin.domain.TicketAwardsPrize">
         <id column="prize_id" property="prizeId" />
+        <result column="box_id" property="boxId" />
         <result column="awards_id" property="awardsId" />
         <result column="ref_id" property="refId" />
-        <result column="prize_type" property="refType" />
+        <result column="prize_type" property="prizeType" />
         <result column="quantity" property="quantity" />
         <result column="cashed_qty" property="cashedQty" />
+        <result column="value" property="value" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        prize_id, awards_id, ref_id, ref_type, quantity, cashed_qty, created_time, updated_time
+        prize_id, box_id, awards_id, ref_id, prize_type, quantity, cashed_qty, value, created_time, updated_time
     </sql>
 
 </mapper>