Merge branch 'dev' into 'test'

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/mapper/OprationBannerMapper.java

@@ -2,6 +2,9 @@ package com.fzm.mall.server.front.goods.mapper;
 
 import com.fzm.mall.server.front.goods.model.OprationBanner;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +14,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author fzm
  * @since 2021-03-29
  */
+@Mapper
 public interface OprationBannerMapper extends BaseMapper<OprationBanner> {
 
+    List<OprationBanner> listAll(String merchantId);
 }

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/model/OprationBanner.java

@@ -61,5 +61,11 @@ public class OprationBanner implements Serializable {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
 
+    @ApiModelProperty(value = "（销售方式）1.普通 4.盲盒")
+    @TableField(exist = false)
+    private Integer salesType;
 
+    @ApiModelProperty(value = "类型  1:普通   2:预售   3:竞拍   4:秒杀  5.打包  6.NFT")
+    @TableField(exist = false)
+    private Integer goodsType;
 }

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/service/impl/OprationBannerServiceImpl.java

 package com.fzm.mall.server.front.goods.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fzm.mall.server.front.goods.model.OprationBanner;
 import com.fzm.mall.server.front.goods.mapper.OprationBannerMapper;
 import com.fzm.mall.server.front.goods.service.IOprationBannerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,12 +20,11 @@ import java.util.List;
 @Service
 public class OprationBannerServiceImpl extends ServiceImpl<OprationBannerMapper, OprationBanner> implements IOprationBannerService {
 
+    @Autowired
+    private OprationBannerMapper oprationBannerMapper;
+
     @Override
     public List<OprationBanner> getList(String merchantId) {
-        QueryWrapper<OprationBanner> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByAsc("display_order");
-        queryWrapper.eq("status",0);
-        queryWrapper.eq("merchant_id",merchantId);
-        return  list(queryWrapper);
+        return oprationBannerMapper.listAll(merchantId);
     }
 }

mall-server-front/src/main/resources/mapper/goods/OprationBannerMapper.xml

@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fzm.mall.server.front.goods.mapper.OprationBannerMapper">
 
+
+    <select id="listAll" resultType="com.fzm.mall.server.front.goods.model.OprationBanner">
+        select b.*, s.sales_type, s.type as goodsType
+        from opration_banner b
+        left join goods_spu s on b.banner_type = 1 and b.number = s.goods_id
+        where b.merchant_id = #{merchantId} and b.status = 0
+        order by b.display_order desc
+    </select>
 </mapper>