超级会员商品数据

src/main/resources/mapper/HomeDao.xml

@@ -5,7 +5,7 @@
         SELECT IFNULL(COUNT(*), 0) FROM user
     </select>
     <select id="countAllProducts" resultType="java.lang.Integer">
-        SELECT IFNULL(COUNT(*), 0) FROM product WHERE validFlag != '0'
+        SELECT IFNULL(COUNT(*), 0) FROM product p left join cm_organize_product_info copi ON copi.productId = p.productId WHERE copi.validFlag != '0'
     </select>
     <select id="countAllOrders" resultType="java.lang.Integer">
         SELECT IFNULL(COUNT(*), 0) FROM cm_order WHERE delFlag != '0'

src/main/resources/mapper/svip/CmSvipHistoryDao.xml

@@ -55,7 +55,6 @@
 		a.auditStatus AS "auditStatus",
 		a.auditTime AS "auditTime",
 		a.auditNote AS "auditNote",
-		a.validFlag AS "validFlag",
 		a.status AS "status",
 		a.maintenanceFee AS "maintenanceFee",
 		a.maintenanceDate AS "maintenanceDate",
@@ -86,9 +85,8 @@
 		a.productID AS "productId",
 		a.brandID AS "brandID",
 		a.bigTypeID AS "bigTypeID",
-		ifnull(a.smallTypeID,-1)  AS "smallTypeID",
-		ifnull(a.tinyTypeID,-1) AS "tinyTypeID",
-		a.selfTypeID AS "selfTypeID",
+		IFNULL(a.smallTypeID,-1)  AS "smallTypeID",
+		IFNULL(a.tinyTypeID,-1) AS "tinyTypeID",
 		a.preferredFlag AS "preferredFlag",
 		a.shopID AS "shopId",
 		a.name AS "name",
@@ -103,28 +101,20 @@
 		a.addTime AS "addTime",
 		a.updateTime AS "updateTime",
 		a.sellNumber AS "sellNumber",
-		a.weekSellNumber AS "weekSellNumber",
 		a.beforeValidFlag AS "beforeValidFlag",
-		a.validFlag AS "validFlag",
 		a.favoriteTimes AS "favoriteTimes",
 		a.commentScore AS "commentScore",
 		a.commentTimes AS "commentTimes",
-		a.selfRecommendFlag AS "selfRecommendFlag",
-		a.sysRecommendFlag AS "sysRecommendFlag",
 		a.sortIndex AS "sortIndex",
 		a.featuredFlag AS "featuredFlag",
 		a.featuredSortIndex AS "featuredSortIndex",
 		a.productCode AS "productCode",
-		a.synToERPFlag AS "synToERPFlag",
 		a.allAreaFlag AS "allAreaFlag",
 		a.provinceIDs AS "provinceIDs",
 		a.serviceNumber AS "serviceNumber",
 		a.packageCount AS "packageCount",
 		a.byFlag AS "byFlag",
 		a.normalProductFlag AS "normalProductFlag",
-		a.wholeSaleProductFlag AS "wholeSaleProductFlag",
-		a.promotionProductFlag AS "promotionProductFlag",
-		a.groupBuyProductFlag AS "groupBuyProductFlag",
 		a.step AS "step",
 		a.actStatus AS "actStatus",
 		a.actFlag AS "actFlag",
@@ -132,28 +122,26 @@
 		a.onlineTime AS "onlineTime",
 		a.downlineTime AS "downlineTime",
 		a.freePostFlag AS "freePostFlag",
-		a.precisehKey AS "precisehKey",
 		s.name AS "shopName",
 		a.actSort AS "actSort",
 		a.recommendType AS "recommendType",
-		a.aliasName as "aliasName",
-		a.visibility as "visibility",
-# 		a.commodityDetailsFlag as "commodityDetailsFlag",
-		a.productType as "productType",
-		a.qualificationImg as "qualificationImg",
-		a.includedTax as "includedTax",
-		a.invoiceType as "invoiceType",
-		a.taxPoint as "taxPoint",
-		a.tags as "tags",
-		a.machineType as "machineType",
-		a.trainingMethod as "trainingMethod",
-		a.trainingType as "trainingType",
-		a.trainingFee as "trainingFee",
-		a.commodityType as "commodityType",
+		a.aliasName AS "aliasName",
+		a.visibility AS "visibility",
+		a.productType AS "productType",
+		a.qualificationImg AS "qualificationImg",
+		a.includedTax AS "includedTax",
+		a.invoiceType AS "invoiceType",
+		a.taxPoint AS "taxPoint",
+		a.tags AS "tags",
+		a.machineType AS "machineType",
+		a.trainingMethod AS "trainingMethod",
+		a.trainingType AS "trainingType",
+		a.trainingFee AS "trainingFee",
+		a.commodityType AS "commodityType",
 		a.splitCode,
         a.announType,
-        ifnull(a.newvalidFlag,0),
-         ifnull(a.newProductType,2),
+        IFNULL(a.newvalidFlag,0),
+         IFNULL(a.newProductType,2),
         a.showFlag,
         a.showTime,
         a.newshowTime,
@@ -366,10 +354,12 @@
     </select>
     <select id="newCmShopGet" resultType="com.caimei365.manager.entity.caimei.svip.NewCmShop">
         SELECT
-        <include refid="newCmShopColumns"/>
+        <include refid="newCmShopColumns"/>,
+        copi.validFlag AS "validFlag",
         FROM shop a
         <include refid="newCmShopJoins"/>
-        WHERE a.shopID = #{id}
+        LEFT JOIN cm_organize_product_info copi ON copi.productId = p.productId
+        WHERE a.shopID = #{id} and copi.organizeId = 0
     </select>
     <select id="findRedemptionCodeNum" resultType="java.lang.Integer">
         SELECT COUNT(id) FROM cm_coupon_redemption_code WHERE couponId = #{couponId}
@@ -674,11 +664,14 @@
     </select>
     <select id="findProductImage" resultType="com.caimei365.manager.entity.caimei.product.Product">
         SELECT
-        <include refid="productColumns"/>
+        <include refid="productColumns"/>,
+        copi.validFlag AS "validFlag"
         FROM product a
         LEFT JOIN shop s on s.shopID = a.shopID
-#         left join cm_svip_product p on a.productID = p.productId
+        # left join cm_svip_product p on a.productID = p.productId
+        LEFT JOIN cm_organize_product_info copi ON copi.productId = a.productId
         <where>
+            copi.organizeId = 0 and copi.validFlag = 2 and a.productId not in (select productId from cm_svip_product)
             <if test="productId !=null">
                 AND a.productID=#{productId}
             </if>
@@ -692,7 +685,7 @@
                 AND s.name LIKE concat('%',#{shopName},'%')
             </if>
             <if test="validFlag !=null and validFlag !=''">
-                AND a.validFlag=#{validFlag}
+                AND copi.validFlag=#{validFlag}
             </if>
             <if test="productCategory !=null and productCategory !=''">
                 AND a.productCategory=#{productCategory}