diff --git a/docs/databases/tables_create.sql b/docs/databases/tables_create.sql new file mode 100644 index 0000000..ab4bf23 --- /dev/null +++ b/docs/databases/tables_create.sql @@ -0,0 +1,22 @@ + +CREATE TABLE `app_version` ( + `id` bigint(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号', + `appName` varchar(100) NOT NULL DEFAULT '汇融云链' COMMENT '应用名称', + `versionCode` int(11) NOT NULL DEFAULT '101' COMMENT '版本编码', + `versionName` varchar(100) NOT NULL DEFAULT '101' COMMENT '版本号', + `downloadUrl` varchar(1024) DEFAULT NULL COMMENT '下载地址', + `versionInfo` varchar(1024) DEFAULT NULL COMMENT '版本描述', + `isAlpha` int(11) NOT NULL DEFAULT '0' COMMENT '是否内测：0否，1是', + `fileName` varchar(1024) DEFAULT NULL COMMENT '文件名', + `forceUpdate` int(11) NOT NULL DEFAULT '1' COMMENT '是否强制升级', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +insert into app_version(versionCode,versionName,downloadUrl,versionInfo) +values (101,'101','http://mall.yyundong.com/apks/mall-101.apk','初始版本') + +insert into app_version(versionCode,versionName,downloadUrl,versionInfo,fileName) +values (1002,'1.0.0.2','http://mall.yyundong.com/apks/mall-1002.apk','BUG修复，功能完善','mall-1002.apk') + +insert into app_version(versionCode,versionName,downloadUrl,versionInfo,fileName) +values (1003,'1.0.0.3','http://mall.yyundong.com/apks/mall-1003.apk','登录方式切换的Bug修复；登录及退出后本地缓存数据问题的修复。','mall-1003.apk') \ No newline at end of file diff --git a/docs/xiugai/3.1汇惠云链管理测试.zip b/docs/xiugai/3.1汇惠云链管理测试.zip new file mode 100644 index 0000000..665cd1c Binary files /dev/null and b/docs/xiugai/3.1汇惠云链管理测试.zip differ diff --git a/docs/xiugai/汇惠云链管理测试问题.zip b/docs/xiugai/汇惠云链管理测试问题.zip new file mode 100644 index 0000000..6805ea5 Binary files /dev/null and b/docs/xiugai/汇惠云链管理测试问题.zip differ diff --git a/docs/xiugai/汇融云链APP问题-20230228.docx b/docs/xiugai/汇融云链APP问题-20230228.docx new file mode 100644 index 0000000..92d0b6f --- /dev/null +++ b/docs/xiugai/汇融云链APP问题-20230228.docx @@ -0,0 +1,16 @@ + 这个汇融乡村振兴卡号的验证规则是什么 +已回复：验证规则是：以"62350109317"开头，并且长度为19位的字符串 + + 已经登录了，但点购买或加入购物车还要求登录；退出了以后再登陆用户信息还在，但是购买需要重新登陆；这里有一个缓存的问题，我们开发人员正在处理。 +已经修改 + + 切换使用账号密码登录和短信登录，切换点击的有问题；比如在短信登录那四个字上点击一下，就变成可以输入密码了，然后登陆提示参数错误 +已经修改 + + 取消订单了，右上角还是显示待付款 +订单问题涉及的状态较多，需要花时间将订单流程和状态统一处理。 + + 待付款的订单多久自动取消？ +已回复：订单超时时间是12分钟，但是每10分钟扫描一次订单状态，所以订单超时时间应该在12-22分钟之间。 + + 续 diff --git a/docs/手册/huichuan.apk b/docs/手册/huichuan.apk new file mode 100644 index 0000000..4fb5f14 Binary files /dev/null and b/docs/手册/huichuan.apk differ diff --git a/docs/手册/logo01.png b/docs/手册/logo01.png new file mode 100644 index 0000000..330b4a0 Binary files /dev/null and b/docs/手册/logo01.png differ diff --git a/docs/手册/xiqu.apk b/docs/手册/xiqu.apk new file mode 100644 index 0000000..1e47883 Binary files /dev/null and b/docs/手册/xiqu.apk differ diff --git a/docs/手册/交付清单.png b/docs/手册/交付清单.png new file mode 100644 index 0000000..0a9f9c9 Binary files /dev/null and b/docs/手册/交付清单.png differ diff --git a/docs/手册/惠传01.jpg b/docs/手册/惠传01.jpg new file mode 100644 index 0000000..f72fcff Binary files /dev/null and b/docs/手册/惠传01.jpg differ diff --git a/docs/手册/惠传02.jpg b/docs/手册/惠传02.jpg new file mode 100644 index 0000000..cf69564 Binary files /dev/null and b/docs/手册/惠传02.jpg differ diff --git a/docs/手册/惠传03.jpg b/docs/手册/惠传03.jpg new file mode 100644 index 0000000..81d6474 Binary files /dev/null and b/docs/手册/惠传03.jpg differ diff --git a/docs/手册/惠传04.jpg b/docs/手册/惠传04.jpg new file mode 100644 index 0000000..becfe3b Binary files /dev/null and b/docs/手册/惠传04.jpg differ diff --git a/docs/手册/戏曲01.jpg b/docs/手册/戏曲01.jpg new file mode 100644 index 0000000..a2ec12a Binary files /dev/null and b/docs/手册/戏曲01.jpg differ diff --git a/docs/手册/戏曲02.jpg b/docs/手册/戏曲02.jpg new file mode 100644 index 0000000..9f66e21 Binary files /dev/null and b/docs/手册/戏曲02.jpg differ diff --git a/docs/手册/戏曲03.jpg b/docs/手册/戏曲03.jpg new file mode 100644 index 0000000..8d73cf0 Binary files /dev/null and b/docs/手册/戏曲03.jpg differ diff --git a/docs/手册/戏曲04.jpg b/docs/手册/戏曲04.jpg new file mode 100644 index 0000000..dd9a157 Binary files /dev/null and b/docs/手册/戏曲04.jpg differ diff --git a/docs/手册/汇融云链介绍与操作.pptx b/docs/手册/汇融云链介绍与操作.pptx new file mode 100644 index 0000000..3f82dcc Binary files /dev/null and b/docs/手册/汇融云链介绍与操作.pptx differ diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/cms/controller/CmsSubjectController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/cms/controller/CmsSubjectController.java index d43b2ec..2636f8b 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/cms/controller/CmsSubjectController.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/cms/controller/CmsSubjectController.java @@ -42,7 +42,13 @@ public class CmsSubjectController { @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize ) { try { - return new CommonResult().success(ICmsSubjectService.page(new Page(pageNum, pageSize), new QueryWrapper<>(entity).select(ConstansValue.sampleSubjectList))); + String title = entity.getTitle(); + if (ValidatorUtils.notEmpty(title)) { + entity.setTitle(null); + return new CommonResult().success(ICmsSubjectService.page(new Page(pageNum, pageSize), new QueryWrapper<>(entity).like("title", title).select(ConstansValue.sampleSubjectList))); + }else { + return new CommonResult().success(ICmsSubjectService.page(new Page(pageNum, pageSize), new QueryWrapper<>(entity).select(ConstansValue.sampleSubjectList))); + } } catch (Exception e) { log.error("根据条件查询所有专题表列表：%s", e.getMessage(), e); } diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/controller/AppVersionController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/controller/AppVersionController.java index 03cfcfb..d3072db 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/controller/AppVersionController.java +++ b/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 map = new HashMap(); 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 map = new HashMap(); + 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); + } } diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java index 6e529be..62e01b2 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java +++ b/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); } diff --git a/mallplus-portal/src/main/resources/application-prod.properties b/mallplus-portal/src/main/resources/application-prod.properties index b40c59f..04b3bb4 100644 --- a/mallplus-portal/src/main/resources/application-prod.properties +++ b/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 diff --git a/mallplus-portal/src/main/resources/application-test.properties b/mallplus-portal/src/main/resources/application-test.properties index e45db97..e067d49 100644 --- a/mallplus-portal/src/main/resources/application-test.properties +++ b/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 diff --git a/mallplusui-uniapp-app/pages/index/index.vue b/mallplusui-uniapp-app/pages/index/index.vue index 7223c41..f16c6ea 100644 --- a/mallplusui-uniapp-app/pages/index/index.vue +++ b/mallplusui-uniapp-app/pages/index/index.vue @@ -20,11 +20,11 @@ - + 农业物资 - + 生活物资 @@ -177,7 +177,7 @@ + @click="navToTabPage('../../pagesA/product/list?newStatus=1')"> 新品推荐 @@ -203,7 +203,7 @@ + @click="navToTabPage('../../pagesA/product/list?recommandStatus=1')"> 人气推荐 @@ -229,7 +229,7 @@ - + 商品列表 diff --git a/mallplusui-uniapp-app/pagesA/product/list.vue b/mallplusui-uniapp-app/pagesA/product/list.vue index ee847e7..2127bc1 100644 --- a/mallplusui-uniapp-app/pagesA/product/list.vue +++ b/mallplusui-uniapp-app/pagesA/product/list.vue @@ -90,6 +90,8 @@ export default { isFenxiao: 0, isVip: 0, cid: null, + newStatus:null, + recommandStatus:null, priceOrder: 0, //1 价格从低到高 2价格从高到低 cateList: [], goodsList: [], @@ -107,7 +109,8 @@ export default { this.cateId = options.sid; this.isVip = options.isVip; this.isFenxiao = options.isFenxiao; - console.log(options); + this.newStatus= options.newStatus; + this.recommandStatus= options.recommandStatus; this.productAttributeCategoryId = options.productAttributeCategoryId; this.loadCateList(options.fid, options.sid); this.loadData(); @@ -167,8 +170,8 @@ export default { } if (this.productAttributeCategoryId) { - params.productAttributeCategoryId = this.productAttributeCategoryId; - } + params.productAttributeCategoryId = this.productAttributeCategoryId; + } if (this.keyword) { params.keyword = this.keyword; } @@ -178,6 +181,12 @@ export default { if (this.isFenxiao) { params.isFenxiao = 1; } + if (this.newStatus) { + params.newStatus = this.newStatus; + } + if (this.recommandStatus) { + params.recommandStatus = this.recommandStatus; + } console.log("params>>>>",params) diff --git a/mallplusui-web-admin/src/router/index.js b/mallplusui-web-admin/src/router/index.js index 4d964fb..a8ad041 100644 --- a/mallplusui-web-admin/src/router/index.js +++ b/mallplusui-web-admin/src/router/index.js @@ -1677,7 +1677,8 @@ hidden: true component: Layout, redirect: '/cms/help', name: 'cms', - meta: {title: '内容管理', icon: 'home'}, + // meta: {title: '内容管理', icon: 'home'}, + meta: {title: '农机服务', icon: 'home'}, children: [ { path: 'cmsZhaoPin', @@ -1723,12 +1724,13 @@ hidden: true path: 'subject', name: 'subject', component: () => import('@/views/cms/subject/index'), - meta: {title: '专题列表', icon: 'product-list'} + // meta: {title: '专题列表', icon: 'product-list'} + meta: {title: '农机资讯', icon: 'product-list'} }, { path: 'addSubject', name: 'addSubject', component: () => import('@/views/cms/subject/add'), - meta: {title: '添加专题'}, + meta: {title: '添加资讯'}, hidden: true }, { diff --git a/mallplusui-web-admin/src/views/cms/subject/components/SubjectDetail.vue b/mallplusui-web-admin/src/views/cms/subject/components/SubjectDetail.vue index abf3030..3a523b3 100644 --- a/mallplusui-web-admin/src/views/cms/subject/components/SubjectDetail.vue +++ b/mallplusui-web-admin/src/views/cms/subject/components/SubjectDetail.vue @@ -2,7 +2,7 @@ - + - + - + - - + + - + @@ -73,7 +72,9 @@ import Tinymce from '@/components/Tinymce' import MultiUpload from '@/components/Upload/multiUpload' const defaultSubject={ - name: '' + title: '', + category_id:38, + category_name:'农机租赁' }; export default { name: 'SubjectDetail', @@ -90,7 +91,7 @@ categoryName:'', albumPics:null, cateOptions:null, - activeHtmlName: 'pc', + activeHtmlName: 'mobile', rules: { name: [ {required: true, message: '请输入品牌名称', trigger: 'blur'}, diff --git a/mallplusui-web-admin/src/views/cms/subject/index.vue b/mallplusui-web-admin/src/views/cms/subject/index.vue index 5972c97..9e200cf 100644 --- a/mallplusui-web-admin/src/views/cms/subject/index.vue +++ b/mallplusui-web-admin/src/views/cms/subject/index.vue @@ -15,7 +15,7 @@
- +
@@ -42,19 +42,19 @@ - + - + - + @@ -150,6 +146,7 @@ operateType: null, listQuery: { keyword: null, + title: null, pageNum: 1, pageSize: 10 }, diff --git a/mallplusui-web-admin/src/views/login/index.vue b/mallplusui-web-admin/src/views/login/index.vue index a94c442..ad1f0ca 100644 --- a/mallplusui-web-admin/src/views/login/index.vue +++ b/mallplusui-web-admin/src/views/login/index.vue @@ -3,7 +3,7 @@