diff --git a/mallplus-admin/src/main/resources/application.properties b/mallplus-admin/src/main/resources/application.properties index bef9847..0288546 100644 --- a/mallplus-admin/src/main/resources/application.properties +++ b/mallplus-admin/src/main/resources/application.properties @@ -1,6 +1,6 @@ #\u9ED8\u8BA4\u4E3A\u5F00\u53D1\u73AF\u5883 -spring.profiles.active=dev -#spring.profiles.active=test +#spring.profiles.active=dev +spring.profiles.active=test server.port=8085 spring.jackson.time-zone=GMT+8 diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/IBuildWuyeCompanyService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/IBuildWuyeCompanyService.java index 2ca750f..47fffa8 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/IBuildWuyeCompanyService.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/IBuildWuyeCompanyService.java @@ -3,6 +3,9 @@ package com.zscat.mallplus.build.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zscat.mallplus.build.entity.BuildWuyeCompany; +import java.util.List; +import java.util.Map; + /** *

* 服务类 @@ -14,4 +17,6 @@ import com.zscat.mallplus.build.entity.BuildWuyeCompany; public interface IBuildWuyeCompanyService extends IService { boolean saveCompany(BuildWuyeCompany entity); + + Map> nameMapWithCommunity(); } diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java index 871ce96..b773c72 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java @@ -53,4 +53,6 @@ public interface IBuildingCommunityService extends IService { double latitude, double longitude, Integer pageSize); + + List listOfCompany(Long id); } diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyeCompanyServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyeCompanyServiceImpl.java index c3783e3..5854cda 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyeCompanyServiceImpl.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyeCompanyServiceImpl.java @@ -1,9 +1,12 @@ package com.zscat.mallplus.build.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zscat.mallplus.build.entity.BuildWuyeCompany; +import com.zscat.mallplus.build.entity.BuildingCommunity; import com.zscat.mallplus.build.mapper.BuildWuyeCompanyMapper; import com.zscat.mallplus.build.service.IBuildWuyeCompanyService; +import com.zscat.mallplus.build.service.IBuildingCommunityService; import com.zscat.mallplus.exception.ApiMallPlusException; import com.zscat.mallplus.sys.entity.SysUser; import com.zscat.mallplus.sys.entity.SysUserRole; @@ -14,7 +17,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Date; +import java.util.*; /** *

@@ -36,6 +39,9 @@ public class BuildWuyeCompanyServiceImpl extends ServiceImpl> nameMapWithCommunity() { + Map> map = new HashMap<>(); + List comList = this.list(new QueryWrapper<>()); + comList.forEach(company -> { + List list = communityService.listOfCompany(company.getId()); + List cList = new ArrayList<>(); + list.forEach(community -> { + cList.add(community.getName()); + }); + map.put(company.getName(), cList); + }); + return map; + } } diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/impl/BuildingCommunityServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/impl/BuildingCommunityServiceImpl.java index 4195556..fe0b631 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/impl/BuildingCommunityServiceImpl.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/build/service/impl/BuildingCommunityServiceImpl.java @@ -169,8 +169,8 @@ public class BuildingCommunityServiceImpl extends ServiceImpl().eq("community_id", community.getId())); buildNotices = noticeMapper.selectList(new QueryWrapper().eq("community_id", community.getId())); - if (Double.valueOf(community.getLatitude())>0){ - List communityList = this.selectNearCommunity(40,Double.valueOf(community.getLatitude()),Double.valueOf(community.getLongitude()),10); + if (Double.valueOf(community.getLatitude()) > 0) { + List communityList = this.selectNearCommunity(40, Double.valueOf(community.getLatitude()), Double.valueOf(community.getLongitude()), 10); result.setCommunityList(communityList); } result.setCommunity(community); @@ -182,7 +182,14 @@ public class BuildingCommunityServiceImpl extends ServiceImpl selectNearCommunity(Integer distance, double latitude, double longitude, Integer pageSize) { - return communityMapper.selectNearCommunity(distance,latitude,longitude,pageSize); + return communityMapper.selectNearCommunity(distance, latitude, longitude, pageSize); + } + + @Override + public List listOfCompany(Long companyId) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("company_id", companyId); + return baseMapper.selectList(qw); } public List getActivityList() { diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeBuildController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeBuildController.java index f2d24d9..f51f631 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeBuildController.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeBuildController.java @@ -32,6 +32,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; /** * @Auther: shenzhuan @@ -78,6 +79,15 @@ public class SingeBuildController extends ApiBaseAction { return new CommonResult().success(communityService.allCommunity()); } + @SysLog(MODULE = "pms", REMARK = "物业及其社区") + @IgnoreAuth + @GetMapping(value = "/wuyeCompanyWithCommunity") + @ApiOperation(value = "物业及其社区") + public Object wuyeCompanyWithCommunity() { + Map> map = IBuildWuyeCompanyService.nameMapWithCommunity(); + return new CommonResult().success(map); + } + @SysLog(MODULE = "pms", REMARK = "绑定小区和房间") @IgnoreAuth @PostMapping(value = "/bindCommunity") @@ -188,6 +198,7 @@ public class SingeBuildController extends ApiBaseAction { } return new CommonResult().failed(); } + /** * @param entity * @param pageNum @@ -206,6 +217,7 @@ public class SingeBuildController extends ApiBaseAction { } return new CommonResult().failed(); } + @SysLog(MODULE = "pms", REMARK = "查询团购商品列表") @IgnoreAuth @ApiOperation(value = "查询带团购商品列表") diff --git a/mallplus-portal/src/main/resources/application.properties b/mallplus-portal/src/main/resources/application.properties index 524aea2..7c28e74 100644 --- a/mallplus-portal/src/main/resources/application.properties +++ b/mallplus-portal/src/main/resources/application.properties @@ -1,7 +1,7 @@ spring.jackson.time-zone=GMT+8 #\u9ED8\u8BA4\u4E3A\u5F00\u53D1\u73AF\u5883 -#spring.profiles.active=test -spring.profiles.active=dev +spring.profiles.active=test +#spring.profiles.active=dev #===server start=== server.port=8083 #server.port=8111 diff --git a/mallplusui-uniapp-app/common/api.js b/mallplusui-uniapp-app/common/api.js index 5b430f9..c953a5f 100644 --- a/mallplusui-uniapp-app/common/api.js +++ b/mallplusui-uniapp-app/common/api.js @@ -1,9 +1,9 @@ import store from '../store/index'; export default { // qq 237524947 wx15d4269d3210863d - BASEURI: 'http://2xpk7t.natappfree.cc/api/', - // BASEURI: 'http://mall.yyundong.com/portalapi/api/', - // BASEURI: 'http://www.yyundong.com:8083/api/', + // BASEURI: 'http://2xpk7t.natappfree.cc/api/', + BASEURI: 'http://mall.yyundong.com/portalapi/api/', + // BASEURI: 'http://192.168.31.52:8083/api/', ADMINURI: 'http://mall.yyundong.com/adminapi/', ESURI: 'http://www.yyundong.com:8081/', h5Appid: 'wxb4660f37187c0b8e', // h5微信登录的appId 暂时测试用 @@ -92,6 +92,7 @@ export default { bindCommunity: 'single/build/bindCommunity', // 绑定小区和房间 home: 'single/build/home', // 首页内容页信息展示 applyCommunity: 'single/build/applyCommunity', // 社区入驻 + wuyeCompanyWithCommunity: 'single/build/wuyeCompanyWithCommunity', // 所在地及其取货点列表（物业公司及其社区列表） }, diff --git a/mallplusui-uniapp-app/pagesU/address/addressManage.vue b/mallplusui-uniapp-app/pagesU/address/addressManage.vue index a493cad..b7dcab8 100644 --- a/mallplusui-uniapp-app/pagesU/address/addressManage.vue +++ b/mallplusui-uniapp-app/pagesU/address/addressManage.vue @@ -1,40 +1,42 @@ + + + + diff --git a/mallplusui-uniapp-app/uni_modules/uni-icons/components/uni-icons/uniicons.css b/mallplusui-uniapp-app/uni_modules/uni-icons/components/uni-icons/uniicons.css new file mode 100644 index 0000000..2f56eab --- /dev/null +++ b/mallplusui-uniapp-app/uni_modules/uni-icons/components/uni-icons/uniicons.css @@ -0,0 +1,663 @@ +.uniui-color:before { + content: "\e6cf"; +} + +.uniui-wallet:before { + content: "\e6b1"; +} + +.uniui-settings-filled:before { + content: "\e6ce"; +} + +.uniui-auth-filled:before { + content: "\e6cc"; +} + +.uniui-shop-filled:before { + content: "\e6cd"; +} + +.uniui-staff-filled:before { + content: "\e6cb"; +} + +.uniui-vip-filled:before { + content: "\e6c6"; +} + +.uniui-plus-filled:before { + content: "\e6c7"; +} + +.uniui-folder-add-filled:before { + content: "\e6c8"; +} + +.uniui-color-filled:before { + content: "\e6c9"; +} + +.uniui-tune-filled:before { + content: "\e6ca"; +} + +.uniui-calendar-filled:before { + content: "\e6c0"; +} + +.uniui-notification-filled:before { + content: "\e6c1"; +} + +.uniui-wallet-filled:before { + content: "\e6c2"; +} + +.uniui-medal-filled:before { + content: "\e6c3"; +} + +.uniui-gift-filled:before { + content: "\e6c4"; +} + +.uniui-fire-filled:before { + content: "\e6c5"; +} + +.uniui-refreshempty:before { + content: "\e6bf"; +} + +.uniui-location-filled:before { + content: "\e6af"; +} + +.uniui-person-filled:before { + content: "\e69d"; +} + +.uniui-personadd-filled:before { + content: "\e698"; +} + +.uniui-back:before { + content: "\e6b9"; +} + +.uniui-forward:before { + content: "\e6ba"; +} + +.uniui-arrow-right:before { + content: "\e6bb"; +} + +.uniui-arrowthinright:before { + content: "\e6bb"; +} + +.uniui-arrow-left:before { + content: "\e6bc"; +} + +.uniui-arrowthinleft:before { + content: "\e6bc"; +} + +.uniui-arrow-up:before { + content: "\e6bd"; +} + +.uniui-arrowthinup:before { + content: "\e6bd"; +} + +.uniui-arrow-down:before { + content: "\e6be"; +} + +.uniui-arrowthindown:before { + content: "\e6be"; +} + +.uniui-bottom:before { + content: "\e6b8"; +} + +.uniui-arrowdown:before { + content: "\e6b8"; +} + +.uniui-right:before { + content: "\e6b5"; +} + +.uniui-arrowright:before { + content: "\e6b5"; +} + +.uniui-top:before { + content: "\e6b6"; +} + +.uniui-arrowup:before { + content: "\e6b6"; +} + +.uniui-left:before { + content: "\e6b7"; +} + +.uniui-arrowleft:before { + content: "\e6b7"; +} + +.uniui-eye:before { + content: "\e651"; +} + +.uniui-eye-filled:before { + content: "\e66a"; +} + +.uniui-eye-slash:before { + content: "\e6b3"; +} + +.uniui-eye-slash-filled:before { + content: "\e6b4"; +} + +.uniui-info-filled:before { + content: "\e649"; +} + +.uniui-reload:before { + content: "\e6b2"; +} + +.uniui-micoff-filled:before { + content: "\e6b0"; +} + +.uniui-map-pin-ellipse:before { + content: "\e6ac"; +} + +.uniui-map-pin:before { + content: "\e6ad"; +} + +.uniui-location:before { + content: "\e6ae"; +} + +.uniui-starhalf:before { + content: "\e683"; +} + +.uniui-star:before { + content: "\e688"; +} + +.uniui-star-filled:before { + content: "\e68f"; +} + +.uniui-calendar:before { + content: "\e6a0"; +} + +.uniui-fire:before { + content: "\e6a1"; +} + +.uniui-medal:before { + content: "\e6a2"; +} + +.uniui-font:before { + content: "\e6a3"; +} + +.uniui-gift:before { + content: "\e6a4"; +} + +.uniui-link:before { + content: "\e6a5"; +} + +.uniui-notification:before { + content: "\e6a6"; +} + +.uniui-staff:before { + content: "\e6a7"; +} + +.uniui-vip:before { + content: "\e6a8"; +} + +.uniui-folder-add:before { + content: "\e6a9"; +} + +.uniui-tune:before { + content: "\e6aa"; +} + +.uniui-auth:before { + content: "\e6ab"; +} + +.uniui-person:before { + content: "\e699"; +} + +.uniui-email-filled:before { + content: "\e69a"; +} + +.uniui-phone-filled:before { + content: "\e69b"; +} + +.uniui-phone:before { + content: "\e69c"; +} + +.uniui-email:before { + content: "\e69e"; +} + +.uniui-personadd:before { + content: "\e69f"; +} + +.uniui-chatboxes-filled:before { + content: "\e692"; +} + +.uniui-contact:before { + content: "\e693"; +} + +.uniui-chatbubble-filled:before { + content: "\e694"; +} + +.uniui-contact-filled:before { + content: "\e695"; +} + +.uniui-chatboxes:before { + content: "\e696"; +} + +.uniui-chatbubble:before { + content: "\e697"; +} + +.uniui-upload-filled:before { + content: "\e68e"; +} + +.uniui-upload:before { + content: "\e690"; +} + +.uniui-weixin:before { + content: "\e691"; +} + +.uniui-compose:before { + content: "\e67f"; +} + +.uniui-qq:before { + content: "\e680"; +} + +.uniui-download-filled:before { + content: "\e681"; +} + +.uniui-pyq:before { + content: "\e682"; +} + +.uniui-sound:before { + content: "\e684"; +} + +.uniui-trash-filled:before { + content: "\e685"; +} + +.uniui-sound-filled:before { + content: "\e686"; +} + +.uniui-trash:before { + content: "\e687"; +} + +.uniui-videocam-filled:before { + content: "\e689"; +} + +.uniui-spinner-cycle:before { + content: "\e68a"; +} + +.uniui-weibo:before { + content: "\e68b"; +} + +.uniui-videocam:before { + content: "\e68c"; +} + +.uniui-download:before { + content: "\e68d"; +} + +.uniui-help:before { + content: "\e679"; +} + +.uniui-navigate-filled:before { + content: "\e67a"; +} + +.uniui-plusempty:before { + content: "\e67b"; +} + +.uniui-smallcircle:before { + content: "\e67c"; +} + +.uniui-minus-filled:before { + content: "\e67d"; +} + +.uniui-micoff:before { + content: "\e67e"; +} + +.uniui-closeempty:before { + content: "\e66c"; +} + +.uniui-clear:before { + content: "\e66d"; +} + +.uniui-navigate:before { + content: "\e66e"; +} + +.uniui-minus:before { + content: "\e66f"; +} + +.uniui-image:before { + content: "\e670"; +} + +.uniui-mic:before { + content: "\e671"; +} + +.uniui-paperplane:before { + content: "\e672"; +} + +.uniui-close:before { + content: "\e673"; +} + +.uniui-help-filled:before { + content: "\e674"; +} + +.uniui-paperplane-filled:before { + content: "\e675"; +} + +.uniui-plus:before { + content: "\e676"; +} + +.uniui-mic-filled:before { + content: "\e677"; +} + +.uniui-image-filled:before { + content: "\e678"; +} + +.uniui-locked-filled:before { + content: "\e668"; +} + +.uniui-info:before { + content: "\e669"; +} + +.uniui-locked:before { + content: "\e66b"; +} + +.uniui-camera-filled:before { + content: "\e658"; +} + +.uniui-chat-filled:before { + content: "\e659"; +} + +.uniui-camera:before { + content: "\e65a"; +} + +.uniui-circle:before { + content: "\e65b"; +} + +.uniui-checkmarkempty:before { + content: "\e65c"; +} + +.uniui-chat:before { + content: "\e65d"; +} + +.uniui-circle-filled:before { + content: "\e65e"; +} + +.uniui-flag:before { + content: "\e65f"; +} + +.uniui-flag-filled:before { + content: "\e660"; +} + +.uniui-gear-filled:before { + content: "\e661"; +} + +.uniui-home:before { + content: "\e662"; +} + +.uniui-home-filled:before { + content: "\e663"; +} + +.uniui-gear:before { + content: "\e664"; +} + +.uniui-smallcircle-filled:before { + content: "\e665"; +} + +.uniui-map-filled:before { + content: "\e666"; +} + +.uniui-map:before { + content: "\e667"; +} + +.uniui-refresh-filled:before { + content: "\e656"; +} + +.uniui-refresh:before { + content: "\e657"; +} + +.uniui-cloud-upload:before { + content: "\e645"; +} + +.uniui-cloud-download-filled:before { + content: "\e646"; +} + +.uniui-cloud-download:before { + content: "\e647"; +} + +.uniui-cloud-upload-filled:before { + content: "\e648"; +} + +.uniui-redo:before { + content: "\e64a"; +} + +.uniui-images-filled:before { + content: "\e64b"; +} + +.uniui-undo-filled:before { + content: "\e64c"; +} + +.uniui-more:before { + content: "\e64d"; +} + +.uniui-more-filled:before { + content: "\e64e"; +} + +.uniui-undo:before { + content: "\e64f"; +} + +.uniui-images:before { + content: "\e650"; +} + +.uniui-paperclip:before { + content: "\e652"; +} + +.uniui-settings:before { + content: "\e653"; +} + +.uniui-search:before { + content: "\e654"; +} + +.uniui-redo-filled:before { + content: "\e655"; +} + +.uniui-list:before { + content: "\e644"; +} + +.uniui-mail-open-filled:before { + content: "\e63a"; +} + +.uniui-hand-down-filled:before { + content: "\e63c"; +} + +.uniui-hand-down:before { + content: "\e63d"; +} + +.uniui-hand-up-filled:before { + content: "\e63e"; +} + +.uniui-hand-up:before { + content: "\e63f"; +} + +.uniui-heart-filled:before { + content: "\e641"; +} + +.uniui-mail-open:before { + content: "\e643"; +} + +.uniui-heart:before { + content: "\e639"; +} + +.uniui-loop:before { + content: "\e633"; +} + +.uniui-pulldown:before { + content: "\e632"; +} + +.uniui-scan:before { + content: "\e62a"; +} + +.uniui-bars:before { + content: "\e627"; +} + +.uniui-cart-filled:before { + content: "\e629"; +} + +.uniui-checkbox:before { + content: "\e62b"; +} + +.uniui-checkbox-filled:before { + content: "\e62c"; +} + +.uniui-shop:before { + content: "\e62f"; +} + +.uniui-headphones:before { + content: "\e630"; +} + +.uniui-cart:before { + content: "\e631"; +} diff --git a/mallplusui-uniapp-app/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/mallplusui-uniapp-app/uni_modules/uni-icons/components/uni-icons/uniicons.ttf new file mode 100644 index 0000000..835f33b Binary files /dev/null and b/mallplusui-uniapp-app/uni_modules/uni-icons/components/uni-icons/uniicons.ttf differ diff --git a/mallplusui-uniapp-app/uni_modules/uni-icons/package.json b/mallplusui-uniapp-app/uni_modules/uni-icons/package.json new file mode 100644 index 0000000..d1c4e77 --- /dev/null +++ b/mallplusui-uniapp-app/uni_modules/uni-icons/package.json @@ -0,0 +1,86 @@ +{ + "id": "uni-icons", + "displayName": "uni-icons 图标", + "version": "1.3.5", + "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。", + "keywords": [ + "uni-ui", + "uniui", + "icon", + "图标" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "^3.2.14" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": ["uni-scss"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} \ No newline at end of file diff --git a/mallplusui-uniapp-app/uni_modules/uni-icons/readme.md b/mallplusui-uniapp-app/uni_modules/uni-icons/readme.md new file mode 100644 index 0000000..86234ba --- /dev/null +++ b/mallplusui-uniapp-app/uni_modules/uni-icons/readme.md @@ -0,0 +1,8 @@ +## Icons 图标 +> **组件名：uni-icons** +> 代码块： `uIcons` + +用于展示 icons 图标 。 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839