suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
pserimal
2023-06-25 15:05:53 +08:00
parent 94078f51d2 3e4d451805
commit 4345fb05aa
6 changed files with 60 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
View File

@@ -203,16 +203,16 @@
set room_status = #{roomStatus},update_time = now() set room_status = #{roomStatus},update_time = now()
<where> <where>
<if test="record.roomStatus !=null and record.roomStatus!=''"> <if test="record.roomStatus !=null and record.roomStatus!=''">
and hpip.room_status = #{record.roomStatus} and room_status = #{record.roomStatus}
</if> </if>
<if test="record.startTime !=null and record.startTime!=''"> <if test="record.startTime !=null'">
and hpip.start_time &gt;= #{record.startTime} and start_time &gt;= #{record.startTime}
</if> </if>
<if test="record.endTime !=null and record.endTime!=''"> <if test="record.endTime !=null">
and hpip.end_time &lt;= #{record.endTime} and end_time &lt;= #{record.endTime}
</if> </if>
<if test="record.deleted !=null and record.deleted!=''"> <if test="record.deleted !=null and record.deleted!=''">
and hpip.deleted = #{deleted} and deleted = #{deleted}
</if> </if>
</where> </where>
</update> </update>
@@ -222,16 +222,16 @@
set room_status = #{roomStatus},update_time = now() set room_status = #{roomStatus},update_time = now()
<where> <where>
<if test="record.roomStatus !=null and record.roomStatus!=''"> <if test="record.roomStatus !=null and record.roomStatus!=''">
and hpip.room_status = #{record.roomStatus} and room_status = #{record.roomStatus}
</if> </if>
<if test="record.startTime !=null and record.startTime!=''"> <if test="record.startTime !=null">
and hpip.start_time &gt;= #{record.startTime} and start_time &gt;= #{record.startTime}
</if> </if>
<if test="record.endTime !=null and record.endTime!=''"> <if test="record.endTime !=null">
and hpip.start_time &lt;= #{record.endTime} and start_time &lt;= #{record.endTime}
</if> </if>
<if test="record.deleted !=null and record.deleted!=''"> <if test="record.deleted !=null and record.deleted!=''">
and hpip.deleted = #{deleted} and deleted = #{deleted}
</if> </if>
</where> </where>
</update> </update>
@@ -241,16 +241,16 @@
set room_status = #{roomStatus},update_time = now() set room_status = #{roomStatus},update_time = now()
<where> <where>
<if test="record.roomStatus !=null and record.roomStatus!=''"> <if test="record.roomStatus !=null and record.roomStatus!=''">
and hpip.room_status = #{record.roomStatus} and room_status = #{record.roomStatus}
</if> </if>
<if test="record.startTime !=null and record.startTime!=''"> <if test="record.startTime !=null">
and hpip.end_time &gt;= #{record.startTime} and end_time &gt;= #{record.startTime}
</if> </if>
<if test="record.endTime !=null and record.endTime!=''"> <if test="record.endTime !=null">
and hpip.end_time &lt;= #{record.endTime} and end_time &lt;= #{record.endTime}
</if> </if>
<if test="record.deleted !=null and record.deleted!=''"> <if test="record.deleted !=null and record.deleted!=''">
and hpip.deleted = #{deleted} and deleted = #{deleted}
</if> </if>
</where> </where>
</update> </update>
@@ -362,10 +362,10 @@
<if test="record.roomStatus !=null"> <if test="record.roomStatus !=null">
and hpip.room_status = #{record.roomStatus} and hpip.room_status = #{record.roomStatus}
</if> </if>
<if test="record.startTime !=null and record.startTime!=''"> <if test="record.startTime !=null">
and hpip.start_time &gt;= #{record.startTime} and hpip.start_time &gt;= #{record.startTime}
</if> </if>
<if test="record.endTime !=null and record.endTime!=''"> <if test="record.endTime !=null">
and hpip.end_time &lt;= #{record.endTime} and hpip.end_time &lt;= #{record.endTime}
</if> </if>
<if test="record.deleted !=null and record.deleted!=''"> <if test="record.deleted !=null and record.deleted!=''">
@@ -424,10 +424,10 @@
<if test="record.partnerId !=null and record.partnerId!=''"> <if test="record.partnerId !=null and record.partnerId!=''">
and partner_id = #{record.partnerId} and partner_id = #{record.partnerId}
</if> </if>
<if test="record.startTime !=null and record.startTime!=''"> <if test="record.startTime !=null">
and start_time = #{record.startTime} and start_time = #{record.startTime}
</if> </if>
<if test="record.endTime !=null and record.endTime!=''"> <if test="record.endTime !=null">
and end_time = #{record.endTime} and end_time = #{record.endTime}
</if> </if>
<if test="record.interviewer !=null and record.interviewer!=''"> <if test="record.interviewer !=null and record.interviewer!=''">

