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

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -150,9 +150,6 @@
                 <if test="dbName == 'mssql'">'%'+#{shopName}+'%'</if>
                 <if test="dbName == 'mysql'">concat('%',#{shopName},'%')</if>
             </if>
-            <if test="cmbeanFlag != null and cmbeanFlag != ''">
-                AND a.cmbeanFlag = #{cmbeanFlag}
-            </if>
             <if test="validFlag !=null and validFlag !=''">
                 AND a.validFlag=#{validFlag}
             </if>
@@ -269,9 +266,6 @@
 				<if test="dbName == 'mssql'">'%'+#{shopName}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{shopName},'%')</if>
 			</if>
-			<if test="cmbeanFlag != null and cmbeanFlag != ''">
-				AND a.cmbeanFlag = #{cmbeanFlag}
-			</if>
 			<if test="validFlag !=null and validFlag !=''">
 				AND a.validFlag=#{validFlag}
 			</if>
@@ -1161,9 +1155,6 @@
 				<if test="dbName == 'mssql'">'%'+#{shopName}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{shopName},'%')</if>
 			</if>
-			<if test="cmbeanFlag != null and cmbeanFlag != ''">
-				AND a.cmbeanFlag = #{cmbeanFlag}
-			</if>
 			<if test="actFlag !=null and actFlag !=''">
 				AND a.actFlag=#{actFlag}
 			</if>
@@ -1220,9 +1211,6 @@
                 <if test="dbName == 'mssql'">'%'+#{shopName}+'%'</if>
                 <if test="dbName == 'mysql'">concat('%',#{shopName},'%')</if>
             </if>
-            <if test="cmbeanFlag != null and cmbeanFlag != ''">
-                AND a.cmbeanFlag = #{cmbeanFlag}
-            </if>
             <if test="actFlag !=null and actFlag !=''">
                 AND a.actFlag=#{actFlag}
             </if>

src/main/resources/mappings/modules/user/CmUserMapper.xml

@@ -598,4 +598,9 @@
 		LIMIT
 		  1
   </select>
+	<select id="findUserBeans" resultType="java.lang.Integer">
+		select userBeans
+		from user
+		where userID = #{userId}
+	</select>
 </mapper>

src/main/webapp/WEB-INF/views/modules/svip/svipAddProduct.jsp

@@ -73,7 +73,7 @@
                 <td><img class="mainImage" src="${item.mainImage}" width="50px" height="50px"></td>
                 <td class="productName">${item.name}</td>
                 <td>${item.shopName}</td>
-                <td>￥${item.price1}</td>
+                <td>￥${item.price}</td>
                 <td><input class="discount" id="discount${item.productID}" onchange="changeDiscount(${item.productID},1)" type="number" maxlength="11" style="width: 100px"> %</td>
                 <td><input class="discountPrice" id="discountPrice${item.productID}" onchange="changeDiscount(${item.productID},2)" type="number" maxlength="11" style="width: 100px"></td>
             </tr>