用户行为优化1.0.4

src/main/java/com/caimei365/manager/controller/caimei/user/CustomerApi.java

@@ -99,13 +99,13 @@ public class CustomerApi {
      * @return
      */
     @GetMapping("/getShopProduct")
-    public ResponseJson<PaginationVo<CmShopProduct>> getShopProduct(Integer id, Integer productId, String productName,
+    public ResponseJson<PaginationVo<CmShopProduct>> getShopProduct(Integer id, Integer productId, String productName, Integer status,
                                                                     @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                                     @RequestParam(value = "pageSize",defaultValue = "20") int pageSize) {
         if (null == id) {
             return ResponseJson.error(-1, "id不能为空", null);
         }
-        return customerService.getShopProduct(id, productId, productName, pageNum, pageSize);
+        return customerService.getShopProduct(id, productId, productName, status, pageNum, pageSize);
     }
 
     /**

src/main/java/com/caimei365/manager/dao/user/CustomerServiceDao.java

@@ -54,9 +54,10 @@ public interface CustomerServiceDao {
      * @param id
      * @param productId
      * @param productName
+     * @param status
      * @return
      */
-    List<CmShopProduct> getShopProduct(@Param("id") Integer id, @Param("productId") Integer productId, @Param("productName") String productName);
+    List<CmShopProduct> getShopProduct(@Param("id") Integer id, @Param("productId") Integer productId, @Param("productName") String productName, @Param("status") Integer status);
 
     /**
      * 商品列表

src/main/java/com/caimei365/manager/service/caimei/user/CustomerService.java

@@ -54,7 +54,7 @@ public interface CustomerService {
      * @param pageSize
      * @return
      */
-    ResponseJson<PaginationVo<CmShopProduct>> getShopProduct(Integer id, Integer productId, String productName, int pageNum, int pageSize);
+    ResponseJson<PaginationVo<CmShopProduct>> getShopProduct(Integer id, Integer productId, String productName, Integer status, int pageNum, int pageSize);
 
     /**
      * 商品列表

src/main/java/com/caimei365/manager/service/caimei/user/impl/CustomerServiceImpl.java

@@ -120,9 +120,9 @@ public class CustomerServiceImpl implements CustomerService {
      * @return
      */
     @Override
-    public ResponseJson<PaginationVo<CmShopProduct>> getShopProduct(Integer id, Integer productId, String productName, int pageNum, int pageSize) {
+    public ResponseJson<PaginationVo<CmShopProduct>> getShopProduct(Integer id, Integer productId, String productName, Integer status, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<CmShopProduct> shopProductList = customerServiceDao.getShopProduct(id, productId, productName);
+        List<CmShopProduct> shopProductList = customerServiceDao.getShopProduct(id, productId, productName, status);
         shopProductList.forEach(product -> {
             if (StringUtil.isNotBlank(product.getProductImage())) {
                 product.setProductImage(AppUtils.getImageURL("product", product.getProductImage(), 0, "wwwServer"));

src/main/resources/mapper/CmBehaciorRecordDao.xml

@@ -111,10 +111,10 @@
                 AND cbri.accessDate between #{startTime} and #{endTime}
             </if>
             <if test="registerStartTime != null and registerStartTime != ''">
-                AND u.registerTime <![CDATA[ >= ]]> #{startTime}
+                AND u.registerTime <![CDATA[ >= ]]> #{registerStartTime}
             </if>
             <if test="registerEndTime != null and registerEndTime != ''">
-                AND u.registerTime <![CDATA[ <= ]]> #{endTime}
+                AND u.registerTime <![CDATA[ <= ]]> #{registerEndTime}
             </if>
         </where>
         ORDER BY cbri.accessTime DESC
@@ -190,10 +190,10 @@
                 AND cbrt.accessDate between #{startTime} and #{endTime}
             </if>
             <if test="registerStartTime != null and registerStartTime != ''">
-                AND u.registerTime <![CDATA[ >= ]]> #{startTime}
+                AND u.registerTime <![CDATA[ >= ]]> #{registerStartTime}
             </if>
             <if test="registerEndTime != null and registerEndTime != ''">
-                AND u.registerTime <![CDATA[ <= ]]> #{endTime}
+                AND u.registerTime <![CDATA[ <= ]]> #{registerEndTime}
             </if>
         </where>
         ORDER BY cbrt.accessTime DESC

src/main/resources/mapper/user/CmMarketShopDao.xml

@@ -21,7 +21,8 @@
         cmr.addTime,
         cmr.delFlag
         FROM cm_market_report cmr
-        LEFT JOIN cm_shop_statistics css ON css.id = cmr.marketId
+            left join cm_shop_product csp on csp.id = cmr.marketId
+        LEFT JOIN cm_shop_statistics css ON css.id = csp.statisticsId
         <where>
             cmr.marketId = #{marketId} AND cmr.delFlag = 0
             <if test="reportName != null and reportName != ''">

src/main/resources/mapper/user/CustomerServiceDao.xml

@@ -79,6 +79,9 @@
             <if test="productName != null and productName != ''">
                 and p.name like concat('%', #{productName},'%')
             </if>
+            <if test="status != null">
+                and csp.status = #{status}
+            </if>
         </where>
         order by csp.addTime desc
     </select>
@@ -465,8 +468,9 @@
             IFNULL((IFNULL(SUM(cpsi.accessDuration), 0) / IFNULL(SUM(cpsi.accessNumber), 0)), 0) AS averageDuration
         FROM cm_page_shop_info cpsi
         LEFT JOIN info i ON i.id = cpsi.infoId
-        left join cm_shop_statistics css on css.shopId = cpsi.shopId
-        left join cm_shop_product csp on csp.statisticsId = css.id
+        LEFT JOIN cm_shop_info csi ON csi.infoId = cpsi.infoId
+        LEFT JOIN cm_shop_product csp ON csp.id = csi.shopProductId
+        LEFT JOIN cm_shop_statistics css ON css.id = csp.statisticsId
         left join product p on p.productId = csp.productId
         WHERE cpsi.shopId = #{shopId}
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
@@ -492,8 +496,9 @@
             IFNULL((IFNULL(SUM(cpsk.accessDuration), 0) / IFNULL(SUM(cpsk.accessNumber), 0)), 0) AS averageDuration
         FROM cm_page_shop_keyword cpsk
         LEFT JOIN cm_user_search_frequency cusf ON cusf.id = cpsk.searchId
-        left join cm_shop_statistics css on css.shopId = cpsk.shopId
-        left join cm_shop_product csp on csp.statisticsId = css.id
+        LEFT JOIN cm_shop_keyword csk ON csk.searchId = cpsk.searchId
+        LEFT JOIN cm_shop_product csp ON csp.id = csk.shopProductId
+        LEFT JOIN cm_shop_statistics css ON css.id = csp.statisticsId
         left join product p on p.productId = csp.productId
         WHERE cpsk.shopId = #{shopId}
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">