diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java index b8cb2cba3..c3b27ee71 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java @@ -5,6 +5,7 @@ import com.iformall.domain.po.WxWeappCodeStatus; import com.iformall.domain.vo.WxWeappCodeStatusVo; import java.util.List; +import java.util.Map; public interface WxWeappCodeStatusMapper extends CommonMapper { @@ -12,7 +13,7 @@ public interface WxWeappCodeStatusMapper extends CommonMapper findVoList(WxWeappCodeStatusVo weappCodeStatusVo); - List findUserVersions(); + List findUserVersions(); diff --git a/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java b/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java index d357df646..75a9a4f5a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java @@ -5,6 +5,7 @@ import com.iformall.domain.po.WxWeappCodeStatus; import com.iformall.domain.vo.WxWeappCodeStatusVo; import java.util.List; +import java.util.Map; public interface WxWeappCodeStatusService { @@ -31,7 +32,7 @@ public interface WxWeappCodeStatusService { * * @return */ - List getVersionList(); + List getVersionList(); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java index 69bb95154..9772a0d55 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; +import java.util.Map; @Service public class WxWeappCodeStatusServiceImpl implements WxWeappCodeStatusService { @@ -36,7 +37,7 @@ public class WxWeappCodeStatusServiceImpl implements WxWeappCodeStatusService { } @Override - public List getVersionList() { + public List getVersionList() { return wxWeappCodeStatusMapper.findUserVersions(); } diff --git a/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml b/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml index 0a824e280..6e63935b6 100644 --- a/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml @@ -147,8 +147,8 @@ - + select user_version as version from wx_weapp_code_status group by user_version diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 23df8e78f..c9b5f12a9 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -515,7 +515,7 @@ public class WxWeappInfoController extends BaseController { @GetMapping("versionList") public ResultData getVersionList() { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::versionList"); - final List list = weappCodeStatusService.getVersionList(); + final List list = weappCodeStatusService.getVersionList(); return new ResultData(list); }