Merge branch 'master' into developer

haoban-manage3-service/pom.xml

@@ -58,6 +58,12 @@
             <artifactId>haoban-config</artifactId>
             <version>${haoban-config}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>log-record-sdk</artifactId>
+            <version>${log-record-sdk}</version>
+        </dependency>
         <dependency>
             <groupId>com.vdurmont</groupId>
             <artifactId>emoji-java</artifactId>
@@ -162,11 +168,6 @@
             <artifactId>gic-enterprise-operation-api</artifactId>
             <version>${gic-enterprise-operation-api}</version>
         </dependency>
-        <dependency>
-            <groupId>com.gic</groupId>
-            <artifactId>log-record-sdk</artifactId>
-            <version>${log-record-sdk}</version>
-        </dependency>
     </dependencies>
 
     <build>

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java

@@ -488,11 +488,16 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             }
         } else if (type == 2) {
             logger.info("导购门店转移,新的导购和门店,clerkId={},storeId={}", clerkId, clerkSyncQDTO.getStoreId());
-            StaffClerkRelationDTO oldRelationDTO = staffClerkRelationService.getByClerkId(oldClerkId);
+            StaffClerkRelationDTO oldRelationDTO = staffClerkRelationService.getByCodeAndEnterpriseId(clerkCode,enterpriseId);
             if (null == oldRelationDTO) {
-                logger.info("导购未关联成员,clerkCode={}", clerkCode);
+                logger.info("导购未关联成员,clerkCode={}",clerkCode);
                 return;
             }
+           /* StaffClerkRelationDTO oldRelationDTO = staffClerkRelationService.getByClerkId(oldClerkId);
+            if (null == oldRelationDTO) {
+                logger.info("导购未关联成员,clerkCode={}", clerkCode);
+                return;
+            }*/
             logger.info("导购门店转移,老的绑定导购id={}", oldRelationDTO.getClerkId());
             this.moveOrAddClerk(clerkSyncQDTO, oldRelationDTO);
         } else if (type == 3) {

haoban-manage3-web/pom.xml

@@ -129,6 +129,11 @@
             <version>${haoban-config}</version>
         </dependency>
         <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>log-record-sdk</artifactId>
+            <version>${log-record-sdk}</version>
+        </dependency>
+        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <version>3.1.0</version>