Merge branch 'test6.8.9' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.9

@@ -250,7 +250,7 @@ public class SellerEnterApplyService {
 
         //持久化的入驻信息
         StoredSeller pss = sellerWrapper.getStoredSeller();
-        boolean noStoredSeller = Objects.isNull(pss);
+		boolean noStoredSeller = Objects.isNull(pss) || pss.getValidStatus().equals(StoredSellerStatusEnum.quit.getId());
         SellerBo sellerBo = sellerWrapper.build();
         //当前身份
         EntrySellerType currentEST = sellerBo.getEntrySellerType();

@@ -216,7 +216,13 @@ public class StoreSellerServiceImpl implements IStoredSellerService {
         storedSeller.setLevelFuncId(sellerLevelFuncBo.getId());
         storedSeller.setLevelFuncList(sellerLevelFuncBo.getFuncList());
         logger.info("StoredSellerServiceImpl addUserAsStoredSeller insert uid is {} , storedSeller {} ",uid,storedSeller);
-        int num = storedSellerMapper.insert(storedSeller);
+        StoredSeller exist = storedSellerMapper.selectByUid(uid);
+        int num;
+        if(exist==null) {
+        	num = storedSellerMapper.insert(storedSeller);
+        } else {
+        	num = storedSellerMapper.updateByUidSelective(storedSeller);
+        }
         if(num<0){
             logger.error("StoredSellerServiceImpl addUserAsStoredSeller error  uid is {} , storedSeller {} ,insert num {} ",uid,storedSeller,num);
             throw new ServiceException(400,"新增入驻商户信息错误");