顾绍勇 hace 5 años
padre
commit
201dd2782b

+ 29
- 11
src/main/java/com/huiju/estateagents/controller/TaRaiseController.java Ver fichero

10
 import com.huiju.estateagents.common.StringUtils;
10
 import com.huiju.estateagents.common.StringUtils;
11
 import com.huiju.estateagents.entity.TaPersonBuilding;
11
 import com.huiju.estateagents.entity.TaPersonBuilding;
12
 import com.huiju.estateagents.entity.TaRaise;
12
 import com.huiju.estateagents.entity.TaRaise;
13
+import com.huiju.estateagents.entity.TaRaiseInvite;
13
 import com.huiju.estateagents.entity.TaSalesBatch;
14
 import com.huiju.estateagents.entity.TaSalesBatch;
14
-import com.huiju.estateagents.service.ITaRaiseService;
15
-import com.huiju.estateagents.service.ITaSalesBatchService;
16
-import com.huiju.estateagents.service.ITaSaveService;
17
-import com.huiju.estateagents.service.ITdCityService;
15
+import com.huiju.estateagents.service.*;
16
+import com.huiju.estateagents.service.impl.TaRaiseInviteServiceImpl;
18
 import io.swagger.models.auth.In;
17
 import io.swagger.models.auth.In;
19
 import org.slf4j.Logger;
18
 import org.slf4j.Logger;
20
 import org.slf4j.LoggerFactory;
19
 import org.slf4j.LoggerFactory;
22
 import org.springframework.web.bind.annotation.*;
21
 import org.springframework.web.bind.annotation.*;
23
 
22
 
24
 import javax.servlet.http.HttpServletRequest;
23
 import javax.servlet.http.HttpServletRequest;
24
+import java.lang.reflect.Array;
25
 import java.time.LocalDateTime;
25
 import java.time.LocalDateTime;
26
+import java.util.ArrayList;
26
 import java.util.List;
27
 import java.util.List;
27
 
28
 
28
 /**
29
 /**
48
     @Autowired
49
     @Autowired
49
     public ITaSalesBatchService iTaSalesBatchService;
50
     public ITaSalesBatchService iTaSalesBatchService;
50
 
51
 
52
+    @Autowired
53
+    private TaRaiseInviteServiceImpl iTaRaiseInviteService;
54
+
51
     /**
55
     /**
52
      * 获取认筹列表
56
      * 获取认筹列表
53
      *
57
      *
139
 
143
 
140
             // 获取销售批次状态
144
             // 获取销售批次状态
141
             TaSalesBatch taSalesBatch = new TaSalesBatch();
145
             TaSalesBatch taSalesBatch = new TaSalesBatch();
142
-            if (taRaise.getSalesBatchId() != null){
146
+            if (taRaise.getSalesBatchId() != null) {
143
                 QueryWrapper<TaSalesBatch> taSalesBatchQueryWrapper = new QueryWrapper<>();
147
                 QueryWrapper<TaSalesBatch> taSalesBatchQueryWrapper = new QueryWrapper<>();
144
                 taSalesBatchQueryWrapper.eq("sales_batch_id", taRaise.getSalesBatchId());
148
                 taSalesBatchQueryWrapper.eq("sales_batch_id", taRaise.getSalesBatchId());
145
                 taSalesBatch = iTaSalesBatchService.getOne(taSalesBatchQueryWrapper);
149
                 taSalesBatch = iTaSalesBatchService.getOne(taSalesBatchQueryWrapper);
146
             }
150
             }
147
 
151
 
148
-            // 为邀请制,添加认筹被邀请清单
149
-            if(CommConstant.STATUS_NORMAL == taRaise.getIsInvite()){
150
-
151
-            }
152
-
153
             taRaise.setOrgId(orgId);
152
             taRaise.setOrgId(orgId);
154
-            taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null );
153
+            taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null);
155
             taRaise.setStatus(taSalesBatch.getStatus());
154
             taRaise.setStatus(taSalesBatch.getStatus());
156
             taRaise.setCreateDate(LocalDateTime.now());
155
             taRaise.setCreateDate(LocalDateTime.now());
157
             if (iTaRaiseService.save(taRaise)) {
156
             if (iTaRaiseService.save(taRaise)) {
157
+
158
+                // 为邀请制,添加认筹被邀请清单
159
+                if (CommConstant.STATUS_NORMAL == taRaise.getIsInvite()) {
160
+                    TaRaiseInvite taRaiseInvite = new TaRaiseInvite();
161
+                    taRaiseInvite.setOrgId(orgId);
162
+                    taRaiseInvite.setRaiseId(taRaise.getRaiseId());
163
+                    taRaiseInvite.setBuildingId(taRaise.getBuildingId());
164
+                    taRaiseInvite.setSalesBatchId(taSalesBatch.getSalesBatchId());
165
+                    taRaiseInvite.setCreateDate(LocalDateTime.now());
166
+                    List<TaRaiseInvite> taRaiseInviteList = new ArrayList<>();
167
+                    String[] inviteTelArr = StringUtils.isEmpty(taRaise.getInviteTel()) ?
168
+                            new String[]{} : taRaise.getInviteTel().replace(",", ",").split(",");
169
+                    for (String inviteTel : inviteTelArr) {
170
+                        taRaiseInvite.setInviteTel(inviteTel);
171
+                        taRaiseInviteList.add(taRaiseInvite);
172
+                    }
173
+                    iTaRaiseInviteService.saveBatch(taRaiseInviteList);
174
+                }
175
+
158
                 responseBean.addSuccess(taRaise);
176
                 responseBean.addSuccess(taRaise);
159
             } else {
177
             } else {
160
                 responseBean.addError("fail");
178
                 responseBean.addError("fail");

+ 2
- 2
src/main/java/com/huiju/estateagents/entity/TaRaiseInvite.java Ver fichero

39
     /**
39
     /**
40
      * 认筹id
40
      * 认筹id
41
      */
