登录

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/FriendSyncNewOperation.java

@@ -178,6 +178,14 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
             return "未绑定导购";
         }
 
+        //好友统一个开平
+        externalUserDTO.setWxEnterpriseId(wxEnterpriseId);
+        externalUserDTO.setEnterpriseId(staffClerkRelationDTO.getEnterpriseId());
+        externalUserDTO.setStoreId(mainStore.getStoreId());
+        externalUserDTO.setClerkId(staffClerkRelationDTO.getClerkId());
+        externalUserDTO.setWxUserId(wxUserId);
+        externalUserDTO.setStaffId(staffClerkRelationDTO.getStaffId());
+
         TabHaobanWxEnterpriseRelated wxEnterpriseRelated = wxEnterpriseRelatedService.getByEnterpriseId(staffClerkRelationDTO.getWxEnterpriseId(), staffClerkRelationDTO.getEnterpriseId());
         if (wxEnterpriseRelated == null) {
             logger.info("没有存在企业关联：{},{}", staffClerkRelationDTO.getWxEnterpriseId(), staffClerkRelationDTO.getEnterpriseId());
@@ -185,16 +193,10 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
         }
         //好友不同开平
         if (wxEnterpriseRelated.getMemberOpenCardFlag() == 1) {
-            logger.info("好友不同开平，：", JSONObject.toJSONString(externalUserDTO));
+            logger.info("好友不同开平，：{}", JSONObject.toJSONString(externalUserDTO));
             return memberUnionidRelatedApiService.addFriendExternal(externalUserDTO);
         }
-        //好友统一个开平
-        externalUserDTO.setWxEnterpriseId(wxEnterpriseId);
-        externalUserDTO.setEnterpriseId(staffClerkRelationDTO.getEnterpriseId());
-        externalUserDTO.setStoreId(mainStore.getStoreId());
-        externalUserDTO.setClerkId(staffClerkRelationDTO.getClerkId());
-        externalUserDTO.setWxUserId(wxUserId);
-        externalUserDTO.setStaffId(staffClerkRelationDTO.getStaffId());
+
 
         String clerkCode = staffClerkRelationDTO.getClerkCode();
         ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), clerkCode);

haoban-manage3-service/src/test/java/Setest.java

-import cn.hutool.crypto.SecureUtil;
-import cn.hutool.crypto.symmetric.AES;
-import com.alibaba.fastjson.JSONObject;
-import com.gic.haoban.contacts.manage.api.dto.StoreAddDTO;
-import com.gic.haoban.manage.api.dto.SyncSingleDealDTO;
-import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
-import com.vdurmont.emoji.EmojiManager;
-import com.vdurmont.emoji.EmojiParser;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public class Setest {
-
-
-
-    @Test
-    public void test() {
-        String str="゛ʚ情愫ɞ \uD83E\uDD0D";
-        String s = EmojiParser.parseToHtmlHexadecimal(str);
-
-        System.out.println(JSONObject.toJSONString(s));
-    }
-
-
-}