From 20c6a6107b83b0171a98426336c8a74b520a0f1c Mon Sep 17 00:00:00 2001
From: SUCH HAVE YOU <2207141659@qq.com>
Date: Sun, 3 Nov 2024 19:25:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AEid=E6=9F=A5=E8=AF=A2=E5=BF=AB=E9=80=92=E8=BF=90?=
 =?UTF-8?q?=E8=B4=B9=E6=A8=A1=E7=89=88=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ShopDeliveryTemplateController.java        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/controller/ShopDeliveryTemplateController.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/controller/ShopDeliveryTemplateController.java
index 1033f584..d7266db4 100644
--- a/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/controller/ShopDeliveryTemplateController.java
+++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/controller/ShopDeliveryTemplateController.java
@@ -84,4 +84,12 @@ public class ShopDeliveryTemplateController {
     public void queryShopDeliveryTemplate(InputObject inputObject, OutputObject outputObject) {
         shopDeliveryTemplateService.queryList(inputObject, outputObject);
     }
+
+    @ApiOperation(id = "selectShopDeliveryTemplateById", value = "根据id查询快递运费模版信息", method = "POST", allUse = "2")
+    @ApiImplicitParams({
+            @ApiImplicitParam(id = "id", name = "id", value = "主键id", required = "required")})
+    @RequestMapping("/post/ShopDeliveryTemplateController/selectShopDeliveryTemplateById")
+    public void selectShopDeliveryTemplateById(InputObject inputObject, OutputObject outputObject) {
+        shopDeliveryTemplateService.selectById(inputObject, outputObject);
+    }
 }

From f7104af9c637afecf14bd421e2934694d683e3d6 Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Sun, 3 Nov 2024 19:30:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BC=9A=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/skyeye/level/service/ShopMemberLevelService.java | 2 ++
 .../level/service/impl/ShopMemberLevelServiceImpl.java   | 9 +++++++++
 .../java/com/skyeye/service/impl/MemberServiceImpl.java  | 6 ++++++
 3 files changed, 17 insertions(+)

diff --git a/skyeye-shop/shop-member/src/main/java/com/skyeye/level/service/ShopMemberLevelService.java b/skyeye-shop/shop-member/src/main/java/com/skyeye/level/service/ShopMemberLevelService.java
index 3b65acdf..30b2f78b 100644
--- a/skyeye-shop/shop-member/src/main/java/com/skyeye/level/service/ShopMemberLevelService.java
+++ b/skyeye-shop/shop-member/src/main/java/com/skyeye/level/service/ShopMemberLevelService.java
@@ -19,4 +19,6 @@ public interface ShopMemberLevelService extends SkyeyeBusinessService<ShopMember
 
     ShopMemberLevel getMinLevel();
 
+    ShopMemberLevel getSimpleLevelByLevel(Integer level);
+
 }
diff --git a/skyeye-shop/shop-member/src/main/java/com/skyeye/level/service/impl/ShopMemberLevelServiceImpl.java b/skyeye-shop/shop-member/src/main/java/com/skyeye/level/service/impl/ShopMemberLevelServiceImpl.java
index 9c54a337..e1294774 100644
--- a/skyeye-shop/shop-member/src/main/java/com/skyeye/level/service/impl/ShopMemberLevelServiceImpl.java
+++ b/skyeye-shop/shop-member/src/main/java/com/skyeye/level/service/impl/ShopMemberLevelServiceImpl.java
@@ -50,4 +50,13 @@ public class ShopMemberLevelServiceImpl extends SkyeyeBusinessServiceImpl<ShopMe
         List<ShopMemberLevel> beans = queryAllEnabledMemberLevel();
         return beans.stream().findFirst().orElse(null);
     }
+
+    @Override
+    public ShopMemberLevel getSimpleLevelByLevel(Integer level) {
+        QueryWrapper<ShopMemberLevel> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(MybatisPlusUtil.toColumns(ShopMemberLevel::getEnabled), EnableEnum.ENABLE_USING.getKey());
+        queryWrapper.eq(MybatisPlusUtil.toColumns(ShopMemberLevel::getLevel), level);
+        ShopMemberLevel bean = getOne(queryWrapper, false);
+        return bean;
+    }
 }
diff --git a/skyeye-shop/shop-member/src/main/java/com/skyeye/service/impl/MemberServiceImpl.java b/skyeye-shop/shop-member/src/main/java/com/skyeye/service/impl/MemberServiceImpl.java
index 82b992ff..eea96d73 100644
--- a/skyeye-shop/shop-member/src/main/java/com/skyeye/service/impl/MemberServiceImpl.java
+++ b/skyeye-shop/shop-member/src/main/java/com/skyeye/service/impl/MemberServiceImpl.java
@@ -82,6 +82,12 @@ public class MemberServiceImpl extends SkyeyeBusinessServiceImpl<MemberDao, Memb
         entity.setPwdNumEnc(oldMember.getPwdNumEnc());
         if (StrUtil.isEmpty(entity.getLevelId())) {
             setLevel(entity);
+        } else {
+            ShopMemberLevel shopMemberLevel = shopMemberLevelService.selectById(entity.getLevelId());
+            if (StrUtil.isEmpty(shopMemberLevel.getId())) {
+                shopMemberLevel = shopMemberLevelService.getSimpleLevelByLevel(CommonNumConstants.NUM_ONE);
+                entity.setLevelId(shopMemberLevel.getId());
+            }
         }
     }