张延森 5 years ago
parent
commit
cc430ae453

+ 10
- 0
src/main/java/com/huiju/estateagents/controller/TaExtendContentController.java View File

6
 import com.huiju.estateagents.base.BaseController;
6
 import com.huiju.estateagents.base.BaseController;
7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
 import com.huiju.estateagents.entity.TaExtendContent;
8
 import com.huiju.estateagents.entity.TaExtendContent;
9
+import com.huiju.estateagents.service.ITaBuildingService;
9
 import com.huiju.estateagents.service.ITaExtendContentService;
10
 import com.huiju.estateagents.service.ITaExtendContentService;
11
+import org.omg.CORBA.PUBLIC_MEMBER;
10
 import org.slf4j.Logger;
12
 import org.slf4j.Logger;
11
 import org.slf4j.LoggerFactory;
13
 import org.slf4j.LoggerFactory;
12
 import org.springframework.beans.factory.annotation.Autowired;
14
 import org.springframework.beans.factory.annotation.Autowired;
35
     @Autowired
37
     @Autowired
36
     public ITaExtendContentService iTaExtendContentService;
38
     public ITaExtendContentService iTaExtendContentService;
37
 
39
 
40
+    @Autowired
41
+    public ITaBuildingService iTaBuildingService;
38
 
42
 
39
     /**
43
     /**
40
      * 分页查询列表
44
      * 分页查询列表
71
     public ResponseBean taExtendContentAdd(@RequestBody TaExtendContent taExtendContent){
75
     public ResponseBean taExtendContentAdd(@RequestBody TaExtendContent taExtendContent){
72
         ResponseBean responseBean = new ResponseBean();
76
         ResponseBean responseBean = new ResponseBean();
73
         try {
77
         try {
78
+            Integer cityId = iTaBuildingService.getCityById(taExtendContent.getBuildingId());
79
+            taExtendContent.setCityId(cityId);
80
+
74
             if (iTaExtendContentService.save(taExtendContent)){
81
             if (iTaExtendContentService.save(taExtendContent)){
75
                 responseBean.addSuccess(taExtendContent);
82
                 responseBean.addSuccess(taExtendContent);
76
             }else {
83
             }else {
117
                                         @RequestBody TaExtendContent taExtendContent){
124
                                         @RequestBody TaExtendContent taExtendContent){
118
         ResponseBean responseBean = new ResponseBean();
125
         ResponseBean responseBean = new ResponseBean();
119
         try {
126
         try {
127
+            Integer cityId = iTaBuildingService.getCityById(taExtendContent.getBuildingId());
128
+            taExtendContent.setCityId(cityId);
129
+
120
             if (iTaExtendContentService.updateById(taExtendContent)){
130
             if (iTaExtendContentService.updateById(taExtendContent)){
121
                 responseBean.addSuccess(taExtendContent);
131
                 responseBean.addSuccess(taExtendContent);
122
             }else {
132
             }else {

+ 11
- 0
src/main/java/com/huiju/estateagents/controller/TaGoodsController.java View File

9
 import com.huiju.estateagents.common.JWTUtils;
9
 import com.huiju.estateagents.common.JWTUtils;
10
 import com.huiju.estateagents.common.StringUtils;
10
 import com.huiju.estateagents.common.StringUtils;
11
 import com.huiju.estateagents.entity.TaGoods;
11
 import com.huiju.estateagents.entity.TaGoods;
12
+import com.huiju.estateagents.service.ITaBuildingService;
12
 import com.huiju.estateagents.service.ITaGoodsService;
13
 import com.huiju.estateagents.service.ITaGoodsService;
13
 import org.slf4j.Logger;
14
 import org.slf4j.Logger;
14
 import org.slf4j.LoggerFactory;
15
 import org.slf4j.LoggerFactory;
41
     @Autowired
42
     @Autowired
42
     public ITaGoodsService iTaGoodsService;
43
     public ITaGoodsService iTaGoodsService;
43
 
44
 
45
+    @Autowired
46
+    public ITaBuildingService iTaBuildingService;
44
 
47
 
45
     /**
48
     /**
46
      * 分页查询列表
49
      * 分页查询列表
79
     public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods){
82
     public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods){
80
         ResponseBean responseBean = new ResponseBean();
83
         ResponseBean responseBean = new ResponseBean();
81
         try {
84
         try {
85
+
86
+            Integer cityId = iTaBuildingService.getCityById(taGoods.getBuildingId());
87
+            taGoods.setCityId(cityId);
88
+
82
             if (iTaGoodsService.save(taGoods)){
89
             if (iTaGoodsService.save(taGoods)){
83
                 responseBean.addSuccess(taGoods);
90
                 responseBean.addSuccess(taGoods);
84
             }else {
91
             }else {
123
     public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods){
130
     public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods){
124
         ResponseBean responseBean = new ResponseBean();
131
         ResponseBean responseBean = new ResponseBean();
125
         try {
132
         try {
133
+
134
+            Integer cityId = iTaBuildingService.getCityById(taGoods.getBuildingId());
135
+            taGoods.setCityId(cityId);
136
+
126
             if (iTaGoodsService.updateById(taGoods)){
137
             if (iTaGoodsService.updateById(taGoods)){
127
                 responseBean.addSuccess(taGoods);
138
                 responseBean.addSuccess(taGoods);
128
             }else {
139
             }else {

+ 1
- 1
src/main/java/com/huiju/estateagents/entity/TaExtendContent.java View File

85
      */
85
      */
86
     private String buildingId;
86
     private String buildingId;
87
 
87
 
88
-
88
+    private Integer cityId;
89
 }
89
 }

+ 2
- 0
src/main/java/com/huiju/estateagents/entity/TaGoods.java View File

107
      */
107
      */
108
     private String address;
108
     private String address;
109
 
109
 
110
+    private Integer cityId;
111
+
110
     /**
112
     /**
111
      * 兑换人
113
      * 兑换人
112
      */
114
      */

+ 2
- 0
src/main/java/com/huiju/estateagents/service/ITaBuildingService.java View File

136
      * @return
136
      * @return
137
      */
137
      */
138
     ResponseBean buildingAll();
138
     ResponseBean buildingAll();
139
+
140
+    Integer getCityById(String buildingId);
139
 }
141
 }

+ 10
- 0
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java View File

477
         return ResponseBean.success(taBuilding);
477
         return ResponseBean.success(taBuilding);
478
     }
478
     }
479
 
479
 
480
+    @Override
481
+    public Integer getCityById(String buildingId) {
482
+        if (StringUtils.isEmpty(buildingId)) return null;
483
+
484
+        TaBuilding taBuilding = taBuildingMapper.selectById(buildingId);
485
+        if (null == taBuilding) return null;
486
+
487
+        return taBuilding.getCityId();
488
+    }
489
+
480
 
490
 
481
     int insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
491
     int insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
482
         int rows = 0;
492
         int rows = 0;