Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-server into dev

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

@@ -11,18 +11,13 @@
 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.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;
 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;
@@ -66,16 +61,33 @@ public class ChannelCartController extends BaseApiController {
 
 
   /**
-   * 添加/修改购物车数量
+   * 盲票列表页面点加购
    */
   @PostMapping("/cart/add")
   @ApiOperation(value = "加购物车" , notes = "渠道经销商加购物车")
   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("操作成功");
+  }
+
+  /**
+   * 修改购物车数量
+   */
+  @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("更新成功");
   }
 
   /**
@@ -86,9 +98,9 @@ public class ChannelCartController extends BaseApiController {
   public AjaxResult remove(@RequestBody BatchLongIdsParam param) {
     boolean rtn = channelCartService.removeByIds(param.getIds());
     if (!rtn) {
-      return AjaxResult.success("操作失败");
+      return AjaxResult.error("操作失败");
     }
-    return AjaxResult.error("操作成功");
+    return AjaxResult.success("操作成功");
   }
 
 }

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

@@ -10,25 +10,23 @@
 
 package com.qs.mp.web.controller.api.channel.mall;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.qs.mp.admin.domain.TicketAwardsPrize;
 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.domain.vo.TicketBoxVO;
+import com.qs.mp.admin.service.ITicketAwardsPrizeService;
 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;
@@ -48,6 +46,9 @@ public class ChannelTicketController extends BaseApiController {
   @Autowired
   private ITicketBoxService ticketBoxService;
 
+  @Autowired
+  private ITicketAwardsPrizeService ticketAwardsPrizeService;
+
   @Autowired
   private MapperFacade mapperFacade;
 
@@ -78,6 +79,9 @@ public class ChannelTicketController extends BaseApiController {
       return AjaxResult.error("参数异常，盲票组ID缺失");
     }
     TicketBox ticketBox = ticketBoxService.getById(param.getBoxId());
+    TicketBoxVO ticketBoxVO = mapperFacade.map(ticketBox, TicketBoxVO.class);
+    ticketBoxVO.setPrizeList(ticketAwardsPrizeService.listPrizeVO(new QueryWrapper<TicketAwardsPrize>()
+        .eq("t1.box_id", ticketBox.getBoxId()).orderByAsc("t1.sort")));
     return AjaxResult.success(ticketBox);
   }
 

mp-admin/src/main/resources/application-8100.yml

@@ -116,9 +116,9 @@ client:
 # cloud
 cloud:
   # 存储对象公开可访问
-  public-bucket-name: ygp-public-1307117429
+  public-bucket-name: mp-public-1307117429
   # 存储对象公开不可访问，需要通过应用下载
-  private-bucket-name: ygp-auth-1307117429
+  private-bucket-name: mp-auth-1307117429
 
 # 小程序
 miniprogram:

mp-admin/src/main/resources/application-8200.yml

@@ -116,9 +116,9 @@ client:
 # cloud
 cloud:
   # 存储对象公开可访问
-  public-bucket-name: ygp-public-1307117429
+  public-bucket-name: mp-public-1307117429
   # 存储对象公开不可访问，需要通过应用下载
-  private-bucket-name: ygp-auth-1307117429
+  private-bucket-name: mp-auth-1307117429
 
 # 小程序
 miniprogram:

mp-admin/src/main/resources/application-dev.yml

@@ -109,9 +109,9 @@ client:
 # cloud
 cloud:
     # 存储对象公开可访问
-    public-bucket-name: ygp-public-test-1307117429
+    public-bucket-name: mp-public-test-1307117429
     # 存储对象公开不可访问，需要通过应用下载
-    private-bucket-name: ygp-auth-test-1307117429
+    private-bucket-name: mp-auth-test-1307117429
 
 # 小程序
 miniprogram:

mp-admin/src/main/resources/application-test.yml

@@ -114,9 +114,9 @@ client:
 # cloud
 cloud:
   # 存储对象公开可访问
-  public-bucket-name: ygp-public-test-1307117429
+  public-bucket-name: mp-public-test-1307117429
   # 存储对象公开不可访问，需要通过应用下载
-  private-bucket-name: ygp-auth-test-1307117429
+  private-bucket-name: mp-auth-test-1307117429
 
 # 小程序
 miniprogram:

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;
 
@@ -22,7 +23,7 @@ public class TicketAwards implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "awards_id" , type = IdType.INPUT)
+  @TableId(value = "awards_id" , type = IdType.AUTO)
   private String awardsId;
 
   /**
@@ -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/TicketAwardsPrize.java

@@ -22,8 +22,14 @@ public class TicketAwardsPrize implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "id" , type = IdType.AUTO)
-  private Long id;
+  @TableId(value = "prize_id" , type = IdType.INPUT)
+  private String prizeId;
+
+  /**
+   * 盲票组ID
+   */
+  @TableField("box_id")
+  private String boxId;
 
   /**
    * 奖项ID
@@ -32,13 +38,19 @@ public class TicketAwardsPrize implements Serializable {
   private String awardsId;
 
   /**
-   * 奖品ID（GOODS_ID或TEMPL_ID)
+   * 奖品ID（GOODS_ID或COUPON_ID)
    */
