买家门户网站-个人收藏和浏览记录标记商品状态

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/member/MemberProductLookLogModel.java

@@ -3,6 +3,7 @@ package com.slodon.b2b2c.model.member;
 import com.slodon.b2b2c.core.exception.MallException;
 import com.slodon.b2b2c.core.i18n.Language;
 import com.slodon.b2b2c.core.response.PagerInfo;
+import com.slodon.b2b2c.core.util.AssertUtil;
 import com.slodon.b2b2c.core.util.StringUtil;
 import com.slodon.b2b2c.dao.read.goods.GoodsReadMapper;
 import com.slodon.b2b2c.dao.read.member.MemberProductLookLogReadMapper;
@@ -16,6 +17,7 @@ import com.slodon.b2b2c.member.example.MemberProductLookLogExample;
 import com.slodon.b2b2c.member.pojo.MemberFollowProduct;
 import com.slodon.b2b2c.member.pojo.MemberProductLookLog;
 import com.slodon.b2b2c.model.goods.GoodsExtendModel;
+import com.slodon.b2b2c.model.goods.GoodsModel;
 import com.slodon.b2b2c.vo.member.ProductLookLogVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -45,6 +47,8 @@ public class MemberProductLookLogModel {
     private MemberFollowProductModel memberFollowProductModel;
     @Resource
     private GoodsExtendModel goodsExtendModel;
+    @Resource
+    private GoodsModel goodsModel;
 
 
     /**
@@ -217,6 +221,9 @@ public class MemberProductLookLogModel {
                     if (!CollectionUtils.isEmpty(followProductList)) {
                         productLookLogInfo.setIsFollowProduct(true);
                     }
+                    Goods goods = goodsModel.getGoodsByGoodsId(productLookLog.getGoodsId());
+                    AssertUtil.notNull(goods, Language.translate("查询的商品信息为空",Language.EN_LANGUAGE_TYPE));
+                    productLookLogInfo.setState(goods.getState());
                     infos.add(productLookLogInfo);
                 });
                 vo.setProductLookLogInfoList(infos);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/member/FollowProductVO.java

@@ -63,6 +63,9 @@ public class FollowProductVO implements Serializable {
     @ApiModelProperty("商品自定义价格")
     private String goodsMoney;
 
+    @ApiModelProperty("商品状态：11-放入仓库无需审核；12-放入仓库审核通过；20-立即上架待审核；21-放入仓库待审核；3-上架（a. 审核通过上架，b. 不需要平台审核，商户创建商品后点击上架操作）；4-审核驳回(平台驳回）；5-商品下架（商户自行下架）；6-违规下架（平台违规下架操作）；7-已删除（状态1、5、6可以删除后进入此状态）")
+    private Integer state;
+
     public FollowProductVO(MemberFollowProduct memberFollowProduct, Store store, Goods goods) {
         followId = memberFollowProduct.getFollowId();
         productId = memberFollowProduct.getProductId();
@@ -78,6 +81,7 @@ public class FollowProductVO implements Serializable {
         isOwnStoreValue = dealIsOwnStoreValue(store.getIsOwnStore());
         salesNum = goods.getVirtualSales() + goods.getActualSales();
         goodsMoney = goods.getGoodsMoney();
+        state = goods.getState();
     }
 
     public static String dealIsOwnStoreValue(Integer isOwnStore) {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/member/ProductLookLogVO.java

@@ -74,6 +74,9 @@ public class ProductLookLogVO implements Serializable {
         @ApiModelProperty("是否收藏商品:false 未收藏, true 收藏")
         private Boolean isFollowProduct;
 
+        @ApiModelProperty("商品状态：11-放入仓库无需审核；12-放入仓库审核通过；20-立即上架待审核；21-放入仓库待审核；3-上架（a. 审核通过上架，b. 不需要平台审核，商户创建商品后点击上架操作）；4-审核驳回(平台驳回）；5-商品下架（商户自行下架）；6-违规下架（平台违规下架操作）；7-已删除（状态1、5、6可以删除后进入此状态）")
+        private Integer state;
+
         public ProductLookLogInfo(MemberProductLookLog memberProductLookLog) {
             logId = memberProductLookLog.getLogId();
             memberId = memberProductLookLog.getMemberId();