Merge branch 'dev/feat/partner1.5.2_20231121' into hxd/feat/partner1.5.2

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserChannelMapper.java

@@ -28,4 +28,7 @@ public interface HyPartnerUserChannelMapper {
     List<HyPartnerUserChannelDO> getAllUserChannel();
 
     List<HyPartnerUserChannelDO> getUserChannelByIds(List<Integer> userChannelIds);
+
+    HyPartnerUserChannelDO selectByChannel(@Param("channelId") Long channelId,@Param("channelName") String channelName);
+
 }

coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml

@@ -231,7 +231,7 @@
     <if test="labelGroupName != null and labelGroupName != ''">
       AND t1.label_group_name LIKE CONCAT('%', #{labelGroupName}, '%')
     </if>
-    ORDER BY t1.create_time
+    ORDER BY t1.create_time,t1.create_time
   </select>
 
 </mapper>

coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserChannelMapper.xml

@@ -105,4 +105,10 @@
       </if>
     </where>
   </select>
+  <select id="selectByChannel" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from hy_partner_user_channel
+    where channel_id = #{channelId}  and  channel_name=#{channelName} limit 1
+  </select>
 </mapper>

coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java

@@ -38,8 +38,8 @@ public class CreateQualifyVerifyReq {
     @ApiModelProperty(value = "加盟商类型", required = true)
     private KeyText fraType;
 
-    @ApiModelProperty(value = "加盟类型", required = true, allowableValues = "1: {StandardStore: 4.0标准版店铺} 2: {LiteEditionStore: 轻享版店铺}")
+    @ApiModelProperty(value = "加盟类型", required = true, allowableValues = "1: {HSAY: 沪上阿姨} 2: {HSLIGHT: 沪上阿姨（轻享）}")
-    private KeyText franchiseType;
+    private KeyText innerbrandtype;
 
     @ApiModelProperty(value = "请求来源", required = true)
     private KeyText fraSource;

coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java

@@ -61,8 +61,8 @@ public class RpcCreateQualifyVerifyReq {
         @ApiModelProperty(value = "加盟商类型", required = true)
         private KeyText fraType;
 
-        @ApiModelProperty(value = "加盟类型", required = true, allowableValues = "1: {StandardStore: 4.0标准版店铺} 2: {LiteEditionStore: 轻享版店铺}")
+        @ApiModelProperty(value = "加盟类型", required = true, allowableValues = "1: {HSAY: 沪上阿姨} 2: {HSLIGHT: 沪上阿姨（轻享）}")
-        private KeyText franchiseType;
+        private KeyText innerbrandtype;
 
         @ApiModelProperty(value = "意向人email", required = true)
         private String intendedEmail;

coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java

@@ -127,7 +127,7 @@ public class EcSyncServiceImpl implements EcSyncService {
         UserSourceResponse userSourceResponse = JSONObject.parseObject(s, UserSourceResponse.class);
         for (UserSourceResponse.ChannelSource channelSource : userSourceResponse.getData()) {
             Long id = channelSource.getId();
-            HyPartnerUserChannelDO selectByChannel = hyPartnerUserChannelMapper.selectByChannelId(id);
+            HyPartnerUserChannelDO selectByChannel = hyPartnerUserChannelMapper.selectByChannel(id,channelSource.getName());
             HyPartnerUserChannelDO hyPartnerUserChannel = new HyPartnerUserChannelDO();
             hyPartnerUserChannel.setChannelId(channelSource.getId()).setChannelName(channelSource.getName());
             //有就更新 没有插入

coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java

@@ -326,6 +326,13 @@ public class InterviewServiceImpl implements InterviewService {
         hyPartnerInterviewDO.setUpdateTime(new Date());
         hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO);
 
+        //如果是待面试阶段修改面试时间需要发短信通知
+        if (interviewInfo.getStatus().equals(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode()))) {
+            HyPartnerBaseInfoDO partnerBaseInfo = hyPartnerBaseInfoMapper.getByPartnerLineId(interviewInfo.getPartnerLineId());
+            //异步发送短信给加盟商
+            eventCenterHttpRequest.sendSmsVariable(partnerBaseInfo.getMobile(), SMSMsgEnum.INTERVIEW_APPOINTMENT_PASS,DateUtil.format(DateUtil.parse(interviewInfo.getStartTime()), DatePattern.NORM_DATETIME_MINUTE_PATTERN),wechatMiniAppService.getMiniAppUrl());
+        }
+
         //记录日志
         LoginUserInfo operator = CurrentUserHolder.getUser();
         ModifyInterviewTimeDTO log = ModifyInterviewTimeDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getUserId()).operateUsername(operator.getName())
@@ -443,9 +450,9 @@ public class InterviewServiceImpl implements InterviewService {
             throw new ApiException(ErrorCodeEnum.INTERVIEW_LINE_ID_IS_NULL);
         }
         //如果开始时间小于当前时间需要报错
-        if(DateUtil.date().isAfter(DateUtil.parse(request.getStartBookingTime()))){
+//        if(DateUtil.date().isAfter(DateUtil.parse(request.getStartBookingTime()))){
-            throw new ApiException(ErrorCodeEnum.CREATE_APPOINTMENT_TIME_ERROR);
+//            throw new ApiException(ErrorCodeEnum.CREATE_APPOINTMENT_TIME_ERROR);
-        }
+//        }
         HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO();
         hyPartnerInterviewPlanDO.setPartnerLineId(request.getPartnerLineId());
         hyPartnerInterviewPlanDO.setDeleted(false);
@@ -803,10 +810,6 @@ public class InterviewServiceImpl implements InterviewService {
         if(request.getPartnerLineId() == null || request.getPartnerLineId()<=0){
             throw new ApiException(ErrorCodeEnum.INTERVIEW_LINE_ID_IS_NULL);
         }
-        //如果开始时间小于当前时间需要报错
-        if(DateUtil.date().isAfter(DateUtil.parse(request.getStartBookingTime()))){
-            throw new ApiException(ErrorCodeEnum.CREATE_APPOINTMENT_TIME_ERROR);
-        }
         HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO();
         hyPartnerInterviewPlanDO.setPartnerLineId(request.getPartnerLineId());
         hyPartnerInterviewPlanDO.setDeleted(false);

coolstore-partner-webb/pom.xml

@@ -43,6 +43,11 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
+        <!-- ELK -->
+        <dependency>
+            <groupId>com.github.danielwegener</groupId>
+            <artifactId>logback-kafka-appender</artifactId>
+        </dependency>
     </dependencies>
 
 

coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java

@@ -27,6 +27,7 @@ import com.cool.store.vo.cuser.IdentityCardInfoVO;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -67,6 +68,15 @@ public class TestController {
     @Autowired
     private WechatMiniAppService wechatMiniAppService;
 
+    @Value("${logging.config}")
+    private String loggingConfig;
+
+    @GetMapping("/log/config")
+    public String testLoggingConfig() {
+        log.debug("Test");
+        return loggingConfig;
+    }
+
     @PostMapping("/post")
     public ResponseResult<Boolean> get(@RequestBody List<TestRequest> testRequestList){
         log.info(JSONObject.toJSONString(testRequestList));

coolstore-partner-webc/pom.xml

@@ -43,6 +43,11 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
+        <!-- ELK -->
+        <dependency>
+            <groupId>com.github.danielwegener</groupId>
+            <artifactId>logback-kafka-appender</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

pom.xml

@@ -229,6 +229,12 @@
                 <artifactId>poi-ooxml</artifactId>
                 <version>3.17</version>
             </dependency>
+            <!-- ELK接入 -->
+            <dependency>
+                <groupId>com.github.danielwegener</groupId>
+                <artifactId>logback-kafka-appender</artifactId>
+                <version>0.2.0-RC2</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>