diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java index 5c60bfe65..2a0984795 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java @@ -96,6 +96,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl shippingTemplatesFreeRespVOList = request.getShippingTemplatesFreeRespVOList(); if(CollUtil.isNotEmpty(shippingTemplatesFreeRespVOList) && request.getAppoint()){ - shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRespVOList, request.getType(), shippingTemplatesDO.getId()); + shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRespVOList, request.getType(), id); } ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO= request.getShippingTemplatesNoDeliveryRespVOS(); if(ObjectUtil.isNotNull(shippingTemplatesNoDeliveryRespVO)){ diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java index 4e186ad42..cbbb3d003 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java @@ -1464,7 +1464,7 @@ public class StoreOrderServiceImpl extends ServiceImpl infoDOS = phoneRecordMapper.selectList(Wrappers.lambdaQuery() - .eq(PhoneRecordDO::getPhone, user.getMobile()) + .eq(PhoneRecordDO::getPhone, request.getUserPhone()) .eq(PhoneRecordDO::getDeleted, 0) .in(PhoneRecordDO::getRechargeGearId, collect)); diff --git a/yudao-ui-app/pages/user/index.vue b/yudao-ui-app/pages/user/index.vue index 8ed53f4f3..3ef682395 100644 --- a/yudao-ui-app/pages/user/index.vue +++ b/yudao-ui-app/pages/user/index.vue @@ -95,7 +95,7 @@ @click="jumpPage('/pages/users/user_spread_code/index')"> - + @@ -254,6 +254,11 @@ url: url }) }, + callPhone() { + if(this.tenantInfo.serviceMobile){ + window.location.href = `tel:${this.tenantInfo.serviceMobile}` + } + }, kefuClick() { if (this.tenantInfo.wxKfUrl) { location.href = this.tenantInfo.wxKfUrl