Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

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);
+
 }

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;
+    }
 }

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());
+            }
         }
     }
 

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);
+    }
 }