Merge remote-tracking branch 'remotes/origin/developer' into developerA

# Conflicts:
#	src/main/java/com/caimei365/commodity/service/PageService.java

src/main/java/com/caimei365/commodity/components/SearchOpenService.java

@@ -101,6 +101,7 @@ public class SearchOpenService {
         JSONObject result = jsonObj.getJSONObject("result");
         JSONArray errors = jsonObj.getJSONArray("errors");
         log.info(">>>>>>query(" + queryStr + "): " + status + ",request_id=" + requestId + ",errors=" + errors.toString() + ",tracer=" + tracer);
+        log.info("查询结果---------------------------------------------》result: "+result.toString());
         if ("OK".equals(status)) {
             result.put("status", 1);
         } else {

src/main/java/com/caimei365/commodity/controller/CouponApi.java

@@ -54,7 +54,7 @@ public class CouponApi {
     @ApiOperation("活动页")
     @ApiImplicitParams({
             @ApiImplicitParam(required = true, name = "couponId", value = "优惠券id"),
-            @ApiImplicitParam(required = true, name = "source", value = "来源 : 1 网站 ; 2 小程序"),
+            @ApiImplicitParam(required = true, name = "source", value = "来源 : 1 小程序 ; 2 网站"),
             @ApiImplicitParam(required = true, name = "userId", value = "机构用户id"),
             @ApiImplicitParam(required = false, name = "pageNum", value = "页码"),
             @ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
@@ -130,7 +130,7 @@ public class CouponApi {
     @ApiOperation("商品详情相关优惠券")
     @ApiImplicitParams({
             @ApiImplicitParam(required = false, name = "userId", value = "机构用户id"),
-            @ApiImplicitParam(required = true, name = "source", value = "来源 : 1 网站 ; 2 小程序"),
+            @ApiImplicitParam(required = true, name = "source", value = "来源 : 1 小程序 ; 2 网站"),
             @ApiImplicitParam(required = true, name = "productId", value = "商品id"),
             @ApiImplicitParam(required = true, name = "status", value = "状态: 1未领取 2已领取")
     })

src/main/java/com/caimei365/commodity/controller/ProductPageApi.java

@@ -113,6 +113,15 @@ public class ProductPageApi {
         return pageService.getcapacity(id);
     }
 
+    @ApiOperation("根据id查自由页")
+    @GetMapping("/home/free")
+    public ResponseJson<CmPageVo> getFree(Integer id) {
+        if (id == null || id==0) {
+            return ResponseJson.error("参数异常", null);
+        }
+        return pageService.getFree(id);
+    }
+
 
 
 

src/main/java/com/caimei365/commodity/controller/ProductPriceApi.java

@@ -58,7 +58,7 @@ public class ProductPriceApi {
     @ApiImplicitParams({
             @ApiImplicitParam(required = true, name = "userId", value = "用户Id"),
             @ApiImplicitParam(required = true, name = "productIds", value = "商品Ids,逗号拼接"),
-            @ApiImplicitParam(required = true, name = "source", value = "来源 : 1 网站 ; 2 小程序")
+            @ApiImplicitParam(required = true, name = "source", value = "来源 : 1 小程序 ; 2 网站")
     })
     @GetMapping("/list")
     public ResponseJson<List<PriceVo>> getProductPrice(Integer userId, String productIds, Integer source) {

src/main/java/com/caimei365/commodity/mapper/CouponMapper.java

@@ -40,7 +40,7 @@ public interface CouponMapper {
      * 查询优惠券对应商品
      *
      * @param couponId 优惠券id
-     * @param source   来源 : 1 网站 ; 2 小程序
+     * @param source   来源 : 1 小程序 ; 2 网站
      * @return
      */
     List<ProductItemVo> findCouponProduct(@Param("couponId") Integer couponId, @Param("source") Integer source, @Param("identity") Integer identity);

src/main/java/com/caimei365/commodity/model/dto/CollarCouponsDto.java

@@ -19,6 +19,6 @@ public class CollarCouponsDto implements Serializable {
     @ApiModelProperty("机构用户id")
     private Integer userId;
 
-    @ApiModelProperty("来源 : 1 网站 ; 2 小程序")
+    @ApiModelProperty("来源 : 1 小程序 ; 2 网站")
     private Integer source;
 }

src/main/java/com/caimei365/commodity/model/dto/RedeemCouponsDto.java

@@ -17,6 +17,6 @@ public class RedeemCouponsDto {
     @ApiModelProperty("兑换码")
     private String redemptionCode;
 
-    @ApiModelProperty("来源 : 1 网站 ; 2 小程序")
+    @ApiModelProperty("来源 : 1 小程序 ; 2 网站")
     private Integer source;
 }

src/main/java/com/caimei365/commodity/model/vo/CmPageVo.java

@@ -68,4 +68,20 @@ public class CmPageVo implements Serializable {
      * 资讯信息浮窗状态：0停用，1启用
      */
     private Integer infoBarStatus;
+    /**
+     * 背景色
+     */
+    private String backgroundColour;
+    /**
+     * 背景图
+     */
+    private String backgroundImage;
+    /**
+     * 背景图方式：1平铺、2填充
+     */
+    private Integer backgroundImageWay;
+    /**
+     * 填充背景类型默认不显示 ：1使用颜色，2使用背景图
+     */
+    private Integer backgroundType;
 }

src/main/java/com/caimei365/commodity/model/vo/CouponVo.java

@@ -15,6 +15,10 @@ import java.util.Date;
  */
 @Data
 public class CouponVo implements Serializable {
+    /**
+     * 购买方式 1.直接购买 2.采美豆抵扣
+     */
+    private Integer couponPayWay;
     /**
      * 优惠券id
      */

src/main/java/com/caimei365/commodity/model/vo/PageDetailVo.java

@@ -65,4 +65,16 @@ public class PageDetailVo implements Serializable {
      * 项目仪器中层数据
      */
     private List<PageFloorVo> floorList;
+    /**
+     * 背景色
+     */
+    private String backgroundColour;
+    /**
+     * 背景图
+     */
+    private String backgroundImage;
+
+    private Integer backgroundImageWay;
+
+    private Integer backgroundType;
 }

src/main/java/com/caimei365/commodity/service/CouponService.java

@@ -77,7 +77,7 @@ public interface CouponService {
      *
      * @param userId    机构用户id
      * @param productId 商品id
-     * @param source    来源 : 1 网站 ; 2 小程序
+     * @param source    来源 : 1 小程序 ; 2 网站
      * @param status    状态: 1未领取 2已领取
      * @return
      */

src/main/java/com/caimei365/commodity/service/PageService.java

@@ -162,7 +162,7 @@ public interface PageService {
      *
      * @param userId    机构用户id
      * @param productId 商品id
-     * @param source    来源 : 1 网站 ; 2 小程序
+     * @param source    来源 : 1 小程序 ; 2 网站
      * @return
      */
     Boolean setCouponsLogo(Integer userId, Integer productId, Integer source);
@@ -225,6 +225,8 @@ public interface PageService {
      */
     ResponseJson<PaginationVo<BaikeProductVo>> getBaikeTypeData(Integer typeId, int pageNum, int pageSize);
 
+    ResponseJson<CmPageVo> getFree(Integer id);
+
     /**
      * 设置跳转参数
      * @param floorContent

src/main/java/com/caimei365/commodity/service/PriceService.java

@@ -27,7 +27,7 @@ public interface PriceService {
      *
      * @param userId     用户Id
      * @param productIds 商品Id
-     * @param source     来源 : 1 网站 ; 2 小程序
+     * @param source     来源 : 1 小程序 ; 2 网站
      * @return List<PriceVo>
      */
     ResponseJson<List<PriceVo>> getListPrice(Integer userId, String productIds, Integer source);

src/main/java/com/caimei365/commodity/service/impl/CouponServiceImpl.java

@@ -88,7 +88,7 @@ public class CouponServiceImpl implements CouponService {
      *
      * @param couponId 活动券id
      * @param userId   机构用户id
-     * @param source   来源 : 1 网站 ; 2 小程序
+     * @param source   来源 : 1 小程序 ; 2 网站
      * @param pageNum  页码
      * @param pageSize 每页数量
      */

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -247,8 +247,8 @@ public class PageServiceImpl implements PageService {
         } else {
             map.put("couponEntry", 2);
         }
-       List<AnnouncementPo>annlist= announcementMapper.gteannhade();
-        map.put("annlist",annlist);
+        List<AnnouncementPo> annlist = announcementMapper.gteannhade();
+        map.put("annlist", annlist);
         return ResponseJson.success(map);
     }
 
@@ -839,7 +839,7 @@ public class PageServiceImpl implements PageService {
     @Override
     public ResponseJson<PaginationVo<AnnouncementPo>> getannlist(int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<AnnouncementPo>list= announcementMapper.getannlist();
+        List<AnnouncementPo> list = announcementMapper.getannlist();
         PaginationVo<AnnouncementPo> pageData = new PaginationVo(list);
         return ResponseJson.success(pageData);
     }
@@ -851,7 +851,7 @@ public class PageServiceImpl implements PageService {
      */
     @Override
     public ResponseJson<AnnouncementPo> getcapacity(Integer id) {
-        AnnouncementPo announcementPo= announcementMapper.getcapacity(id);
+        AnnouncementPo announcementPo = announcementMapper.getcapacity(id);
         return ResponseJson.success(announcementPo);
     }
 
@@ -1299,4 +1299,10 @@ public class PageServiceImpl implements PageService {
         PaginationVo<BaikeProductVo> pageData = new PaginationVo<>(productList);
         return ResponseJson.success(pageData);
     }
+
+    @Override
+    public ResponseJson<CmPageVo> getFree(Integer id) {
+        CmPageVo cmPageById = pageMapper.findCmPageById(id);
+        return ResponseJson.success(cmPageById);
+    }
 }

src/main/java/com/caimei365/commodity/service/impl/SearchProductServiceImpl.java

@@ -5,6 +5,7 @@ import com.aliyun.opensearch.sdk.dependencies.org.json.JSONException;
 import com.aliyun.opensearch.sdk.dependencies.org.json.JSONObject;
 import com.aliyun.opensearch.sdk.generated.commons.OpenSearchClientException;
 import com.aliyun.opensearch.sdk.generated.commons.OpenSearchException;
+import com.aliyun.opensearch.sdk.generated.search.DeepPaging;
 import com.aliyun.opensearch.sdk.generated.search.SearchParams;
 import com.caimei365.commodity.components.PriceUtilService;
 import com.caimei365.commodity.components.SearchOpenService;
@@ -119,6 +120,7 @@ public class SearchProductServiceImpl implements SearchProductService {
         }
         // 阿里云搜索
         ResponseJson<String> result = queryProduct(queryStr, filter, identity, pageNum, pageSize, sortField, sortType);
+        log.info("商品查询返回结果------------------------》"+result.toString());
         if (0 == result.getCode()) {
             return result;
         } else {
@@ -130,6 +132,7 @@ public class SearchProductServiceImpl implements SearchProductService {
 
     @Override
     public ResponseJson<Set<HashMap<String, Object>>> queryBrand(String keyword, Integer id, Integer idType, Integer newFlag, Integer promotionFlag, Integer identity) {
+        log.info("查询品牌传入keyword----------->"+keyword+"-------------》id"+id+"------------->idType"+idType+"newFlag----------------->"+newFlag+"------------>promotionFlag------------->"+promotionFlag+"identity------------>"+identity);
         String queryStr = "";
         String filter = "";
         if (!StringUtils.isEmpty(keyword) && idType == null && id == null) {
@@ -170,6 +173,25 @@ public class SearchProductServiceImpl implements SearchProductService {
             }
         }
         SearchParams searchParams = searchOpenService.getParams(queryStr, identity, filter);
+        // searchParams.setdeep
+        //设置scroll方式查询
+        DeepPaging deep = new DeepPaging();
+        //不设置默认为1m表示1分钟，该参数表示本次返回的scrollid的有效期
+        deep.setScrollExpire("3m");
+        //添加DeepPaging对象参数
+        searchParams.setDeepPaging(deep);
+        // searchOpenService.getResultJsonObject 返回result获取scrollid
+        String scroll_id = null;
+        try {
+            JSONObject resultJson = searchOpenService.getResultJsonObject(queryStr, searchParams);
+            scroll_id = resultJson.getString("scroll_id");
+        } catch (Exception e) {
+            log.error("查询文档异常：" + e.getMessage());
+            return ResponseJson.error("查询文档异常：" + e.getMessage(), null);
+        }
+        deep.setScrollId(scroll_id);
+        searchParams.setDeepPaging(deep);
+        // searchParams.setscrollid
         ResponseJson<Set<HashMap<String, Object>>> result = getBrandResult(searchParams, queryStr);
         return result;
     }

src/main/resources/mapper/CouponMapper.xml

@@ -17,7 +17,8 @@
         cc.moneyCouponPrice,
         cc.moneyCouponFlag,
         cc.moneyCouponType,
-        cc.`categoryType`
+        cc.`categoryType`,
+        cc.couponPayWay
         FROM
         cm_coupon_club a
         LEFT JOIN cm_coupon cc ON a.couponId = cc.id
@@ -146,7 +147,8 @@
         `userId`,
         `shopId`,
         `productType`,
-        `categoryType`
+        `categoryType`,
+        couponPayWay
         FROM
         cm_coupon
         WHERE
@@ -272,6 +274,7 @@
         cc.`shopId`,
         cc.`productType`,
         cc.`categoryType`,
+        cc.couponPayWay,
         s.name as shopName
         FROM
         cm_coupon cc
@@ -306,7 +309,8 @@
             cc.`categoryType`,
             cc.moneyCouponPrice,
             cc.moneyCouponFlag,
-            s.name as shopName
+            s.name as shopName,
+            cc.couponPayWay
         FROM
             cm_coupon cc
         LEFT JOIN shop s ON cc.shopId = s.shopId

src/main/resources/mapper/PageMapper.xml

@@ -103,7 +103,7 @@
     </select>
     <select id="getFloorImageByCentreId" resultType="com.caimei365.commodity.model.vo.FloorImageVo">
         select
-            id, floorId, centreId, productId, name, link, image, appletsImage, label, pcStatus, appletsStatus, sort, displaySort, createDate
+            id, floorId, centreId, productId, name, link, image, appletsImage, label, pcStatus, appletsStatus, sort, displaySort, createDate, content
         from new_page_floor_image
         where centreId = #{id}
         <if test="source == 1">
@@ -227,7 +227,7 @@
         order by rpp.createTime desc
     </select>
     <select id="getPageDetails" resultType="com.caimei365.commodity.model.vo.PageDetailVo">
-        select  a.id, a.type, a.title, a.keywords, a.description, a.headImage as image, a.headText as content, a.buttonName, a.buttonLink
+        select  a.id, a.type, a.title, a.keywords, a.description, a.headImage as image, a.headText as content, a.buttonName, a.buttonLink,a.backgroundColour,a.backgroundImage,a.backgroundImageWay,a.backgroundType
         from cm_page a where a.id=#{id} and a.type=#{type} and a.enabledStatus=1
     </select>
     <select id="getEquipmentParametersByType" resultType="com.caimei365.commodity.model.vo.EquipmentParameterVo">
@@ -286,7 +286,11 @@
                headText,
                redPacketBeginTime,
                redPacketEndTime,
-               infoBarStatus
+               infoBarStatus,
+               backgroundColour,
+               backgroundImage,
+               backgroundImageWay,
+               backgroundType
         from cm_page
         where id = #{pageId}
           and enabledStatus = '1'

src/main/resources/mapper/ShopMapper.xml

@@ -4,7 +4,7 @@
     <insert id="insertProduct" keyColumn="productID" keyProperty="productId"  parameterType="com.caimei365.commodity.model.po.ProductPo" useGeneratedKeys="true">
         insert into product (
             shopID, name, aliasName, commodityType, bigTypeID, smallTypeID, tinyTypeID, mainImage,
-            brandID, productType, tags, unit, normalPrice, price, price1, includedTax, minBuyNumber, stock,
+            brandID, productType, tags, unit, normalPrice, price, includedTax, minBuyNumber, stock,
             <if test="productCategory != null and  productCategory != ''">
                 productCategory,
             </if>
@@ -36,7 +36,7 @@
                 recommendType,
             </if>
             <if test="priceFlag != null and  priceFlag != ''">
-                price1TextFlag,
+                priceFlag,
             </if>
             <if test="actFlag != null and  actFlag != ''">
                 actFlag,
@@ -77,7 +77,7 @@
             updateTime, validFlag
         ) values (
             #{shopId}, #{name}, #{aliasName}, #{commodityType}, #{bigTypeId}, #{smallTypeId}, #{tinyTypeId}, #{mainImage},
-            #{brandId}, #{productType}, #{tags}, #{unit}, #{normalPrice}, #{price}, #{price}, #{includedTax}, #{minBuyNumber}, #{stock},
+            #{brandId}, #{productType}, #{tags}, #{unit}, #{normalPrice}, #{price}, #{includedTax}, #{minBuyNumber}, #{stock},
             <if test="productCategory != null and  productCategory != ''">
                 #{productCategory},
             </if>
@@ -155,7 +155,7 @@
             shopID = #{shopId}, name = #{name}, aliasName = #{aliasName}, commodityType = #{commodityType},
             bigTypeId = #{bigTypeId}, smallTypeId = #{smallTypeId}, tinyTypeId = #{tinyTypeId}, mainImage = #{mainImage},
             brandId = #{brandId}, productType = #{productType}, tags = #{tags}, unit = #{unit}, normalPrice = #{normalPrice},
-            price = #{price}, price1 = #{price}, includedTax = #{includedTax}, minBuyNumber = #{minBuyNumber}, stock = #{stock},
+            price = #{price}, price = #{price}, includedTax = #{includedTax}, minBuyNumber = #{minBuyNumber}, stock = #{stock},
             <if test="productCategory != null and  productCategory != ''">
                 productCategory = #{productCategory},
             </if>
@@ -187,7 +187,7 @@
                 recommendType = #{recommendType},
             </if>
             <if test="priceFlag != null and  priceFlag != ''">
-                price1TextFlag = #{priceFlag},
+                priceFlag = #{priceFlag},
             </if>
             <if test="actFlag != null and  actFlag != ''">
                 actFlag = #{actFlag},