商品 等bug

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

@@ -83,7 +83,7 @@ public class ActivityServiceImpl implements ActivityServiceI {
 				e.setSuccessNum(null);
 			}else if (e.getType().equals("group")){
 				taShareRecords.forEach(share -> {
-					if (e.getId().equals(share.getGroupActivityId())){
+					if (e.getId().equals(String.valueOf(share.getGroupActivityId()))){
 						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 					}
 				});

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

@@ -237,13 +237,13 @@ public class TaGoodsController extends BaseController {
 
     @ApiOperation(value = "微信 查询有商品的项目", notes = "微信 查询有商品的项目")
     @GetMapping(value = "/wx/goodsToBuilding")
-    public ResponseBean wxGoodsToBuilding(HttpServletRequest request) {
-        return iTaBuildingService.getBuildingListById(getOrgId(request));
+    public ResponseBean wxGoodsToBuilding(@RequestParam(value = "cityId", required = false) Integer cityId, HttpServletRequest request) {
+        return iTaBuildingService.getBuildingListById(getOrgId(request),cityId);
     }
 
     /**
      * 分页查询列表
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @return
      */
@@ -257,6 +257,7 @@ public class TaGoodsController extends BaseController {
     public ResponseBean wxGoodsList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                     @RequestParam(value = "buildingId",required = false) String buildingId,
+                                    @RequestParam(value = "cityId", required = false) Integer cityId,
                                     HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
@@ -277,6 +278,9 @@ public class TaGoodsController extends BaseController {
             if (null != orgId){
                 queryWrapper.eq("org_id", orgId);
             }
+            if (null != cityId){
+                queryWrapper.eq("city_id", cityId);
+            }
             queryWrapper.orderByDesc("order_no");
             queryWrapper.orderByDesc("create_date");
             

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

@@ -43,7 +43,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
 
     List<TaBuilding> buildingAll(@Param("orgId") Integer orgId);
 
-    List<TaBuilding> getBuildingListById(@Param("orgId") Integer orgId);
+    List<TaBuilding> getBuildingListById(@Param("orgId") Integer orgId,@Param("cityId") Integer cityId);
     /**
      * 查询当前楼盘
      * @param buildingId

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -3,7 +3,6 @@ package com.huiju.estateagents.service;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -159,5 +158,5 @@ public interface ITaBuildingService extends IService<TaBuilding> {
 
     Integer getCityById(String buildingId);
 
-    ResponseBean getBuildingListById(Integer orgId);
+    ResponseBean getBuildingListById(Integer orgId,Integer cityId);
 }

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

@@ -15,9 +15,7 @@ import com.huiju.estateagents.service.ITaBuildingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.service.TaPosterService;
 import com.huiju.estateagents.service.TaShareContentService;
-import jodd.util.CollectionUtil;
 import org.apache.commons.collections.CollectionUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -633,8 +631,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean getBuildingListById(Integer orgId) {
-        List<TaBuilding> buildings = taBuildingMapper.getBuildingListById(orgId);
+    public ResponseBean getBuildingListById(Integer orgId,Integer cityId) {
+        List<TaBuilding> buildings = taBuildingMapper.getBuildingListById(orgId,cityId);
         return ResponseBean.success(buildings);
     }
 

src/main/resources/mapper/TaBuildingMapper.xml

@@ -196,7 +196,7 @@
 
     <select id="getBuildingListById" resultType="com.huiju.estateagents.entity.TaBuilding">
       select * from ta_building t where t.building_id in (
-	    select t.building_id from ta_goods t where t.org_id = #{orgId} group by t.building_id
+	    select t.building_id from ta_goods t where t.org_id = #{orgId} and t.city_id = #{cityId} group by t.building_id
       )
     </select>