Authored by chenchao

fix nullpoint

... ... @@ -122,11 +122,9 @@ public class SellerService {
public SellerBo getSellerWithAuth(Integer uid){
logger.info("getSellerWithAuth uid {}", uid);
SellerWrapper sellerWrapper = getBaseSellerWrapper(uid).attachAssetPolicy();
SellerLevelFuncBo slfb = sellerFuncService.getSellerLevelFunc(sellerWrapper);
SellerWrapper sellerWrapper = getBaseSellerWrapper(uid).attachAssetPolicy()
.attachSellerLevelFunc((sw)->sellerFuncService.getSellerLevelFunc(sw));
SellerBo sellerBo = sellerWrapper.buildSellerBo();
sellerBo.setSellerLevelFunc(slfb);
return sellerBo;
}
... ...
... ... @@ -18,6 +18,7 @@ import org.slf4j.Logger;
import java.math.BigDecimal;
import java.util.Objects;
import java.util.function.Function;
import java.util.function.Supplier;
/**
* Created by chao.chen on 2019/1/15.
... ... @@ -179,6 +180,12 @@ public class SellerWrapper {
return this;
}
public SellerWrapper attachSellerLevelFunc(Function<SellerWrapper,SellerLevelFuncBo> slfFunc){
SellerLevelFuncBo slfb = slfFunc.apply(this);
sellerBo.setSellerLevelFunc(slfb);
return this;
}
public SellerBo buildSellerBo(){
return sellerBo;
... ...
package com.yohoufo.order.service.seller;
import com.yohobuy.ufo.model.order.bo.SellerBo;
import com.yohobuy.ufo.model.order.bo.SellerLevelFuncBo;
import com.yohobuy.ufo.model.order.common.SellerFuncEnum;
import com.yohobuy.ufo.model.order.req.BatchImportPrdReq;
import com.yohobuy.ufo.model.request.product.ProductImportTranItemBo;
... ... @@ -9,6 +10,7 @@ import com.yohoufo.order.event.BatchPublishTailEvent;
import com.yohoufo.order.model.SellerOrderContext;
import com.yohoufo.order.model.dto.ImPrdNode;
import com.yohoufo.order.service.handler.SellerOrderSubmitHandler;
import com.yohoufo.order.service.impl.SellerFuncService;
import com.yohoufo.order.service.impl.SellerService;
import com.yohoufo.order.service.impl.SellerWrapper;
import com.yohoufo.order.service.impl.SkupBatchService;
... ... @@ -48,6 +50,9 @@ public class ImportPublishExcutor implements PublishExcutor<BatchImportPrdReq, S
@Autowired
private SellerAuthCheckService sellerAuthCheckService;
@Autowired
private SellerFuncService sellerFuncService;
private boolean checkSellerEntryType(SellerBo sellerBo){
return sellerBo.isNormalSuper() || sellerBo.isLargeSettlementSuper();
}
... ... @@ -64,6 +69,7 @@ public class ImportPublishExcutor implements PublishExcutor<BatchImportPrdReq, S
logger.warn("in ImportPublishExcutor.publish not legal super, uid {} ", uid);
return null;
}
sellerWrapper = sellerWrapper.attachSellerLevelFunc((sw)->sellerFuncService.getSellerLevelFunc(sw));
sellerAuthCheckService.checkAuth(sellerBo, SellerFuncEnum.BATCH_PUBLISH);
//TODO check left in wallet
for(ProductImportTranItemBo importPrd : importPrds){
... ...