Merge branch 'feature-commodity-0901-v1' of ssh://10.10.101.21/source/platform-b2c into feature-commodity-0901-v1

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -1103,7 +1103,7 @@ public class GoodsServiceImpl implements GoodsService {
 			nowGoods.setStoreName(sysConf.getEnName());
 		}else if(Integer.valueOf(oldGoods.getSelfSale()).equals(IntegerConstant.SELF_SALE)){
 			StoreIn storeIn = storeInService.findByEnUU(nowGoods.getEnUU());
-			if(storeIn.getStatus() == StoreStatus.OPENED) {
+			if(storeIn != null && storeIn.getStatus() == StoreStatus.OPENED) {
 				nowGoods.setStoreid(storeIn.getUuid());
 				nowGoods.setStoreName(storeIn.getStoreName());
 			}else {