ufo / ufo-platform · Commits

Go to a project

Authored by csgyoho
Commit 0f26fe756bf1c79906c482706d7984c1ab0fb02e 1 parent 2aded2f6

商家管理

Inline Side-by-side
Showing 1 changed file with 4 additions and 1 deletions
@@ -253,7 +253,10 @@ public class MerchantServiceImpl { @@ -253,7 +253,10 @@ public class MerchantServiceImpl {
253 for(SellerWalletDetail detail : beanList) { 253 for(SellerWalletDetail detail : beanList) {
254 MerchantOrderAttachInfo info = exchange(detail); 254 MerchantOrderAttachInfo info = exchange(detail);
255 info.setOrderCode(detail.getOrderCode()); 255 info.setOrderCode(detail.getOrderCode());
256 - info.setMerchantName((String)storedSellerMap.get(detail.getUid()).get("cert_name")); 256 + Map<String,Object> storedSellerDataMap = storedSellerMap.get(detail.getUid());
  257 + if(null != storedSellerDataMap){
  258 + info.setMerchantName((String)storedSellerDataMap.get("cert_name"));
  259 + }
257 boList.add(info); 260 boList.add(info);
258 } 261 }
259 PageResponseBO<MerchantOrderAttachInfo> result=new PageResponseBO<>(); 262 PageResponseBO<MerchantOrderAttachInfo> result=new PageResponseBO<>();