|
|
@@ -44,6 +44,7 @@ import java.io.IOException;
|
|
|
import java.io.InputStream;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.net.URLEncoder;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
|
|
|
@RestController
|
|
|
@@ -493,12 +494,18 @@ public class FsStoreHealthOrderScrmController extends BaseController {
|
|
|
setCellValue(sheet, 10, startCol + i, fsStoreProductScrm.getManufacturer());//生产企业名称
|
|
|
setCellValue(sheet, 8, startCol + i, cartInfo.getProductName() == 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, 7, 1, String.valueOf(fsStoreOrderScrm.getPayTime()));//销售日期 订单支付时间
|
|
|
+ setCellValue(sheet, 7, 1, payTimeStr);//销售日期 订单支付时间
|
|
|
setCellValue(sheet, 11, 1, fsStoreOrderScrm.getBatchNumber());//生产批号(药品) / 序列号(器械)
|
|
|
setCellValue(sheet, 12, 1, fsStoreOrderScrm.getVerifyCode());//有效期/追溯码
|
|
|
setCellValue(sheet, 16, 1, String.valueOf(fsStoreOrderScrm.getTotalPrice()));//合计金额(元)
|