Merge remote-tracking branch 'origin/developerC' into developer

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

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

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/SearchProductServiceImpl.java

@@ -431,8 +431,6 @@ public class SearchProductServiceImpl implements SearchProductService {
             searchParams = searchOpenService.getProductParams(queryStr, filter, identity, 1, requestSize, sortField, sortType);
         }
         try {
-            log.info("查询发送参数------------------------------------------>queryStr: "+queryStr);
-            log.info("查询发送参数------------------------------------------>searchParams: "+searchParams.toString());
             // 查询推送
             JSONObject result = searchOpenService.getResultJsonObject(queryStr, searchParams);
             if (1 == result.getInt("status")) {

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">