提交

src/main/java/com/huiju/estateagents/controller/TaGoodsController.java

@@ -20,13 +20,7 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.invoke.ConstantCallSite;
@@ -239,7 +233,16 @@ public class TaGoodsController extends BaseController {
         }
         return responseBean;
     }
-    
+
+
+    @ApiOperation(value = "微信 查询有商品的项目", notes = "微信 查询有商品的项目")
+    @GetMapping(value = "/wx/goodsToBuilding")
+    public ResponseBean wxGoodsToBuilding(HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+
+        return responseBean;
+    }
+
     /**
      * 分页查询列表
      * @param pageNum

src/main/java/com/huiju/estateagents/entity/HelpActivity.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -131,4 +133,5 @@ public class HelpActivity implements Serializable {
      */
     @TableField(exist = false)
     private Integer successNum;
+
 }

src/main/java/com/huiju/estateagents/entity/TaBuilding.java

@@ -237,4 +237,16 @@ public class TaBuilding implements Serializable {
 
     @TableField(exist = false)
     private List<TaShareContent> shareContents;
+
+    /**
+     * 助力活动
+     */
+    @TableField(exist = false)
+    private List<HelpActivity> helpActivityList;
+
+    /**
+     * 拼团活动
+     */
+    @TableField(exist = false)
+    private List<TaShareActivity> shareActivityList;
 }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -198,9 +198,22 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setShareContents(taShareContentService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
 
         // 助力活动
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("building_id", id);
+        helpActivityQueryWrapper.eq("status", 1);
+        helpActivityQueryWrapper.in("activity_status", 0, 1);
+        List<HelpActivity> helpActivityList = helpActivityMapper.selectList(helpActivityQueryWrapper);
 
+        building.setHelpActivityList(helpActivityList);
 
         // 拼团活动
+        QueryWrapper<TaShareActivity> shareActivityQueryWrapper = new QueryWrapper<>();
+        shareActivityQueryWrapper.eq("building_id", id);
+        shareActivityQueryWrapper.eq("status", 1);
+        shareActivityQueryWrapper.in("activity_status", 0, 1);
+        List<TaShareActivity> shareActivityList = taShareActivityMapper.selectList(shareActivityQueryWrapper);
+
+        building.setShareActivityList(shareActivityList);
 
 
         return ResponseBean.success(building);