用户行为优化1.0.4

src/main/java/com/caimei365/user/controller/RoosInformationApi.java

@@ -59,8 +59,8 @@ public class RoosInformationApi {
      */
     @PostMapping("/insertRoos")
     public ResponseJson<String> insertRoosInformation(RoosInformationDto roosInformationDto) {
-        if (null == roosInformationDto.getShopId()) {
-            return ResponseJson.error(-1, "供应商Id不能为空", null);
+        if (null == roosInformationDto.getShopProductId()) {
+            return ResponseJson.error(-1, "供应商商品Id不能为空", null);
         }
         // 获取访问ip
         String ip = roosInformationService.obtainIp();

src/main/java/com/caimei365/user/controller/ShopApi.java

@@ -202,7 +202,6 @@ public class ShopApi {
     @ApiOperation("保存供应商类别")
     @PostMapping("/saveShopCategory")
     public ResponseJson saveShopCategory(JsonParamsDto jsonParamsDto) {
-        log.info("jsonParamsDto======"+jsonParamsDto);
         if (null == jsonParamsDto) {
             return ResponseJson.error(-1, "类别信息不能为空", null);
         }

src/main/java/com/caimei365/user/model/dto/RoosInformationDto.java

@@ -19,6 +19,10 @@ public class RoosInformationDto {
      * 供应商Id
      */
     private Integer shopId;
+    /**
+     * 营销供应商商品Id
+     */
+    private Integer shopProductId;
     /**
      * 咨询姓名
      */

src/main/java/com/caimei365/user/model/vo/CmShopPopUpVo.java

@@ -15,6 +15,10 @@ public class CmShopPopUpVo {
      * 供应商Id
      */
     private Integer shopId;
+    /**
+     * 营销供应商商品Id
+     */
+    private Integer shopProductId;
     /**
      * 图片
      */

src/main/java/com/caimei365/user/model/vo/cmShopAdvertisingImage.java

@@ -17,6 +17,10 @@ public class cmShopAdvertisingImage {
      * 供应商Id
      */
     private String shopId;
+    /**
+     * 营销供应商商品Id
+     */
+    private String shopProductId;
     /**
      * pc图片
      */

src/main/java/com/caimei365/user/service/impl/RoosInformationServiceImpl.java

@@ -69,7 +69,8 @@ public class RoosInformationServiceImpl implements RoosInformationService {
         }
         // 若一个供应商只添加了一个商品，则游客在浏览该供应商主页时，就显示该商品的底部弹窗
         if (null != shopId) {
-            if (0 == shopStatus && null != shopProductIds && shopProductIds.size() == 1) {
+            if (null != list && list.size() > 0 && list.stream().allMatch(i -> i == 0)
+                    && null != shopStatus && 0 == shopStatus && null != shopProductIds && shopProductIds.size() == 1) {
                 isClick = true;
             } else {
                 isClick = false;

src/main/resources/mapper/RoosInformationMapper.xml

@@ -9,7 +9,7 @@
             LEFT JOIN cm_shop_info csi ON csi.shopProductId = csp.id
         </if>
         <if test="keyword != null and keyword != ''">
-            left join shop s on s.shopId = cri.shopId
+            left join shop s on s.shopId = css.shopId
             LEFT JOIN cm_shop_keyword csk ON csk.shopProductId = csp.id
             left join cm_user_search_frequency cusf on cusf.id = csk.searchId
         </if>
@@ -44,7 +44,7 @@
             left join cm_user_search_frequency cusf on cusf.id = csk.searchId
         </if>
         <where>
-            css.delFlag = 0 AND csp.delFlag = 0
+            css.delFlag = 0 and css.status = 0 AND csp.delFlag = 0
             <if test="shopId != null">
                 and css.shopId = #{shopId}
             </if>
@@ -64,7 +64,7 @@
 
     <select id="getShopProductIds" resultType="java.lang.Integer">
         SELECT
-            csp.productId
+            csp.id
         FROM cm_shop_product csp
                  LEFT JOIN cm_shop_statistics css ON css.id = csp.statisticsId
         WHERE css.shopId = #{shopId} AND csp.delFlag = 0
@@ -87,6 +87,7 @@
         SELECT
           csp.id,
           css.shopId,
+          cspd.id as shopProductId,
           csp.image,
           csp.guidingOne,
           csp.guidingTwo,
@@ -122,6 +123,7 @@
         SELECT
             csp.id,
             css.shopId,
+            cspd.id as shopProductId,
             csp.image,
             csp.guidingOne,
             csp.guidingTwo,
@@ -138,7 +140,7 @@
         INSERT INTO cm_roos_information
             (
              IP,
-             shopId,
+             shopProductId,
              <if test="consultName != null and consultName != ''">
                  consultName,
              </if>
@@ -150,7 +152,7 @@
              )
         VALUES(
                #{ip},
-               #{shopId},
+               #{shopProductId},
                <if test="consultName != null and consultName != ''">
                 #{consultName},
                </if>

src/main/resources/mapper/ShopMapper.xml

@@ -417,7 +417,8 @@
                </if>
                css.logo
         FROM cm_shop_statistics css
-                 LEFT JOIN cm_market_report cmr ON cmr.marketId = css.id
+                left join cm_shop_product csp on csp.statisticsId = css.id
+                 LEFT JOIN cm_market_report cmr ON cmr.marketId = csp.id
                  LEFT JOIN shop s ON s.shopId = css.shopId
         WHERE css.delFlag = 0
           <if test="type == 1">