-  @TableField("prize_id")
-  private String prizeId;
+  @TableField("ref_id")
+  private String refId;
 
   /**
-   * 奖品类型（GOODS或VOUCHER或COIN）
+   * 奖品图片url
+   */
+  @TableField("pic_url")
+  private String picUrl;
+
+  /**
+   * 奖品类型 1 实物商品 2优惠券 3平台代币
    */
   @TableField("prize_type")
   private String prizeType;
@@ -55,6 +67,12 @@ public class TicketAwardsPrize implements Serializable {
   @TableField("cashed_qty")
   private Integer cashedQty;
 
+  /**
+   * 奖品价值
+   */
+  @TableField("value")
+  private Integer value;
+
   /**
    * 创建时间
    */

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

@@ -0,0 +1,82 @@
+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;
+
+  /**
+   * 奖品图片
+   */
+  private String picUrl;
+
+  /**
+   * 奖品类型 1 实物商品 2优惠券 3平台代币
+   */
+  private String prizeType;
+
+  /**
+   * 奖品价值
+   */
+  private Integer value;
+
+
+}

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;
@@ -42,12 +42,12 @@ public class TicketBoxListVO {
   /**
    * 盲票包原价
    */
-  private Integer boxPrice;
+  private Integer pkgPrice;
 
   /**
    * 盲票包售价
    */
-  private Integer boxSalePrice;
+  private Integer pkgSalePrice;
 
   /**
    * 每包盲票张数
@@ -87,5 +87,5 @@ public class TicketBoxListVO {
   /**
    * 上架时间
    */
-  private Date putonTime;
+  private Date onTime;
 }

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

@@ -0,0 +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/admin/mapper/TicketAwardsPrizeMapper.java

@@ -1,7 +1,14 @@
 package com.qs.mp.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.qs.mp.admin.domain.TicketAwardsPrize;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qs.mp.admin.domain.vo.TicketAwardsPrizeVO;
+import com.qs.mp.channel.domain.ChannelCart;
+import com.qs.mp.channel.domain.vo.ChannelCartVO;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @auther quanshu
@@ -9,5 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @describe 盲票盒奖项对应的奖品设置mapper类
  */
 public interface TicketAwardsPrizeMapper extends BaseMapper<TicketAwardsPrize> {
-
+  List<TicketAwardsPrizeVO> listPrizeVO(@Param(Constants.WRAPPER) Wrapper<TicketAwardsPrize> queryWrapper);
 }

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

@@ -1,7 +1,12 @@
 package com.qs.mp.admin.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.qs.mp.admin.domain.TicketAwardsPrize;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qs.mp.admin.domain.vo.TicketAwardsPrizeVO;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -12,5 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-03-02
  */
 public interface ITicketAwardsPrizeService extends IService<TicketAwardsPrize> {
-
+  List<TicketAwardsPrizeVO> listPrizeVO(Wrapper<TicketAwardsPrize> queryWrapper);
 }

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

@@ -1,9 +1,12 @@
 package com.qs.mp.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.qs.mp.admin.domain.TicketAwardsPrize;
+import com.qs.mp.admin.domain.vo.TicketAwardsPrizeVO;
 import com.qs.mp.admin.mapper.TicketAwardsPrizeMapper;
 import com.qs.mp.admin.service.ITicketAwardsPrizeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
 import org.springframework.stereotype.Service;
 
 /**
@@ -18,4 +21,8 @@ import org.springframework.stereotype.Service;
 public class TicketAwardsPrizeServiceImpl extends ServiceImpl<TicketAwardsPrizeMapper, TicketAwardsPrize> implements
     ITicketAwardsPrizeService {
 
+  @Override
+  public List<TicketAwardsPrizeVO> listPrizeVO(Wrapper<TicketAwardsPrize> queryWrapper) {
+    return getBaseMapper().listPrizeVO(queryWrapper);
+  }
 }

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/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;
 
 /**

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不为空");
     }
 
     // 从盲票销售列表页面点加购

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

@@ -4,19 +4,29 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.qs.mp.admin.domain.TicketAwardsPrize">
-        <id column="id" property="id" />
+        <id column="prize_id" property="prizeId" />
+        <result column="box_id" property="boxId" />
         <result column="awards_id" property="awardsId" />
-        <result column="prize_id" property="prizeId" />
+        <result column="ref_id" property="refId" />
+        <result column="pic_url" property="picUrl" />
         <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">
-        id, awards_id, prize_id, prize_type, quantity, cashed_qty, created_time, updated_time
+        prize_id, box_id, awards_id, ref_id, pic_url, prize_type, quantity, cashed_qty, value, created_time, updated_time
     </sql>
 
+    <select id="listPrizeVO" resultType="com.qs.mp.admin.domain.vo.TicketAwardsPrizeVO">
+        select t1.*, t2.*
+        from mp_ticket_awards t1
+        left join mp_ticket_awards_prize t2 on t1.awards_id = t2.awards_id
+            ${ew.customSqlSegment}
+    </select>
+
 </mapper>