联合丽格v1_0_2

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

@@ -27,8 +27,6 @@ public class NewOrderProduct {
     private Integer presentNum;
     @ApiModelProperty("skuId")
     private Integer skuId;
-    @ApiModelProperty("组织skuId")
-    private Integer organizeSkuId;
     @ApiModelProperty("商品编号")
     private String productNo;
     @ApiModelProperty("订单商品购买价格")

src/main/resources/mapper/ActiveMapper.xml

@@ -113,11 +113,11 @@
     <select id="findProducts" resultType="com.caimei.modules.homepage.enity.BackProduct">
         select DISTINCT p.name  as productName,
                         p.mainImage,
-                        cmop.id as productId,
+                        cmop.productId as productId,
                         cmop.validFlag,
                         cmp.sort
         from cm_mall_active_product cmp
-        left join cm_mall_organize_products cmop on cmp.productId = cmop.id
+        left join cm_organize_product_info cmop on cmp.productId = cmop.productId
         left join product p on cmop.productId = p.productID
         where cmp.activeId = #{id}
     </select>
@@ -129,7 +129,7 @@
                         cmop.validFlag,
                         cmp.sort
         from cm_mall_active_product cmp
-        left join cm_mall_organize_products cmop on cmp.productId = cmop.productId
+        left join cm_organize_product_info cmop on cmp.productId = cmop.productId
         left join product p on cmop.productId = p.productID
         where cmp.imageId = #{id}
     </select>

src/main/resources/mapper/BannerMapper.xml

@@ -104,10 +104,10 @@
     <select id="findProducts" resultType="com.caimei.modules.homepage.enity.BackProduct">
         select p.name as productName,
                p.mainImage,
-               cmop.id as productId,
+               cmop.productId as productId,
                cmop.validFlag
-        from cm_mall_organize_products cmop
+        from cm_organize_product_info cmop
         left join product p on p.productID = cmop.productID
-        where cmop.id = #{jumpProductId}
+        where cmop.productId = #{jumpProductId}
     </select>
-</mapper>
+</mapper>

src/main/resources/mapper/NewOrderProductMapper.xml

@@ -14,7 +14,6 @@
 		  a.`num` AS `num`,
 		  a.`presentNum` AS `presentNum`,
 		  a.`outStoreType` AS `outStoreType`,
-		  a.organizeSkuId,
 		  a.`skuId` AS `skuId`,
 		  a.`productNo` AS `productNo`,
 		  a.`price` AS `price`,