Authored by mali

Merge branch 'dev_seller_soft_delete' into test6.8.9

@@ -156,10 +156,17 @@ public class StoreSellerServiceImpl implements IStoredSellerService { @@ -156,10 +156,17 @@ public class StoreSellerServiceImpl implements IStoredSellerService {
156 156
157 @Override 157 @Override
158 public int removeStoredSeller(Integer uid) { 158 public int removeStoredSeller(Integer uid) {
159 - storedSellerMapper.insertBak(storedSellerMapper.selectByUid(uid)); 159 + StoredSeller storedSeller = storedSellerMapper.selectByUid(uid);
160 160
161 - int rows = storedSellerMapper.clearUserData(uid); 161 + int rows = storedSellerMapper.clearUserData(uid);
162 storedSellerCacheService.removeStoredSeller(uid); 162 storedSellerCacheService.removeStoredSeller(uid);
  163 +
  164 + try {
  165 + storedSellerMapper.insertBak(storedSeller);
  166 + } catch (Exception e) {
  167 + logger.error("storedSellerMapper.insertBak find error storedSeller : " + storedSeller, e);
  168 + }
  169 +
163 return rows; 170 return rows;
164 } 171 }
165 172
@@ -300,9 +300,13 @@ public class RealNameAuthorizeServiceImpl implements IRealNameAuthorizeService { @@ -300,9 +300,13 @@ public class RealNameAuthorizeServiceImpl implements IRealNameAuthorizeService {
300 logger.info("RealNameAuthorizeServiceImpl clearCacheZhiMaCertInfo uid is {} ", uid); 300 logger.info("RealNameAuthorizeServiceImpl clearCacheZhiMaCertInfo uid is {} ", uid);
301 int result = 0; 301 int result = 0;
302 if (uid!=null && uid > 0 ){ 302 if (uid!=null && uid > 0 ){
303 -  
304 List<ZhiMaCert> zhiMaCerts = zhiMaCertDao.selectByUid(uid); 303 List<ZhiMaCert> zhiMaCerts = zhiMaCertDao.selectByUid(uid);
305 - zhiMaCerts.stream().forEach(item -> zhiMaCertDao.insertbak(item)); 304 + try {
  305 + zhiMaCerts.stream().forEach(item -> zhiMaCertDao.insertbak(item));
  306 + } catch (Exception e) {
  307 + logger.info("zhiMaCertDao.insertbak find error zhiMaCerts is : " + zhiMaCerts, e);
  308 + }
  309 +
306 310
307 result = zhiMaCertDao.deleteByUid(uid); 311 result = zhiMaCertDao.deleteByUid(uid);
308 logger.info("RealNameAuthorizeServiceImpl clearCacheZhiMaCertInfo delete uid{} ,delete result is {}", uid, result); 312 logger.info("RealNameAuthorizeServiceImpl clearCacheZhiMaCertInfo delete uid{} ,delete result is {}", uid, result);