From 65a76c4efdc938cf29bdd9338cfe83b9af26d968 Mon Sep 17 00:00:00 2001 From: tangqian Date: Thu, 25 May 2023 18:05:56 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E5=85=85=E5=80=BC=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/shop/service/recharge/PhoneRecordServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java index 2fef75a26..e10907369 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java @@ -82,11 +82,14 @@ public class PhoneRecordServiceImpl implements PhoneRecordService { @Override public Boolean deletePhoneGearByOrderId(Long orderId) { + log.info("-------------------------orderId{}",orderId); List recordDOS = phoneRecordMapper.selectList(Wrappers.lambdaQuery().eq(PhoneRecordDO::getRechargeOrderId, orderId)); + log.info("-------------------------recordDOS{},{}",recordDOS,recordDOS.size()); if (!CollectionUtils.isEmpty(recordDOS)) { recordDOS.forEach(e->{ e.setDeleted(Boolean.TRUE); - phoneRecordMapper.updateById(e); + int i = phoneRecordMapper.updateById(e); + log.info("-------------------------i{}---------------------",i); }); } return null; From dc4c7504a79c0667042c5983331246598ad9e13c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B0=8F=E5=BC=A0?= <1085577365@qq.com> Date: Thu, 25 May 2023 18:08:07 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=90=8E=E5=8F=B0--=E8=BF=90=E8=B4=B9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=9A=E9=85=8D=E9=80=81=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/express/ShippingTemplatesFreeMapper.xml | 2 +- .../mapper/express/ShippingTemplatesNoDeliveryMapper.xml | 2 +- .../resources/mapper/express/ShippingTemplatesRegionMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml index b82a15ce5..e6be679e1 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml @@ -14,7 +14,7 @@ FROM eb_shipping_templates_free where - temp_id = #{tempId, jdbcType=INTEGER} + temp_id = #{tempId, jdbcType=INTEGER} AND `status` = true GROUP BY `uniqid` ORDER BY id ASC diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml index 6b042f88e..f44c5a622 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml @@ -14,7 +14,7 @@ FROM eb_shipping_templates_no_delivery where - temp_id = #{tempId, jdbcType=INTEGER} + temp_id = #{tempId, jdbcType=INTEGER} AND `status` = true GROUP BY `uniqid` ORDER BY id ASC diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml index 1aefe98c4..ff7e60eb3 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml @@ -14,7 +14,7 @@ FROM eb_shipping_templates_region where - temp_id = #{tempId, jdbcType=INTEGER} + temp_id = #{tempId, jdbcType=INTEGER} AND `status` = true GROUP BY `uniqid` ORDER BY id ASC From 64fcfc72adc2e34c481070a3d76bc9e8f8a7b352 Mon Sep 17 00:00:00 2001 From: js199000126 <528892601@qq.com> Date: Thu, 25 May 2023 18:12:05 +0800 Subject: [PATCH 3/6] navbar --- yudao-ui-app/config/app.js | 4 +- yudao-ui-app/pages.json | 5 + yudao-ui-app/pages/index/index.vue | 638 +++++++++++++++------------- yudao-ui-app/pages/notice/index.vue | 50 +++ 4 files changed, 400 insertions(+), 297 deletions(-) create mode 100644 yudao-ui-app/pages/notice/index.vue diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js index 605d8d33c..f50b0d09a 100644 --- a/yudao-ui-app/config/app.js +++ b/yudao-ui-app/config/app.js @@ -1,7 +1,7 @@ -let domain = process.env.APP_BASE_URL +// let domain = process.env.APP_BASE_URL // let domain = 'http://192.168.1.188:48080' -// let domain = 'http://api.cyywl.top' +let domain = 'http://api.cyywl.top' module.exports = { // 请求域名 格式： https://您的域名 diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json index 1c1429f56..0a328886d 100644 --- a/yudao-ui-app/pages.json +++ b/yudao-ui-app/pages.json @@ -15,6 +15,11 @@ "style": { "navigationBarTitleText": "会员" } + },{ + "path": "pages/notice/index", + "style": { + "navigationBarTitleText": "公告详情" + } }, { "path": "pages/member_detail/index", diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue index 824f6ece6..219a9a2d3 100644 --- a/yudao-ui-app/pages/index/index.vue +++ b/yudao-ui-app/pages/index/index.vue @@ -4,14 +4,24 @@ - + + {{tenant.name}} - 简介:{{tenant.introduction}} - 电话:{{tenant.serviceMobile}} - 服务时间:{{tenant.serviceTime}} + + 简介:{{tenant.introduction}} + + + 电话:{{tenant.serviceMobile}} + + + 服务时间:{{tenant.serviceTime}} + @@ -29,7 +39,7 @@ - + @@ -45,11 +55,7 @@ - + 搜索 @@ -73,16 +79,18 @@ - - - {{item.storeName}} - - - - - + + + {{item.storeName}} + + + + + + + @@ -204,7 +212,7 @@ bastInfo: '', fastInfo: '', fastList: [], - text:'尊敬的业主：接环卫所通知，近期将对小区进行大扫除，请大家做好准备', + text: '尊敬的业主：接环卫所通知，近期将对小区进行大扫除，请大家做好准备', firstInfo: '', salesInfo: '', indicatorDots: false, @@ -319,13 +327,13 @@ // ]); getUserInfo().then(res => { this.userInfo = res.data - getTenant(153).then(res=>{ + getTenant(153).then(res => { this.tenant = res.data this.text = res.data.notice }) }) - getHeader().then(res=>{ - console.log(res,'会员') + getHeader().then(res => { + console.log(res, '会员') }) this.getBanners() this.getIndexPage() @@ -341,8 +349,12 @@ }) }, methods: { - change(){ - console.log(this.value,'value') + // 跳转公告详情 + goNoticeDetail() { + console.log('notice哇') + uni.navigateTo({ + url: '/pages/notice/index' + }) }, // 搜索 searchSubmitValue: function() { @@ -356,32 +368,32 @@ }); }, // 加入购物车 - addCart(id){ + addCart(id) { getSpuDetail(id).then(res => { - console.log(res.data.productValue.默认.id,'1111111111111') + console.log(res.data.productValue.默认.id, '1111111111111') let unique = res.data.productValue.默认.id postCartAdd({ productId: id, productAttrUnique: unique, cartNum: 1 - }).then(res=> { + }).then(res => { console.log('加入成功') }) }) }, - go(){ - console.log(this.productList,'------') + go() { + console.log(this.productList, '------') }, // 获取banner和userInfo - getBanners(){ + getBanners() { // console.log(this.$store.tenantId,'tenantId') - getBanner().then(res=>{ + getBanner().then(res => { this.bannerList = res.data.list[0] - console.log(this.bannerList,'banner') + console.log(this.bannerList, 'banner') }) - console.log(this.userInfo.userId,'userInfo111111') + console.log(this.userInfo.userId, 'userInfo111111') }, getCoupon: function(id, index) { @@ -497,12 +509,12 @@ }) }, // 首页商品 - getIndexPage(){ + getIndexPage() { let that = this - productPage().then(res=>{ - console.log(res.data.list,'商品列表') + productPage().then(res => { + console.log(res.data.list, '商品列表') this.productList = this.productList.concat(res.data.list) - console.log(this.productList,'---------') + console.log(this.productList, '---------') }) }, getcouponList() { @@ -650,9 +662,9 @@ // 获取H5 搜索框高度 let appSearchH = uni.createSelectorQuery().select(".serch-wrapper"); appSearchH.boundingClientRect(function(data) { - if(data){ - self.searchH = data.height - } + if (data) { + self.searchH = data.height + } }).exec() // #endif }, @@ -698,302 +710,338 @@ } diff --git a/yudao-ui-app/pages/notice/index.vue b/yudao-ui-app/pages/notice/index.vue new file mode 100644 index 000000000..782f84bae --- /dev/null +++ b/yudao-ui-app/pages/notice/index.vue @@ -0,0 +1,50 @@ + + + + + From 5f5944b15f551883c0d258167962ff0147a05217 Mon Sep 17 00:00:00 2001 From: js199000126 <528892601@qq.com> Date: Thu, 25 May 2023 18:12:27 +0800 Subject: [PATCH 4/6] navbar --- yudao-ui-app/config/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js index f50b0d09a..605d8d33c 100644 --- a/yudao-ui-app/config/app.js +++ b/yudao-ui-app/config/app.js @@ -1,7 +1,7 @@ -// let domain = process.env.APP_BASE_URL +let domain = process.env.APP_BASE_URL // let domain = 'http://192.168.1.188:48080' -let domain = 'http://api.cyywl.top' +// let domain = 'http://api.cyywl.top' module.exports = { // 请求域名 格式： https://您的域名 From 03e595c92b4227f8ac748431a1e21789f2a9a6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B0=8F=E5=BC=A0?= <1085577365@qq.com> Date: Thu, 25 May 2023 18:17:16 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=90=8E=E5=8F=B0--=E8=BF=90=E8=B4=B9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=9A=E9=85=8D=E9=80=81=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/express/ShippingTemplatesFreeMapper.xml | 2 +- .../mapper/express/ShippingTemplatesNoDeliveryMapper.xml | 2 +- .../resources/mapper/express/ShippingTemplatesRegionMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml index e6be679e1..b82a15ce5 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml @@ -14,7 +14,7 @@ FROM eb_shipping_templates_free where - temp_id = #{tempId, jdbcType=INTEGER} AND `status` = true + temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid` ORDER BY id ASC diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml index f44c5a622..6b042f88e 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml @@ -14,7 +14,7 @@ FROM eb_shipping_templates_no_delivery where - temp_id = #{tempId, jdbcType=INTEGER} AND `status` = true + temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid` ORDER BY id ASC diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml index ff7e60eb3..1aefe98c4 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml @@ -14,7 +14,7 @@ FROM eb_shipping_templates_region where - temp_id = #{tempId, jdbcType=INTEGER} AND `status` = true + temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid` ORDER BY id ASC From 872ce8baf0ea0864f110c3eb8a2d32839096f4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B0=8F=E5=BC=A0?= <1085577365@qq.com> Date: Thu, 25 May 2023 18:21:08 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=90=8E=E5=8F=B0--=E8=BF=90=E8=B4=B9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=9A=E9=85=8D=E9=80=81=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/express/ShippingTemplatesFreeMapper.xml | 2 +- .../resources/mapper/express/ShippingTemplatesRegionMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml index b82a15ce5..818c5057c 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml @@ -14,7 +14,7 @@ FROM eb_shipping_templates_free where - temp_id = #{tempId, jdbcType=INTEGER} + temp_id = #{tempId, jdbcType=INTEGER} AND `status` = 1 GROUP BY `uniqid` ORDER BY id ASC diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml index 1aefe98c4..c984f8d77 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml @@ -14,7 +14,7 @@ FROM eb_shipping_templates_region where - temp_id = #{tempId, jdbcType=INTEGER} + temp_id = #{tempId, jdbcType=INTEGER} AND `status` = 1 GROUP BY `uniqid` ORDER BY id ASC