商品详情为空时候，引起的空指针

src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java

@@ -114,12 +114,17 @@ public class GoodsServiceImpl implements GoodsService {
                         continue;
                     }
                     // add goodsSource,循环插入 商品资源
-                    //for (int x = 0; x < gdArr.size(); x++) {
+//                    for (int x = 0; x < gdArr.size(); x++) {
                     // 从里面取出数据
                         JSONObject gditem = gdJson.getJSONObject("data");
-                        GoodsSource goodsSource = ApiGoodsUtils.jsonToGoodsSource(gditem, goodsId);
-                        goodsSourceMapper.add(goodsSource);
-                    //}
+                    // 商品详情json非空时候
+                        if(gditem!=null){
+                            GoodsSource goodsSource = ApiGoodsUtils.jsonToGoodsSource(gditem, goodsId);
+                            goodsSourceMapper.add(goodsSource);
+                        }else{
+                            continue;
+                        }
+//                    }
                     // insertGoodsDetail
                     GoodsDetail goodsDetail = ApiGoodsUtils.jsonToGoodsDetail(nsdjson, sdjson);
                     // 返回商品详情
@@ -148,7 +153,7 @@ public class GoodsServiceImpl implements GoodsService {
                     //起止时间转为timestamp
                     goods.setContractualStartTime(Timestamp.valueOf(ncstart));
                     goods.setContractualtimeEndTime(Timestamp.valueOf(ncend));
-                    goods.setGoodsDetailId(gdid);
+                    goods.setGoodsDetailId(goodsDetail.getId());
                     goods.setContractStatus(nsdjson.getInteger("contractStatus"));
                     goods.setGoodsStatus(istatus);
                     goods.setOldStatus(0); // 默认为0