避免报错

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreHealthOrderScrmController.java

@@ -484,6 +484,7 @@ public class FsStoreHealthOrderScrmController extends BaseController {
             Sheet sheet = workbook.getSheetAt(0); // 第一个工作表
             int startCol = 1;
             /**销售出库明细单**/
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             for (int i = 0; i < orderItems.size(); i++) {
                 StoreOrderProductDTO cartInfo = JSONObject.parseObject(orderItems.get(i).getJsonInfo(), StoreOrderProductDTO.class);
                 setCellValue(sheet, 9, startCol + i, cartInfo.getSku());//规格（型号）
@@ -491,20 +492,19 @@ public class FsStoreHealthOrderScrmController extends BaseController {
                 setCellValue(sheet, 14, startCol + i, String.valueOf(cartInfo.getPrice()));//单价（元）
                 setCellValue(sheet, 15, startCol + i, String.valueOf(cartInfo.getPrice()));//金额（元）
                 FsStoreProductScrm fsStoreProductScrm = fsStoreProductService.selectFsStoreProductById(cartInfo.getProductId());
-                setCellValue(sheet, 10, startCol + i, fsStoreProductScrm.getManufacturer());//生产企业名称
-                setCellValue(sheet, 8, startCol + i, cartInfo.getProductName() == null ? fsStoreProductScrm.getCommonName() : cartInfo.getProductName());//商品名称
+                setCellValue(sheet, 10, startCol + i, fsStoreProductScrm != null && fsStoreProductScrm.getManufacturer()!= null ?fsStoreProductScrm.getManufacturer(): "");//生产企业名称
+                setCellValue(sheet, 8, startCol + i, cartInfo.getProductName() == null ? fsStoreProductScrm != null && fsStoreProductScrm.getCommonName()!= null ?fsStoreProductScrm.getCommonName() : cartInfo.getProductName():"");//商品名称
             }
             String payTimeStr = null;
             Date payTime = fsStoreOrderScrm.getPayTime();
             if (payTime != null) {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 payTimeStr = sdf.format(payTime);
             }
             setCellValue(sheet, 2, 1, fsStoreOrderScrm.getOrderCode());//订单编号
-            setCellValue(sheet, 3, 1, fsStoreScrm.getStoreName());//店铺名称
-            setCellValue(sheet, 4, 1, fsStoreScrm.getFullName());//企业全称
-            setCellValue(sheet, 5, 1, fsStoreScrm.getEnterpriseAddress());//经营地址 营业执照上的地址
-            setCellValue(sheet, 6, 1, fsStoreScrm.getRefundPhone());//联系电话 这个地方拉取商家入驻的时候填写的退货电话
+            setCellValue(sheet, 3, 1, fsStoreScrm != null?fsStoreScrm.getStoreName():"");//店铺名称
+            setCellValue(sheet, 4, 1, fsStoreScrm != null?fsStoreScrm.getFullName():"");//企业全称
+            setCellValue(sheet, 5, 1, fsStoreScrm != null?fsStoreScrm.getEnterpriseAddress():"");//经营地址 营业执照上的地址
+            setCellValue(sheet, 6, 1, fsStoreScrm != null?fsStoreScrm.getRefundPhone():"");//联系电话 这个地方拉取商家入驻的时候填写的退货电话
             setCellValue(sheet, 7, 1, payTimeStr);//销售日期  订单支付时间
             setCellValue(sheet, 11, 1, fsStoreOrderScrm.getBatchNumber());//生产批号(药品) / 序列号(器械)
             setCellValue(sheet, 12, 1, fsStoreOrderScrm.getVerifyCode());//有效期/追溯码
@@ -512,7 +512,7 @@ public class FsStoreHealthOrderScrmController extends BaseController {
 
 
             /**销售退款明细单**/
-            List<FsStorePaymentScrm> fsStorePaymentScrms = fsStorePaymentService.selectFsStorePaymentByOrderIdAndStatus(Long.valueOf(fsStoreOrderScrm.getOrderCode()));
+            List<FsStorePaymentScrm> fsStorePaymentScrms = fsStorePaymentService.selectFsStorePaymentByOrderIdAndStatus(fsStoreOrderScrm.getId());
             if (!CollectionUtils.isEmpty(fsStorePaymentScrms)) {
                 List<FsStoreAfterSalesVO> fsStoreAfterSalesVOS = fsStoreAfterSalesService.selectFsStoreAfterSalesVOByOrderCode(fsStoreOrderScrm.getOrderCode());
                 FsStoreAfterSalesItemScrm map = new FsStoreAfterSalesItemScrm();
@@ -523,7 +523,7 @@ public class FsStoreHealthOrderScrmController extends BaseController {
                 setCellValue(sheet, 26, 1, fsStoreScrm.getStoreName());//店铺名称
                 setCellValue(sheet, 27, 1, fsStoreScrm.getEnterpriseAddress());//经营地址	营业执照上的地址
                 setCellValue(sheet, 28, 1, fsStoreScrm.getRefundPhone());//联系电话	这个地方拉取商家入驻的时候填写的退货电话
-                setCellValue(sheet, 29, 1, String.valueOf(fsStorePaymentScrms.get(0).getRefundTime()));//退货日期
+                setCellValue(sheet, 29, 1, sdf.format(fsStorePaymentScrms.get(0).getRefundTime()));//退货日期
                 int startNul = 1;
                 Integer total = 0;
                 for (int i = 0; i < items.size(); i++) {