41
      */
42
-    private String raiseId;
42
+    private Integer raiseId;
43
 
43
 
44
     /**
44
     /**
45
      * 销售批次id
45
      * 销售批次id
46
      */
46
      */
47
-    private String salesBatchId;
47
+    private Integer salesBatchId;
48
 
48
 
49
     /**
49
     /**
50
      * 项目id
50
      * 项目id

+ 2
- 0
src/main/java/com/huiju/estateagents/mapper/TaRaiseInviteMapper.java Ver fichero

2
 
2
 
3
 import com.huiju.estateagents.entity.TaRaiseInvite;
3
 import com.huiju.estateagents.entity.TaRaiseInvite;
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
+import org.apache.ibatis.annotations.Mapper;
5
 
6
 
6
 /**
7
 /**
7
  * <p>
8
  * <p>
11
  * @author fxf
12
  * @author fxf
12
  * @since 2020-03-30
13
  * @since 2020-03-30
13
  */
14
  */
15
+@Mapper
14
 public interface TaRaiseInviteMapper extends BaseMapper<TaRaiseInvite> {
16
 public interface TaRaiseInviteMapper extends BaseMapper<TaRaiseInvite> {
15
 
17
 
16
 }
18
 }

+ 2
- 2
src/main/resources/mapper/TaOrgMapper.xml Ver fichero

14
             left join ta_channel_proxy t4 on t3.channel_id = t4.channel_id
14
             left join ta_channel_proxy t4 on t3.channel_id = t4.channel_id
15
         <where>
15
         <where>
16
             <if test = "orgName != null and orgName != ''">
16
             <if test = "orgName != null and orgName != ''">
17
-                t.`name` = #{orgName}
17
+                t.`name` like concat('%',#{orgName},'%')
18
             </if>
18
             </if>
19
             <if test = "miniAppName != null and miniAppName != ''">
19
             <if test = "miniAppName != null and miniAppName != ''">
20
-                AND t2.`name` = #{miniAppName}
20
+                AND t2.`name` like concat('%',#{miniAppName},'%')
21
             </if>
21
             </if>
22
         </where>
22
         </where>
23
         ORDER BY
23
         ORDER BY