diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index b2e2405..e38d5ba 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -230,16 +230,11 @@ public class CustomerService { private void handleAddCustomer(TurnBackDTO turnBackDTOS) throws Exception { log.info(new Gson().toJson(turnBackDTOS)); OpCustomer opCustomer = null; - if (StringUtils.isBlank(turnBackDTOS.getWxData().getUnionId()) && StringUtils.isNotBlank(turnBackDTOS.getWxData().getUserId())) { + if (StringUtils.isNotBlank(turnBackDTOS.getWxData().getUserId())) { //此时说明是企业微信扫码添加 QueryWrapper customerWrapper = new QueryWrapper<>(); customerWrapper.eq("external_userid", turnBackDTOS.getWxData().getUserId()).last("limit 1"); opCustomer = opCustomerDOMapper.selectOne(customerWrapper); - } else if (StringUtils.isNotBlank(turnBackDTOS.getWxData().getUnionId()) && StringUtils.isNotBlank(turnBackDTOS.getWxData().getUserId())) { - //客户信息 - QueryWrapper customerWrapper = new QueryWrapper<>(); - customerWrapper.eq("wechat_uni_id", turnBackDTOS.getWxData().getUnionId()).last("limit 1"); - opCustomer = opCustomerDOMapper.selectOne(customerWrapper); } else { log.error("turn back error: " + turnBackDTOS.toString()); return; diff --git a/src/main/java/com/kiisoo/ic/job/count/SyncCountJobService.java b/src/main/java/com/kiisoo/ic/job/count/SyncCountJobService.java index 48607a1..541e3f2 100644 --- a/src/main/java/com/kiisoo/ic/job/count/SyncCountJobService.java +++ b/src/main/java/com/kiisoo/ic/job/count/SyncCountJobService.java @@ -1,63 +1,63 @@ -package com.kiisoo.ic.job.count; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.kiisoo.ic.system.entity.SysTaskDO; -import com.kiisoo.ic.system.mapper.SysTaskDOMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Random; - -import static com.kiisoo.ic.system.constant.SysTaskConstant.*; - -@Component -@Slf4j -public class SyncCountJobService { - @Autowired - private CustomerCountJob customerDataJob; - - @Autowired - private SysTaskDOMapper sysTaskDOMapper; - -// @Scheduled(cron = "0 0/15 9/1 * * ??") - public void syncStoreCount(){ - try { - int random = new Random().nextInt(100); - Thread.sleep(random*100); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:00"); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("type",TASK_TYPE_STORE_COUNT).eq("create_time",sdf.format(new Date())).last("limit 1"); - SysTaskDO sysTaskDO = sysTaskDOMapper.selectOne(qw); - if (sysTaskDO == null){ - sysTaskDO = new SysTaskDO(TASK_NAME_STORE_COUNT,TASK_STATUS_RUNNING,TASK_TYPE_STORE_COUNT,new Date()); - sysTaskDOMapper.insert(sysTaskDO); - customerDataJob.handle(false,sysTaskDO); - } - }catch (Exception e){ - log.error("",e); - } - } - -// @Scheduled(cron = "0 0 2 * * ?") - public void syncAllCount(){ - try { - int random = new Random().nextInt(100); - Thread.sleep(random*100); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:00:00"); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("type",TASK_TYPE_ALL_COUNT).eq("create_time",sdf.format(new Date())).last("limit 1"); - SysTaskDO sysTaskDO = sysTaskDOMapper.selectOne(qw); - if (sysTaskDO == null){ - sysTaskDO = new SysTaskDO(TASK_NAME_ALL_COUNT,TASK_STATUS_RUNNING,TASK_TYPE_ALL_COUNT,new Date()); - sysTaskDOMapper.insert(sysTaskDO); - customerDataJob.handle(true,sysTaskDO); - } - }catch (Exception e){ - log.error("",e); - } - } -} +//package com.kiisoo.ic.job.count; +// +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.kiisoo.ic.system.entity.SysTaskDO; +//import com.kiisoo.ic.system.mapper.SysTaskDOMapper; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.scheduling.annotation.Scheduled; +//import org.springframework.stereotype.Component; +// +//import java.text.SimpleDateFormat; +//import java.util.Date; +//import java.util.Random; +// +//import static com.kiisoo.ic.system.constant.SysTaskConstant.*; +// +//@Component +//@Slf4j +//public class SyncCountJobService { +// @Autowired +// private CustomerCountJob customerDataJob; +// +// @Autowired +// private SysTaskDOMapper sysTaskDOMapper; +// +//// @Scheduled(cron = "0 0/15 9/1 * * ??") +// public void syncStoreCount(){ +// try { +// int random = new Random().nextInt(100); +// Thread.sleep(random*100); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:00"); +// QueryWrapper qw = new QueryWrapper<>(); +// qw.eq("type",TASK_TYPE_STORE_COUNT).eq("create_time",sdf.format(new Date())).last("limit 1"); +// SysTaskDO sysTaskDO = sysTaskDOMapper.selectOne(qw); +// if (sysTaskDO == null){ +// sysTaskDO = new SysTaskDO(TASK_NAME_STORE_COUNT,TASK_STATUS_RUNNING,TASK_TYPE_STORE_COUNT,new Date()); +// sysTaskDOMapper.insert(sysTaskDO); +// customerDataJob.handle(false,sysTaskDO); +// } +// }catch (Exception e){ +// log.error("",e); +// } +// } +// +//// @Scheduled(cron = "0 0 2 * * ?") +// public void syncAllCount(){ +// try { +// int random = new Random().nextInt(100); +// Thread.sleep(random*100); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:00:00"); +// QueryWrapper qw = new QueryWrapper<>(); +// qw.eq("type",TASK_TYPE_ALL_COUNT).eq("create_time",sdf.format(new Date())).last("limit 1"); +// SysTaskDO sysTaskDO = sysTaskDOMapper.selectOne(qw); +// if (sysTaskDO == null){ +// sysTaskDO = new SysTaskDO(TASK_NAME_ALL_COUNT,TASK_STATUS_RUNNING,TASK_TYPE_ALL_COUNT,new Date()); +// sysTaskDOMapper.insert(sysTaskDO); +// customerDataJob.handle(true,sysTaskDO); +// } +// }catch (Exception e){ +// log.error("",e); +// } +// } +//}