diff --git a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java index b6738057a..b870e057a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java @@ -1,7 +1,6 @@ package com.simple.service.impl; import com.alibaba.fastjson.JSONObject; -import com.google.gson.JsonObject; import com.simple.domain.po.WxMall; import com.simple.domain.po.WxMerchant; import com.simple.domain.po.WxMerchantTradeDaily; @@ -13,12 +12,10 @@ import com.simple.utils.DateUtils; import com.simple.utils.HashUtil; import com.simple.utils.HttpUtil; import org.apache.log4j.Logger; -import org.apache.poi.ss.usermodel.DateUtil; import org.apache.shiro.codec.Base64; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -269,11 +266,13 @@ public class DataTowerServiceImpl implements DataTowerService { Map params=new HashMap<>(); params.put("username",username); params.put("authVal",authVal); - String token = HttpUtil.doPost(wxMall.getWiwideUrl(), params); + String wiwideUrl = wxMall.getWiwideUrl(); + String token = HttpUtil.doPost(wiwideUrl+"/login/auth", params); Map datamap = new HashMap<>(); datamap.put("token",JSONObject.parseObject(token).get("data")); + datamap.put("url",wiwideUrl); return datamap; } diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index 251779e4e..dde72fb97 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -36,7 +36,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId}