Merge branch 'master' into 'uat'

Master

See merge request !81

src/main/java/com/afanticar/afantiopenapi/controller/ClueImMessageController.java

@@ -51,7 +51,9 @@ public class ClueImMessageController extends BaseController {
         Page<LiveCrmCustomerChat> page = new Page<>(request.getCurrent(), request.getSize());
         LambdaQueryWrapper<LiveCrmCustomerChat> queryWrapper = new LambdaQueryWrapper<>();
         openIdDTOList.forEach(openIdDTO -> {
-            queryWrapper.or().eq(LiveCrmCustomerChat::getAuthorOpenId, openIdDTO.getAuthorOpenId())
+            queryWrapper.or()
+                    .eq(LiveCrmCustomerChat::getAuthorId, openIdDTO.getAuthorId())
+                    .eq(LiveCrmCustomerChat::getAuthorOpenId, openIdDTO.getAuthorOpenId())
                     .eq(LiveCrmCustomerChat::getFansOpenId, openIdDTO.getUserOpenId());
         });
 

src/main/java/com/afanticar/afantiopenapi/model/dto/OpenIdDTO.java

@@ -12,6 +12,7 @@ import javax.validation.constraints.NotNull;
 @JsonNaming(value = com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy.class)
 @JSONType(naming = com.alibaba.fastjson.PropertyNamingStrategy.SnakeCase)
 public class OpenIdDTO {
+    private String authorId;
     private String authorOpenId;
     private String userOpenId;
     private int platform;

src/main/resources/mapper/OpenApiClientPrincipalRelationMapper.xml

@@ -8,7 +8,7 @@
 
     <select id="getOpenIdByStoreCodeAndPhone"
             resultType="com.afanticar.afantiopenapi.model.dto.OpenIdDTO">
-select distinct author_open_id ,user_open_id,platform  from fhl_mkms_clue_follow_up lea
+select distinct author_id ,author_open_id ,user_open_id,platform  from fhl_mkms_clue_follow_up lea
 inner join base_dealer dea on lea.dealer_id = dea.id and dea.status=1 and dea.is_deleted =0 and dea.store_code =#{storeCode}
 where lea.contact =#{phone} and lea.is_deleted = 0
     </select>