|
|
@@ -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(); |
|
|
|