Просмотр исходного кода

rent wiwide

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
fe26e29c80
3 измененных файлов: 32 добавлений и 13 удалений
  1. +11
    -9
      mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java
  2. +17
    -4
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  3. +4
    -0
      mallinkService/src/main/java/com/iformall/utils/Constant.java

+ 11
- 9
mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java Просмотреть файл

@@ -5,6 +5,7 @@ import com.iformall.domain.po.WxWiWideInfo;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxWiwideInfoMapper; import com.iformall.mapper.WxWiwideInfoMapper;
import com.iformall.sms.wiwide.WiwideUtil; import com.iformall.sms.wiwide.WiwideUtil;
import com.iformall.utils.Constant;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -29,17 +30,18 @@ public class WiwideTokenSchedule {
List<WxWiWideInfo> list = wxWiwideInfoMapper.findList(null); List<WxWiWideInfo> list = wxWiwideInfoMapper.findList(null);
for (int i = 0, size = list.size(); i < size; i++) { for (int i = 0, size = list.size(); i < size; i++) {
WxWiWideInfo wxWiWideInfo = list.get(i); WxWiWideInfo wxWiWideInfo = list.get(i);
logger.info("WiwideTokenSchedule>>>>wiwideinfo:"+JSONObject.toJSONString(wxWiWideInfo));
String data = WiwideUtil.queryToken(wxWiWideInfo);
logger.info("WiwideTokenSchedule>>>>bid:"+wxWiWideInfo.getWiwideId()+",newdata:"+data);
String token = (String) JSONObject.parseObject(data).get("data");
if(token==null){
logger.error("WiwideTokenSchedule>>>商场:"+wxWiWideInfo.getTenantId()+",token为空");
continue;
if(Constant.wiwideOldPlat.equals(wxWiWideInfo.getOldPlat())){
logger.info("WiwideTokenSchedule>>>>wiwideinfo:"+JSONObject.toJSONString(wxWiWideInfo));
String data = WiwideUtil.queryToken(wxWiWideInfo);
logger.info("WiwideTokenSchedule>>>>bid:"+wxWiWideInfo.getWiwideId()+",newdata:"+data);
String token = (String) JSONObject.parseObject(data).get("data");
if(token==null){
logger.error("WiwideTokenSchedule>>>商场:"+wxWiWideInfo.getTenantId()+",token为空");
continue;
}
updateToken(wxWiWideInfo, token);
} }
updateToken(wxWiWideInfo, token);
} }

} }


