Explorar el Código

[客流数据][修改][数据表存在数据才返回]

release_toaliyun_real
gongbiao hace 7 años
padre
commit
0658209558
Se han modificado 2 ficheros con 8 adiciones y 10 borrados
  1. +6
    -8
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java

+ 6
- 8
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java Ver fichero

@@ -616,18 +616,16 @@ public class DataTowerServiceImpl implements DataTowerService {


@Override @Override
public Map<String, Object> queryCustomer(String tenantId) { public Map<String, Object> queryCustomer(String tenantId) {


WxWiWideInfo wiWideInfo = new WxWiWideInfo(); WxWiWideInfo wiWideInfo = new WxWiWideInfo();
wiWideInfo.setTenantId(tenantId); wiWideInfo.setTenantId(tenantId);
List<WxWiWideInfo> list = wxWiwideInfoMapper.findList(wiWideInfo); List<WxWiWideInfo> list = wxWiwideInfoMapper.findList(wiWideInfo);
wiWideInfo = list.get(0);
String wiwideUrl = wiWideInfo.getWiwideUrl();
Map<String, Object> datamap = new HashMap<>(2); Map<String, Object> datamap = new HashMap<>(2);

datamap.put("token", getWiwideToken(wiWideInfo));
datamap.put("url", wiwideUrl);

if(list.size()>0){
wiWideInfo = list.get(0);
String wiwideUrl = wiWideInfo.getWiwideUrl();
datamap.put("token", getWiwideToken(wiWideInfo));
datamap.put("url", wiwideUrl);
}
return datamap; return datamap;
} }




+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java Ver fichero

@@ -95,7 +95,7 @@ public class PushLimitServiceImpl implements PushLimitService {
// 2. check time // 2. check time
boolean isInDate = DateUtils.isInDate(curDate, pushLimit.getTimeStart(), pushLimit.getTimeEnd()); boolean isInDate = DateUtils.isInDate(curDate, pushLimit.getTimeStart(), pushLimit.getTimeEnd());
if (!isInDate) { if (!isInDate) {
logger.error("短信已达到每天上限");
logger.error("不在疲劳度允许的时间段");
throw new MallinkException(ErrorCode.PUSH_LIMIT_NOT_INRANG); throw new MallinkException(ErrorCode.PUSH_LIMIT_NOT_INRANG);
} }
return isInDate; return isInDate;
@@ -109,7 +109,7 @@ public class PushLimitServiceImpl implements PushLimitService {
// 2. check time // 2. check time
boolean isInDate = DateUtils.isInDate(curDate, pushLimit.getTimeStart(), pushLimit.getTimeEnd()); boolean isInDate = DateUtils.isInDate(curDate, pushLimit.getTimeStart(), pushLimit.getTimeEnd());
if (!isInDate) { if (!isInDate) {
logger.error("短信已达到每天上限");
logger.error("不在疲劳度允许的时间段");
throw new MallinkException(ErrorCode.PUSH_LIMIT_NOT_INRANG); throw new MallinkException(ErrorCode.PUSH_LIMIT_NOT_INRANG);
} }
// TODO 3. check phone had up to limit // TODO 3. check phone had up to limit


Cargando…
Cancelar
Guardar