【数据库整理】订单商品2

src/main/java/com/caimei/modules/order/entity/NewOrderProduct.java

@@ -21,7 +21,7 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
     private String outStoreType;// char(1) comment '出库类型',
     private Integer skuID;//     int(11) comment 'skuId',
 //    private String props;//     national varchar(1000) comment 'sku属性',
-    private String propName;//   national varchar(1000) comment '属性名',
+//    private String propName;//   national varchar(1000) comment '属性名',
     private String productNo;//    national varchar(50) comment '商品编号',
     private Double price;//     float comment '订单商品购买价格',
     private Double shopProductAmount;        // 商品费  =  成本价快照  *  (购买数量  + 赠品数量)
@@ -268,14 +268,14 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
 //    public void setProps(String props) {
 //        this.props = props;
 //    }
-
-    public String getPropName() {
-        return propName;
-    }
-
-    public void setPropName(String propName) {
-        this.propName = propName;
-    }
+//
+//    public String getPropName() {
+//        return propName;
+//    }
+//
+//    public void setPropName(String propName) {
+//        this.propName = propName;
+//    }
 
     public String getProductNo() {
         return productNo;

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

@@ -7,7 +7,7 @@
 		<result column="name" property="purchaseProductName"/>
 		<result column="shopName" property="shopName"/>
 		<result column="shopID" property="shopId"/>
-		<result column="price1" property="price"/>
+		<result column="price" property="price"/>
 	</resultMap>
 	<sql id="purchaseProductColumns">
 		a.id AS "id",
@@ -43,7 +43,7 @@
 
 	<select id="findList" resultType="PurchaseProduct" >
 		SELECT b.name shopName ,b.`shopID` shopId,a.name purchaseProductName,
-		a.`price1` price,a.`productID` productId,a.productCode productNo,a.mainImage image
+		a.price,a.`productID` productId,a.productCode productNo,a.mainImage image
 		,a.costCheckFlag costCheckFlag,a.costPrice costPrice,a.costProportional costProportional, a.normalPrice AS normalPrice
 		,a.ladderPriceFlag as ladderPriceFlag
 		,a.includedTax AS includedTax, a.invoiceType AS invoiceType, a.taxPoint AS taxRate, a.supplierTaxPoint AS supplierTaxRate,
@@ -125,7 +125,7 @@
 		)
 	</insert>
 	<select id="getPurchaseProductByCtId" resultMap="resultShop">
-	SELECT a.* ,b.name shopName , c.name ,c.price1 price FROM bp_product a LEFT JOIN shop b ON a.shopId=b.`shopID`  JOIN product c ON a.productId =c.productid
+	SELECT a.* ,b.name shopName , c.name ,c.price FROM bp_product a LEFT JOIN shop b ON a.shopId=b.`shopID`  JOIN product c ON a.productId =c.productid
   WHERE a.`contractId` =#{contractId}
   AND a.delFlag = 0
   and c.productCategory  = 1
@@ -156,8 +156,8 @@
 	</select>
 	<select id="findSencondProductPage" resultType="com.caimei.modules.bulkpurchase.entity.PurchaseProduct">
 		SELECT b.name shopName ,b.`shopID` shopId,a.name purchaseProductName,
-		a.`price1` price,a.`productID` productId,a.productCode productNo,a.mainImage image
-		,a.costCheckFlag costCheckFlag,a.costPrice costPrice,a.costProportional costProportional, a.price0 AS normalPrice
+		a.price,a.`productID` productId,a.productCode productNo,a.mainImage image
+		,a.costCheckFlag costCheckFlag,a.costPrice costPrice,a.costProportional costProportional, a.normalPrice
 		,a.productCategory as  "productCategory",cshd.secondHandType as  "secondHandType",a.ladderPriceFlag
 		,a.includedTax,a.invoiceType
 		FROM product a LEFT JOIN shop b ON b.shopID=a.shopID

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

@@ -33,8 +33,6 @@
 		  a.`presentNum` AS `presentNum`,
 		  a.`outStoreType` AS `outStoreType`,
 		  a.`skuID` AS `skuID`,
-		  a.`props` AS `props`,
-		  a.`propName` AS `propName`,
 		  a.`productNo` AS `productNo`,
 		  a.`price` AS `price`,
 		  a.`normalPrice` AS `normalPrice`,
@@ -215,8 +213,6 @@
   			presentNum,
 			outStoreType,
 			skuID,
-		    props,
-	  		propName,
 			productNo,
 			price,
 			totalAmount,
@@ -276,8 +272,6 @@
   			#{presentNum},
 			#{outStoreType},
 			#{skuID},
-		   	#{props},
-	  		#{propName},
 			#{productNo},
 			#{price},
 			#{totalAmount},
@@ -356,8 +350,6 @@
 		presentNum = #{presentNum,jdbcType=INTEGER},
 		outStoreType = #{outStoreType,jdbcType=CHAR},
 		skuID = #{skuID,jdbcType=INTEGER},
-		props = #{props,jdbcType=VARCHAR},
-		propName = #{propName,jdbcType=VARCHAR},
 		productNo = #{productNo,jdbcType=VARCHAR},
 		price = #{price,jdbcType=REAL},
 		normalPrice = #{normalPrice,jdbcType=REAL},