bugfix2

src/main/java/com/caimei365/commodity/components/PriceUtilService.java

@@ -86,8 +86,10 @@ public class PriceUtilService {
         // 根据用户Id查询用户身份
         Integer identity = priceMapper.getIdentityByUserId(userId);
         price.setRepurchaseFlag(0);
-        // 默认非促销活动状态
-        price.setActStatus(0);
+        if (price.getActStatus() == null){
+            // 默认非促销活动状态
+            price.setActStatus(0);
+        }
         if (null != identity && identity > 0) {
             // 用户身份: 2-会员机构, 4-普通机构
             price.setUserIdentity(identity);

src/main/java/com/caimei365/commodity/model/search/ProductListVo.java

@@ -40,6 +40,8 @@ public class ProductListVo implements Serializable {
     private Integer beautyActFlag;
     /** 商品可见度： 3:所有人可见，2:普通机构可见，1:会员机构可见 */
     private Integer visibility;
+    /** 活动状态：1有效，0失效 */
+    private Integer actStatus;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/caimei365/commodity/model/vo/ProductFormVo.java

@@ -96,6 +96,8 @@ public class ProductFormVo implements Serializable {
      * 启用阶梯价格标识 0否 1是
      */
     private Integer ladderPriceFlag;
+    /** 活动状态：1有效，0失效 */
+    private Integer actStatus;
     /**
      * 成本价
      */

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -472,8 +472,9 @@ public class PageServiceImpl implements PageService {
                 // 获取商品及价格
                 ProductItemVo product = pageMapper.getProductItemById(image.getProductId());
                 if (product != null) {
-                    // 设置商品主图及价格
-                    priceUtilService.setProductDetails(userId, product);
+                    // 商品价格
+                    // priceUtilService.setProductDetails(userId, product);
+                    // 设置商品主图
                     image.setListType(1);
                     image.setName(product.getName());
                     image.setImage(ImageUtils.getImageURL("product", product.getImage(), 0, domain));

src/main/resources/mapper/PageMapper.xml

@@ -85,6 +85,7 @@
     <select id="getProductItemById" resultType="com.caimei365.commodity.model.vo.ProductItemVo">
         select
             p.productID as productId,
+            p.actStatus,
             p.name,
             p.aliasName,
             p.mainImage as image,
@@ -150,6 +151,7 @@
     <select id="getBuyAgainProducts" resultType="com.caimei365.commodity.model.vo.ProductItemVo">
         select
             p.productID as productId,
+            p.actStatus,
             p.name,
             p.aliasName,
             p.mainImage as image,
@@ -210,6 +212,7 @@
     <select id="getProductRecommendsById" resultType="com.caimei365.commodity.model.search.ProductListVo">
         select
 			p.productID as productId,
+            p.actStatus,
 			p.`name` as `name`,
 			p.mainImage as image,
             IFNULL(p.visibility,3) as visibility
@@ -222,6 +225,7 @@
     <select id="getAutoProductRecommends" resultType="com.caimei365.commodity.model.search.ProductListVo">
         select
 			p.productID as productId,
+            p.actStatus,
 			p.`name` as `name`,
 			p.mainImage as image,
             IFNULL(p.visibility,3) as visibility

src/main/resources/mapper/PriceMapper.xml

@@ -7,39 +7,41 @@
     <select id="getDetailPrice" resultType="com.caimei365.commodity.model.vo.PriceVo">
         select
             p.productID as productId,
+            p.actStatus,
             p.price1 as price,
-            p.minBuyNumber as minBuyNumber,
-            p.maxBuyNumber as maxBuyNumber,
+            p.minBuyNumber,
+            p.maxBuyNumber,
             p.price1TextFlag as priceFlag,
-            p.ladderPriceFlag as ladderPriceFlag,
-            p.normalPrice as normalPrice,
-            p.costPrice as costPrice,
-            p.costProportional as costProportional,
-            p.costCheckFlag as costCheckFlag,
-            p.step as step,
+            p.ladderPriceFlag,
+            p.normalPrice,
+            p.costPrice,
+            p.costProportional,
+            p.costCheckFlag,
+            p.step,
             p.shopID as shopId,
             p.taxPoint as taxRate,
-            p.includedTax as includedTax,
-            p.invoiceType as invoiceType
+            p.includedTax,
+            p.invoiceType
         from product p
         where productID = #{productId}
     </select>
     <select id="getListPriceByProductIds" resultType="com.caimei365.commodity.model.vo.PriceVo">
         select
             p.productID as productId,
+            p.actStatus,
             p.price1 as price,
-            p.minBuyNumber as minBuyNumber,
-            p.maxBuyNumber as maxBuyNumber,
+            p.minBuyNumber,
+            p.maxBuyNumber,
             p.price1TextFlag as priceFlag,
-            p.ladderPriceFlag as ladderPriceFlag,
-            p.normalPrice as normalPrice,
-            p.costPrice as costPrice,
-            p.costProportional as costProportional,
-            p.costCheckFlag as costCheckFlag,
-            p.step as step,
+            p.ladderPriceFlag,
+            p.normalPrice,
+            p.costPrice,
+            p.costProportional,
+            p.costCheckFlag,
+            p.step,
             p.shopID as shopId,
-            p.includedTax as includedTax,
-            p.invoiceType as invoiceType,
+            p.includedTax,
+            p.invoiceType,
             p.taxPoint as taxRate
         from product p
         where productID in

src/main/resources/mapper/PromotionsMapper.xml

@@ -47,6 +47,7 @@
 		select
 			cpg.id as id,
 			p.productID as productId,
+            p.actStatus,
 			p.shopID as shopId,
 			p.`name` as `name`,
 			p.mainImage as image,

src/main/resources/mapper/SearchMapper.xml

@@ -270,6 +270,7 @@
     <select id="queryProduct" resultType="com.caimei365.commodity.model.search.ProductListVo">
         select
             p.productID as productId,
+            p.actStatus,
             p.`name` as name,
             p.mainImage as image,
             br.name as brandName,

src/main/resources/mapper/SecondHandMapper.xml

@@ -36,6 +36,7 @@
     <select id="getSeconHandList" resultType="com.caimei365.commodity.model.vo.SecondListVo">
         select
             p.productID as productId,
+            p.actStatus,
             p.`name` as name,
             p.mainImage as image,
             p.price1 as price,
@@ -66,6 +67,7 @@
     <select id="getSecondHandDetail" resultType="com.caimei365.commodity.model.vo.SecondDetailVo">
         select
             p.productID as productId,
+            p.actStatus,
             p.`name` as name,
             p.mainImage as image,
             p.price1 as price,
@@ -112,6 +114,7 @@
     <select id="getOrderPageSecondList" resultType="com.caimei365.commodity.model.vo.SecondListVo">
         select
             p.productID as productId,
+            p.actStatus,
             p.`name` as name,
             p.mainImage as image,
             p.price1 as price,
@@ -143,6 +146,7 @@
     <select id="getSecondListByLimit" resultType="com.caimei365.commodity.model.vo.SecondListVo">
         select
             p.productID as productId,
+            p.actStatus,
             p.`name` as name,
             p.mainImage as image,
             p.price1 as price,

src/main/resources/mapper/SellerMapper.xml

@@ -4,6 +4,7 @@
     <select id="getSingleProductList" resultType="com.caimei365.commodity.model.vo.ProductItemVo">
         select
             p.productID as productId,
+            p.actStatus,
             p.name,
             p.aliasName,
             p.mainImage as image,
@@ -50,6 +51,7 @@
     <select id="getCombinationProductList" resultType="com.caimei365.commodity.model.vo.ProductItemVo">
         select
             p.productID as productId,
+            p.actStatus,
             p.name,
             p.aliasName,
             p.mainImage as image,

src/main/resources/mapper/ShopMapper.xml

@@ -317,6 +317,7 @@
     <select id="getMainProducts" resultType="com.caimei365.commodity.model.search.ProductListVo">
 		select
 			p.productID as productId,
+            p.actStatus,
 			p.shopID as shopId,
 			p.`name` as `name`,
 			p.mainImage as image,
@@ -337,6 +338,7 @@
     <select id="getShopProductsSelect" resultType="com.caimei365.commodity.model.vo.ProductItemVo">
         select
             p.productID as productId,
+            p.actStatus,
             p.name,
             p.aliasName,
             p.mainImage as image,