From 877fe3d3aa9820567202d33ba3b3c831a67384f1 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Thu, 25 May 2023 15:55:27 +0800
Subject: [PATCH 1/3] =?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/order/impl/StoreOrderServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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<StoreOrderMapper, StoreOr
         });
 
         List<PhoneRecordDO> infoDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery()
-                .eq(PhoneRecordDO::getPhone, user.getMobile())
+                .eq(PhoneRecordDO::getPhone, request.getUserPhone())
                 .eq(PhoneRecordDO::getDeleted, 0)
                 .in(PhoneRecordDO::getRechargeGearId, collect));
 

From 60392dd6e257ff40eb8c9daf0c91a104c843eee0 Mon Sep 17 00:00:00 2001
From: TianYu <332368756@qq.com>
Date: Thu, 25 May 2023 16:11:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=AE=A2=E6=9C=8D=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-app/pages/user/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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')">
                 <u-icon slot="icon" size="45" name="/static/images/user_icon2.png"></u-icon>
               </u-cell>
-              <u-cell title="热线电话" value="023-12948338" :value="tenantInfo.serviceMobile" isLink>
+              <u-cell title="热线电话" value="023-12948338" :value="tenantInfo.serviceMobile" isLink @click="callPhone">
                 <u-icon slot="icon" size="45" name="/static/images/user_icon3.png"></u-icon>
               </u-cell>
               <u-cell title="在线客服" value="8:30-17:30" :value="tenantInfo.serviceTime" isLink @click="kefuClick">
@@ -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

From 8873be7def574a9b7a3edbe9f12f38dd994f67cd 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 16:49:27 +0800
Subject: [PATCH 3/3] =?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

---
 .../express/impl/ShippingTemplatesServiceImpl.java        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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<ShippingTemplatesM
         shippingTemplatesDO.setSort(request.getSort());
         shippingTemplatesDO.setType(request.getType());
         shippingTemplatesDO.setDeleted(false);
+        shippingTemplatesDO.setNoDelivery(request.getNoDelivery());
         shippingTemplatesDO.setAppoint(request.getAppoint());
 
         save(shippingTemplatesDO);
@@ -110,7 +111,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
         }
 
         ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO = request.getShippingTemplatesNoDeliveryRespVOS();
-        if(!ObjectUtil.isNull(shippingTemplatesNoDeliveryRespVO)){
+        if(!ObjectUtil.isNull(shippingTemplatesNoDeliveryRespVO) && request.getNoDelivery()){
             shippingTemplatesNoDeliveryService.saveAll(shippingTemplatesNoDeliveryRespVO, shippingTemplatesDO.getId());
         }
 
@@ -140,7 +141,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
     }
 
     /**
-     * 新增
+     * 修改
      * @param id Integer 模板id
      * @param request ShippingTemplatesRequest 新增参数
      */
@@ -152,6 +153,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
         shippingTemplatesDO.setSort(request.getSort());
         shippingTemplatesDO.setType(request.getType());
         shippingTemplatesDO.setAppoint(request.getAppoint());
+        shippingTemplatesDO.setNoDelivery(request.getNoDelivery());
 
 
         updateById(shippingTemplatesDO);
@@ -166,7 +168,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
 
         List<ShippingTemplatesFreeRespVO> 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)){