傅行帆 5 vuotta sitten
vanhempi
commit
72e077efa3

+ 5
- 2
src/main/java/com/huiju/estateagents/common/CommConstant.java Näytä tiedosto

1
 package com.huiju.estateagents.common;
1
 package com.huiju.estateagents.common;
2
 
2
 
3
-import io.swagger.models.auth.In;
4
-
5
 public class CommConstant {
3
 public class CommConstant {
6
     public final static String ALIOSS_DEFAULT_UPLOAD = "/miniapp/upload/images/";
4
     public final static String ALIOSS_DEFAULT_UPLOAD = "/miniapp/upload/images/";
7
 
5
 
914
      */
912
      */
915
     public static final String CONCAT_TYPE_FINANCE = "finance,|,finance|finance";
913
     public static final String CONCAT_TYPE_FINANCE = "finance,|,finance|finance";
916
 
914
 
915
+    /**
916
+     * 需要替换推广联系人类型
917
+     */
918
+    public static final String CONCAT_TYPE_PROMOTE = "promote,|,promote|promote";
919
+
917
     /**
920
     /**
918
      * 内置虚拟套餐 ID
921
      * 内置虚拟套餐 ID
919
      */
922
      */

+ 9
- 6
src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java Näytä tiedosto

16
 import org.springframework.web.bind.annotation.*;
16
 import org.springframework.web.bind.annotation.*;
17
 
17
 
18
 import javax.servlet.http.HttpServletRequest;
18
 import javax.servlet.http.HttpServletRequest;
19
-import java.math.BigDecimal;
20
 import java.time.LocalDateTime;
19
 import java.time.LocalDateTime;
21
-import java.util.ArrayList;
22
 import java.util.List;
20
 import java.util.List;
23
 
21
 
24
 
22
 
269
      * @param id 实体ID
267
      * @param id 实体ID
270
      */
268
      */
271
     @RequestMapping(value = "/channel/taContactFinance/{id}", method = RequestMethod.PUT)
269
     @RequestMapping(value = "/channel/taContactFinance/{id}", method = RequestMethod.PUT)
272
-    public ResponseBean taContactInfoAdd(@PathVariable Integer id) {
270
+    public ResponseBean taContactInfoAdd(@PathVariable Integer id,@RequestParam String contactType) {
273
         ResponseBean responseBean = new ResponseBean();
271
         ResponseBean responseBean = new ResponseBean();
274
         TaContact contact = iTaContactService.getById(id);
272
         TaContact contact = iTaContactService.getById(id);
275
         try {
273
         try {
276
             TaContact taContact = new TaContact();
274
             TaContact taContact = new TaContact();
277
             taContact.setContactId(id);
275
             taContact.setContactId(id);
278
-            taContact.setContactType(CommConstant.FINANCE);
276
+            taContact.setContactType(contactType);
279
             if (!StringUtils.isEmpty(contact.getOrderNo())){
277
             if (!StringUtils.isEmpty(contact.getOrderNo())){
280
                 taContact.setOrderNo(contact.getOrderNo());
278
                 taContact.setOrderNo(contact.getOrderNo());
281
             }
279
             }
296
      * 删除财务联系人
294
      * 删除财务联系人
297
      */
295
      */
298
     @RequestMapping(value = "/channel/taContactFinanceDel", method = RequestMethod.PUT)
296
     @RequestMapping(value = "/channel/taContactFinanceDel", method = RequestMethod.PUT)
299
-    public ResponseBean taContactInfoAdd(@RequestBody List<TaContact> taContacts) {
297
+    public ResponseBean taContactInfoAdd(@RequestBody List<TaContact> taContacts,@RequestParam String contactType) {
300
         ResponseBean responseBean = new ResponseBean();
298
         ResponseBean responseBean = new ResponseBean();
301
         try {
299
         try {
300
+            String replaceType = CommConstant.CONCAT_TYPE_PROMOTE;
301
+            if (contactType.equals(CommConstant.FINANCE)){
302
+                replaceType = CommConstant.CONCAT_TYPE_FINANCE;
303
+            }
304
+            String finalReplaceType = replaceType;
302
             taContacts.forEach(e -> {
305
             taContacts.forEach(e -> {
303
-                e.setContactType(e.getContactType().replaceAll( CommConstant.CONCAT_TYPE_FINANCE,""));
306
+                e.setContactType(e.getContactType().replaceAll(finalReplaceType,""));
304
             });
307
             });
305
             if (iTaContactService.updateBatchById(taContacts)) {
308
             if (iTaContactService.updateBatchById(taContacts)) {
306
                 responseBean.addSuccess(taContacts);
309
                 responseBean.addSuccess(taContacts);