diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
index 90db9136..e90563fd 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
@@ -220,7 +220,7 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
         //获取当前操作的店铺
         Store store = getStoreByMember();
         //如果没有申请过店铺，新增店铺
-        if (!Optional.ofNullable(store).isPresent()) {
+        if (store != null) {
             AuthUser authUser = Objects.requireNonNull(UserContext.getCurrentUser());
             Member member = memberService.getById(authUser.getId());
             store = new Store(member);
@@ -231,12 +231,20 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
             BeanUtil.copyProperties(storeCompanyDTO, storeDetail);
             return storeDetailService.save(storeDetail);
         } else {
+            store = new Store();
             BeanUtil.copyProperties(storeCompanyDTO, store);
             this.updateById(store);
             //判断是否存在店铺详情，如果没有则进行新建，如果存在则进行修改
             StoreDetail storeDetail = storeDetailService.getStoreDetail(store.getId());
-            BeanUtil.copyProperties(storeCompanyDTO, storeDetail);
-            return storeDetailService.updateById(storeDetail);
+            //如果店铺详情为空，则new ，否则复制对象，然后保存即可。
+            if (storeDetail == null) {
+                storeDetail = new StoreDetail();
+                BeanUtil.copyProperties(storeCompanyDTO, storeDetail);
+                return storeDetailService.save(storeDetail);
+            } else {
+                BeanUtil.copyProperties(storeCompanyDTO, storeDetail);
+                return storeDetailService.updateById(storeDetail);
+            }
         }
     }