整体调整

mallplus-portal/src/main/java/com/zscat/mallplus/controller/AppVersionController.java

@@ -100,9 +100,9 @@ public class AppVersionController {
         return null;
     }
 
-    @RequestMapping(value = "/versioninfo")
+    @RequestMapping(value = "/versioninfo1")
     @ResponseBody
-    public Object appVersion(HttpServletRequest request) {
+    public Object appVersion1(HttpServletRequest request) {
         Map<String, Object> map = new HashMap<String, Object>();
         int versionCode = 1;// 版本编码
         String defUrl = "";
@@ -217,4 +217,37 @@ public class AppVersionController {
         return new CommonResult().success(appVersionNew);
     }
 
+    @RequestMapping(value = "/versioninfo")
+    @ResponseBody
+    public Object appVersion(HttpServletRequest request) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        int versionCode = 101;// 版本编码
+        String versionName = "101";// 版本号
+        String downloadUrl = "";// apk下载地址
+        String versionInfo = "";// 版本的更新描述
+        String fileName = "";// apk名称
+        int isAlpha = 0;//是否内测，0否，1是
+
+        AppVersion appVersion = new AppVersion();
+        appVersion.setVersionCode(versionCode);//版本编码
+        appVersion.setVersionName(versionName);//版本号
+        appVersion.setDownloadUrl(downloadUrl); //apk下载地址新
+        appVersion.setVersionInfo(versionInfo);//版本的更新的描述
+        appVersion.setFileName(fileName);//应用名称
+        appVersion.setForceUpdate(false);
+
+        // 查询版本记录未删除及为正式版的版本记录
+        AppVersion av = appVersionService.getAll();
+        if (null != av) {// 如果有正式版的版本记录
+            appVersion.setVersionCode(av.getVersionCode());//版本编码
+            appVersion.setVersionName(av.getVersionName());//版本号
+            appVersion.setDownloadUrl(av.getDownloadUrl()); //apk下载地址新
+            appVersion.setVersionInfo(av.getVersionInfo());//版本的更新的描述
+            appVersion.setFileName(av.getFileName());//应用名称
+        }
+
+        String appVersionNew = JsonUtils.objectToJson(appVersion);
+
+        return new CommonResult().success(appVersionNew);
+    }
 }

mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java

@@ -340,6 +340,7 @@ public class SingePmsController extends ApiBaseAction {
             @RequestParam(value = "schoolId", required = false) Long schoolId,
             @RequestParam(value = "productAttributeCategoryId", required = false) Long productAttributeCategoryId,
             @RequestParam(value = "productCategoryId", required = false) Long productCategoryId,
+            @RequestParam(value = "newStatus", required = false) Integer newStatus,
             @RequestParam(value = "recommandStatus", required = false) Integer recommandStatus,
             @RequestParam(value = "brandId", required = false) Long brandId,
             @RequestParam(value = "sort", required = false) Integer sort,
@@ -366,6 +367,9 @@ public class SingePmsController extends ApiBaseAction {
         if (ValidatorUtils.notEmpty(recommandStatus) && recommandStatus > 0) {
             product.setRecommandStatus(1);
         }
+        if (ValidatorUtils.notEmpty(newStatus) && newStatus > 0) {
+            product.setNewStatus(1);
+        }
         if (ValidatorUtils.notEmpty(brandId) && brandId > 0) {
             product.setBrandId(brandId);
         }

mallplus-portal/src/main/resources/application-prod.properties

@@ -32,12 +32,12 @@ spring.datasource.druid.stat-view-servlet.login-username=druid
 spring.datasource.druid.stat-view-servlet.login-password=druid
 
 # \u7CFB\u7EDF\u914D\u7F6E
-mallplus.domain=http://51wangshi.com:8082
+mallplus.domain=http://mall.yyundong.com/
 mallplus.defaultIcon=https://mall.yyundong.com/avatar.png
-mallplus.name=mallplus-b2b2c
+mallplus.name=????
 mallplus.version=1.1.0
-mallplus.company=mallplus technology
-mallplus.subdomain=mallplus.com
+mallplus.company=????
+mallplus.subdomain=mall.yyundong.com
 mallplus.code=123456
 mallplus.defaultPassword=123456
 

mallplus-portal/src/main/resources/application-test.properties

@@ -24,12 +24,12 @@ spring.datasource.druid.stat-view-servlet.reset-enable=true
 spring.datasource.druid.stat-view-servlet.login-username=druid
 spring.datasource.druid.stat-view-servlet.login-password=druid
 
-mallplus.domain=http://51wangshi.com:8082
+mallplus.domain=http://mall.yyundong.com/
 mallplus.defaultIcon=https://mall.yyundong.com/avatar.png
-mallplus.name=mallplus-b2b2c
+mallplus.name=????
 mallplus.version=1.1.0
-mallplus.company=mallplus technology
-mallplus.subdomain=mallplus.com
+mallplus.company=????
+mallplus.subdomain=mall.yyundong.com
 mallplus.code=123456
 mallplus.defaultPassword=123456