价格字段bugfix

src/main/resources/mappings/modules/bulkpurchase/OrderProductMapper.xml

@@ -63,7 +63,7 @@
 	</select>
 
 	<select id="findList" resultMap="ResultorderProduct">
-	SELECT a.* ,b.name ,b.price1,c.`name` shopName
+	SELECT a.* ,b.name ,b.price,c.`name` shopName
 	FROM  `bp_product`  a LEFT JOIN product b ON a.`productId` =b.`productID` JOIN shop c ON a.`shopId` = c.`shopID`
 	WHERE  1=1
 		<if test="contractId != null and contractId != ''">

src/main/resources/mappings/modules/svip/CmSvipProductMapper.xml

@@ -13,7 +13,7 @@
         p.mainImage as "productImage",
         p.name as "productName",
 		s.name as "shopName",
-        p.price1 as "price",
+        p.price,
         p.includedTax,
         p.invoiceType,
         p.taxPoint,

src/main/resources/mappings/modules/weisha/CmOrganizeProductMapper.xml

@@ -88,7 +88,7 @@
 		</choose>
 	</select>
 	<select id="findProductList" resultType="com.caimei.modules.product.entity.Product">
-		select p.productID, p.mainImage, p.name, p.price1, s.name as shopName, IF(cop.productId is not null, 0, 1) as validFlag
+		select p.productID, p.mainImage, p.name, p.price, s.name as shopName, IF(cop.productId is not null, 0, 1) as validFlag
 		from product p
 				 left join cm_organize_product cop on p.productID = cop.productId and cop.organizeId = #{organizeId} and cop.delFlag = 0
 				 left join shop s on p.shopID = s.shopID

src/main/webapp/WEB-INF/views/modules/bulkpurchase/productPromotionDetail.jsp

@@ -273,7 +273,7 @@
                         <td><img src="${product.mainImage}" width="50px" height="50px"></td>
                         <td>${product.name}</td>
                         <td>${product.shopName}</td>
-                        <td>${product.price1}</td>
+                        <td>${product.price}</td>
                     </tr>
                 </c:forEach>
                 </tbody>

src/main/webapp/WEB-INF/views/modules/coupon/productCouponDetails.jsp

@@ -30,7 +30,7 @@
         <div class="detail">
             <p>商品名称：<a href="https://www.caimei365.com/product-${product.productID}.html">${product.name}</a></p>
             <p>供应商：<span>${product.shopName}</span></p>
-            <p>机构价：<span>${product.price1}</span></p>
+            <p>机构价：<span>${product.price}</span></p>
         </div>
     </div>
     <div class="couponList">

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheActivityProductForm.jsp

@@ -155,8 +155,8 @@
                 alertx("请输入小于前一个价格的值");
             }
         } else {
-            var price1 = $('#price1').val();
-            if (input.value * 1 > price1) {
+            var price = $('#price').val();
+            if (input.value * 1 > price) {
                 $(input).val('');
                 alertx("第一个阶梯价格不能大于机构价");
             }

src/main/webapp/WEB-INF/views/modules/hehe/heheAddProduct.jsp

@@ -65,7 +65,7 @@
                 <td><img class="mainImage" src="${item.mainImage}" width="50px" height="50px"></td>
                 <td class="name">${item.name}</td>
                 <td id="shopName">${item.shopName}</td>
-                <input type="hidden" value="${item.price1}" id="price">
+                <input type="hidden" value="${item.price}" id="price">
                 <input type="hidden" value="${item.includedTax}" id="includedTax">
                 <input type="hidden" value="${item.invoiceType}" id="invoiceType">
                 <input type="hidden" value="${item.taxPoint}" id="clubTaxPoint">

src/main/webapp/WEB-INF/views/modules/product/cmActivityForm.jsp

@@ -199,7 +199,7 @@
                         <td><img src="${product.mainImage}" width="50px" height="50px"></td>
                         <td>${product.name}</td>
                         <td>${product.shopName}</td>
-                        <td>${product.price1}</td>
+                        <td>${product.price}</td>
                         <td>
                             <input id="actPrice1" name="actPrice1" style="width:50px;"
                                    value="${product.activityPrice}" type="number" step="0.01">

src/main/webapp/WEB-INF/views/modules/product/toSelectAddOrganizeProduct.jsp

@@ -136,12 +136,12 @@
 					</c:if>
 					<c:if test="${item.costCheckFlag ne 1}">
 						<%--会员价格*比例成本--%>
-						<input  id="costPrice${item.productID}" name="costPrice${item.productID}" style="width:80px;" value="<fmt:formatNumber value="${item.costProportional * item.price1 / 100}" type="currency" pattern="0.00"/>"  onkeyup="num(this)"  ></td>
+						<input  id="costPrice${item.productID}" name="costPrice${item.productID}" style="width:80px;" value="<fmt:formatNumber value="${item.costProportional * item.price / 100}" type="currency" pattern="0.00"/>"  onkeyup="num(this)"  ></td>
 					</c:if>
 				</td>
 				<%--星范售价默认为会所价--%>
 				<td>
-					<input  id="price1${item.productID}" name="price1${item.productID}" style="width:80px;" value="<fmt:formatNumber value="${item.price1}" type="currency" pattern="0.00"/>"  onkeyup="num(this)"  ></td>
+					<input  id="price1${item.productID}" name="price1${item.productID}" style="width:80px;" value="<fmt:formatNumber value="${item.price}" type="currency" pattern="0.00"/>"  onkeyup="num(this)"  ></td>
 				</td>
 				<td>
 					<%--如果是阶梯价格使用阶梯价格最小起订量--%>

src/main/webapp/WEB-INF/views/modules/weisha/organizeSinglePromotionList.jsp

@@ -141,7 +141,7 @@
                             <img src="${promotionProduct.mainImage}" alt="图片" width="50px" height="50px">
                             <span style="position: absolute; left: 120px;width: 550px">商品名称：${promotionProduct.name}</span>
                             <span style="position: absolute; left: 670px;width: 430px">供应商：${promotionProduct.shopName}</span>
-                            <span style="position: absolute; left: 1100px">机构价：${promotionProduct.price1}</span>
+                            <span style="position: absolute; left: 1100px">机构价：${promotionProduct.price}</span>
                         </p>
                     </c:forEach>
                 </c:if>