39
coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java
View File

@@ -39,25 +39,40 @@ public class JobHandler {
*/ */
@XxlJob("updateInterviewOverTime") @XxlJob("updateInterviewOverTime")
public void updateInterviewOverTime(){ public void updateInterviewOverTime(){
log.info("面试超时定时任务开始"); try {
hyPartnerInterviewPlanService.updateInterviewOverTime(); log.info("面试超时定时任务开始");
log.info("面试超时定时任务结束"); hyPartnerInterviewPlanService.updateInterviewOverTime();
XxlJobHelper.handleSuccess(); log.info("面试超时定时任务结束");
XxlJobHelper.handleSuccess();
}catch (Exception e){
log.error("面试超时定时任务异常",e);
XxlJobHelper.log("面试超时定时任务异常"+e.getMessage());
}
} }
@XxlJob("openInterviewRoom") @XxlJob("openInterviewRoom")
public void openInterviewRoom(){ public void openInterviewRoom(){
log.info("房间状态开启定时任务开始"); try {
hyPartnerInterviewPlanService.openInterviewRoom(); log.info("房间状态开启定时任务开始");
log.info("房间状态开启定时任务结束"); hyPartnerInterviewPlanService.openInterviewRoom();
XxlJobHelper.handleSuccess(); log.info("房间状态开启定时任务结束");
XxlJobHelper.handleSuccess();
}catch (Exception e){
log.error("房间状态开启定时任务异常",e);
XxlJobHelper.log("房间状态开启定时任务异常"+e.getMessage());
}
} }
public void updateAbsentInterview(){ public void updateAbsentInterview(){
log.info("面试缺席定时任务开始"); try {
hyPartnerInterviewPlanService.updateAbsentInterview(); log.info("面试缺席定时任务开始");
log.info("面试缺席定时任务结束"); hyPartnerInterviewPlanService.updateAbsentInterview();
XxlJobHelper.handleSuccess(); log.info("面试缺席定时任务结束");
XxlJobHelper.handleSuccess();
}catch (Exception e){
log.error("面试缺席定时任务异常",e);
XxlJobHelper.log("面试缺席定时任务异常"+e.getMessage());
}
} }

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -542,7 +542,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
Boolean flag = this.assignFollowUser(hyPartnerLineInfoDO.getPartnerId(), wantShopArea, acceptAdjustType); Boolean flag = this.assignFollowUser(hyPartnerLineInfoDO.getPartnerId(), wantShopArea, acceptAdjustType);
hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode()); hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
if (flag){ if (flag){
hyPartnerLineInfoDO.setInvestmentManager("ou_7a6a19ae800afde783b0ec2dabaabf95"); String investmentManager = getAssignFollowUser(partnerId, "intent");
hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
} }
hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO); hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO);
} }

7
coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java
View File

@@ -1,6 +1,8 @@
package com.cool.store.controller; package com.cool.store.controller;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.EnterpriseUserService; import com.cool.store.service.EnterpriseUserService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -20,5 +22,10 @@ public class EnterpriseUserController {
@Resource @Resource
public EnterpriseUserService enterpriseUserService; public EnterpriseUserService enterpriseUserService;
@ApiOperation("获取开发主管")
@GetMapping("/getDevelopmentDirectorList")
public ResponseResult getDevelopmentDirectorList(@RequestParam("wantShopArea") String wantShopArea){
return ResponseResult.success(enterpriseUserService.getDevelopmentDirectorList(wantShopArea));
}
} }

2
coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java
View File

@@ -46,7 +46,7 @@ public class OssClientController {
@GetMapping("/getUploadFileConfig") @GetMapping("/getUploadFileConfig")
public ResponseResult getUploadFileConfig(){ public ResponseResult getUploadFileConfig(){
// host的格式为 bucketname.endpoint // host的格式为 bucketname.endpoint
String host = "http://" + bucket + "." + endpoint; String host = "https://" + bucket + "." + endpoint;
// 用户上传文件时指定的前缀。 // 用户上传文件时指定的前缀。
String dir = "partner/" + corpId + "/"; String dir = "partner/" + corpId + "/";

2
coolstore-partner-webc/src/main/java/com/cool/store/controller/OssClientController.java
View File

@@ -43,7 +43,7 @@ public class OssClientController {
@GetMapping("/getUploadFileConfig") @GetMapping("/getUploadFileConfig")
public ResponseResult getUploadFileConfig(){ public ResponseResult getUploadFileConfig(){
// host的格式为 bucketname.endpoint // host的格式为 bucketname.endpoint
String host = "http://" + bucket + "." + endpoint; String host = "https://" + bucket + "." + endpoint;
// 用户上传文件时指定的前缀。 // 用户上传文件时指定的前缀。
String dir = "partner/" + corpId + "/"; String dir = "partner/" + corpId + "/";