商家管理

@@ -253,7 +253,10 @@ public class MerchantServiceImpl {
     	for(SellerWalletDetail detail : beanList) {
 			MerchantOrderAttachInfo info = exchange(detail);
 			info.setOrderCode(detail.getOrderCode());
-			info.setMerchantName((String)storedSellerMap.get(detail.getUid()).get("cert_name"));
+			Map<String,Object> storedSellerDataMap = storedSellerMap.get(detail.getUid());
+			if(null != storedSellerDataMap){
+				info.setMerchantName((String)storedSellerDataMap.get("cert_name"));
+			}
     		boList.add(info);
     	}
     	PageResponseBO<MerchantOrderAttachInfo> result=new PageResponseBO<>();