private void updateToken(WxWiWideInfo wxWiWideInfo, String token) { private void updateToken(WxWiWideInfo wxWiWideInfo, String token) {


+ 17
- 4
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java Просмотреть файл

@@ -18,6 +18,7 @@ import com.iformall.service.WxCouponOrderService;
import com.iformall.sms.wiwide.WiwideEntry; import com.iformall.sms.wiwide.WiwideEntry;
import com.iformall.sms.wiwide.WiwideSercret; import com.iformall.sms.wiwide.WiwideSercret;
import com.iformall.sms.wiwide.WiwideUtil; import com.iformall.sms.wiwide.WiwideUtil;
import com.iformall.utils.Constant;
import com.iformall.utils.DateUtils; import com.iformall.utils.DateUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -768,6 +769,11 @@ public class DataTowerServiceImpl implements DataTowerService {


} }


/**
* 客流
* @param tenantEntity
* @return
*/
@Override @Override
public Map<String, Object> queryCustomer(TenantEntity tenantEntity) { public Map<String, Object> queryCustomer(TenantEntity tenantEntity) {
WxWiWideInfo wiWideInfo = new WxWiWideInfo(); WxWiWideInfo wiWideInfo = new WxWiWideInfo();
@@ -777,12 +783,12 @@ public class DataTowerServiceImpl implements DataTowerService {
if(list.size()>0){ if(list.size()>0){
wiWideInfo = list.get(0); wiWideInfo = list.get(0);
String wiwideUrl = wiWideInfo.getWiwideUrl(); String wiwideUrl = wiWideInfo.getWiwideUrl();
if(wiWideInfo.getOldPlat().equals(0)){
if(Constant.wiwideOldPlat.equals(wiWideInfo.getOldPlat())){
datamap.put("token", getWiwideToken(wiWideInfo)); datamap.put("token", getWiwideToken(wiWideInfo));
datamap.put("url", wiwideUrl); datamap.put("url", wiwideUrl);
datamap.put("capability", wiWideInfo.getCapability()); datamap.put("capability", wiWideInfo.getCapability());
datamap.put("oldPlat", wiWideInfo.getOldPlat()); datamap.put("oldPlat", wiWideInfo.getOldPlat());
}else if(wiWideInfo.getOldPlat().equals(1)){
}else if(Constant.wiwideNewPlat.equals(wiWideInfo.getOldPlat())){
// datamap.put("token", getWiwideSercret(wiWideInfo)); // datamap.put("token", getWiwideSercret(wiWideInfo));
getWiwideSercret(wiWideInfo); getWiwideSercret(wiWideInfo);
datamap.put("sign", WiwideEntry.encrypt(wiWideInfo)); datamap.put("sign", WiwideEntry.encrypt(wiWideInfo));
@@ -803,12 +809,12 @@ public class DataTowerServiceImpl implements DataTowerService {
if(list.size()>0){ if(list.size()>0){
wiWideInfo = list.get(0); wiWideInfo = list.get(0);
String wiwideUrl = wiWideInfo.getWiwideUrl(); String wiwideUrl = wiWideInfo.getWiwideUrl();
if(wiWideInfo.getOldPlat().equals(0)){
if(Constant.wiwideOldPlat.equals(wiWideInfo.getOldPlat())){
datamap.put("token", getWiwideToken(wiWideInfo)); datamap.put("token", getWiwideToken(wiWideInfo));
datamap.put("url", wiwideUrl); datamap.put("url", wiwideUrl);
datamap.put("capability", wiWideInfo.getCapability()); datamap.put("capability", wiWideInfo.getCapability());
datamap.put("oldPlat", wiWideInfo.getOldPlat()); datamap.put("oldPlat", wiWideInfo.getOldPlat());
}else if(wiWideInfo.getOldPlat().equals(1)){
}else if(Constant.wiwideNewPlat.equals(wiWideInfo.getOldPlat())){
// datamap.put("token", getWiwideSercret(wiWideInfo)); // datamap.put("token", getWiwideSercret(wiWideInfo));
getWiwideSercret(wiWideInfo); getWiwideSercret(wiWideInfo);
datamap.put("sign", WiwideEntry.encrypt(wiWideInfo)); datamap.put("sign", WiwideEntry.encrypt(wiWideInfo));
@@ -916,6 +922,13 @@ public class DataTowerServiceImpl implements DataTowerService {
} }
} }


/**
* wiwide 新平台
* @param tenantEntity
* @param url
* @param params
* @return
*/
@Override @Override
public ResultData queryWiWideDataUrl(TenantEntity tenantEntity, String url, Map<String, Object> params) { public ResultData queryWiWideDataUrl(TenantEntity tenantEntity, String url, Map<String, Object> params) {
WxWiWideInfo wiWideInfo = new WxWiWideInfo(); WxWiWideInfo wiWideInfo = new WxWiWideInfo();


+ 4
- 0
mallinkService/src/main/java/com/iformall/utils/Constant.java Просмотреть файл

@@ -84,4 +84,8 @@ public class Constant {


public static final String mallBuildingPrev = "mallBuilding:"; public static final String mallBuildingPrev = "mallBuilding:";


//wiwide系统常量
public static final Integer wiwideOldPlat = 0;//老平台
public static final Integer wiwideNewPlat = 1;//新平台

} }

Загрузка…
Отмена
Сохранить