新增购物车订购数量修改接口

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

@@ -11,6 +11,7 @@
 package com.qs.mp.web.controller.api.channel.mall;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.qs.mp.channel.domain.ChannelCart;
 import com.qs.mp.channel.domain.param.ChannelCartParam;
 import com.qs.mp.channel.domain.vo.ChannelCartVO;
@@ -60,7 +61,7 @@ public class ChannelCartController extends BaseApiController {
 
 
   /**
-   * 添加/修改购物车数量
+   * 盲票列表页面点加购
    */
   @PostMapping("/cart/add")
   @ApiOperation(value = "加购物车" , notes = "渠道经销商加购物车")
@@ -72,6 +73,23 @@ public class ChannelCartController extends BaseApiController {
     return AjaxResult.success("操作成功");
   }
 
+  /**
+   * 修改购物车数量
+   */
+  @PostMapping("/cart/update")
+  @ApiOperation(value = "修改购物车数量" , notes = "渠道经销商购物车列表页面直接修改")
+  public AjaxResult update(@RequestBody ChannelCartParam param) {
+    Long channelId = SecurityUtils.getLoginUser().getChannelId();
+    boolean rtn = channelCartService.update(new LambdaUpdateWrapper<ChannelCart>()
+            .set(ChannelCart::getOrderNum, param.getOrderNum())
+        .eq(ChannelCart::getChannelId, channelId)
+        .eq(ChannelCart::getCartId, param.getCartId()));
+    if (!rtn) {
+      return AjaxResult.error("更新失败");
+    }
+    return AjaxResult.success("更新成功");
+  }
+
   /**
    * 删除购物清单项
    */

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
 
@@ -55,6 +56,12 @@ public class TicketAwards implements Serializable {
   @TableField("memo")
   private String memo;
 
+  /**
+   * 中奖率
+   */
+  @TableField("hit_rate")
+  private BigDecimal hitRate;
+
   /**
    * 已兑奖数量
    */

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

@@ -0,0 +1,77 @@
+package com.qs.mp.admin.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * @describe 盲票盒奖项对应的奖品
+ * @auther quanshu
+ * @create 2022-03-02 12:25:55
+ */
+@Data
+public class TicketAwardsPrizeVO {
+
+  /**
+   * 奖项ID
+   */
+  private String awardsId;
+
+  /**
+   * 盲票组ID
+   */
+  private String boxId;
+
+  /**
+   * 奖项名
+   */
+  private String name;
+
+  /**
+   * 奖项顺序
+   */
+  private String sort;
+
+  /**
+   * 奖项数量
+   */
+  private Integer quantity;
+
+  /**
+   * 奖项描述
+   */
+  private String memo;
+
+  /**
+   * 中奖率
+   */
+  private BigDecimal hitRate;
+
+  /******** 奖品 ********/
+  /**
+   * 奖品ID
+   */
+  private String prizeId;
+
+  /**
+   * 奖品ID（GOODS_ID或COUPON_ID)
+   */
+  private String refId;
+
+  /**
+   * 奖品类型 1 实物商品 2优惠券 3平台代币
+   */
+  private String prizeType;
+
+  /**
+   * 奖品价值
+   */
+  private Integer value;
+
+
+}

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

@@ -1,11 +1,15 @@
 package com.qs.mp.admin.domain.vo;
 
 import com.qs.mp.admin.domain.TicketBox;
+import java.util.List;
+import lombok.Data;
 
 /**
  * @author zhongcp
  * @Date 2022/3/5
  */
+@Data
 public class TicketBoxVO extends TicketBox {
-
+  // 奖品列表
+  List<TicketAwardsPrizeVO> prizeList;
 }

mp-service/src/main/java/com/qs/mp/channel/domain/param/ChannelCartParam.java

@@ -14,11 +14,12 @@ public class ChannelCartParam {
 	@ApiModelProperty(value = "盲票组ID",required=true)
 	private String boxId;
 
-	@ApiModelProperty(value = "购物清单ID",required=false)
+	@NotNull(message = "购物清单ID不能为空")
+	@ApiModelProperty(value = "购物清单ID",required=true)
 	private Long cartId;
 
 	@NotNull(message = "订购数量不能为空")
-	@ApiModelProperty(value = "订购数量，负数代表减购",required=true)
+	@ApiModelProperty(value = "订购数量",required=true)
 	private Integer orderNum;
 
 }

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelCartServiceImpl.java

@@ -34,12 +34,7 @@ public class ChannelCartServiceImpl extends ServiceImpl<ChannelCartMapper, Chann
   public boolean addToCart(ChannelCartParam param) {
     Long channelId = SecurityUtils.getLoginUser().getChannelId();
     if (null != param.getCartId() && 0 != param.getCartId()) {
-      // 在购物车里增减
-      ChannelCart channelCart = getById(param.getCartId());
-      if (null == channelCart) {
-        throw new ServiceException("购物清单不存在，请退出后再试");
-      }
-      return refreshCart(param, channelCart);
+      throw new ServiceException("购物清单ID不为空");
     }
 
     // 从盲票销售列表页面点加购