|
@@ -205,14 +205,14 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
|
|
|
// 收货地址id
|
|
|
BigDecimal shippingAddressId = DataChange.dataToBigDecimal(map.get("shippingAddressId"));
|
|
|
// 截止日期
|
|
|
- String dateOfReceiptStr = (String) map.get("dateOfReceipt");
|
|
|
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
- Date dateOfReceipt = null;
|
|
|
- try {
|
|
|
- dateOfReceipt = sdf.parse(dateOfReceiptStr);
|
|
|
- } catch (ParseException e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
+// String dateOfReceiptStr = (String) map.get("dateOfReceipt");
|
|
|
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ Date dateOfReceipt = new Date((Long) map.get("dateOfReceipt"));
|
|
|
+// try {
|
|
|
+// dateOfReceipt = sdf.parse(dateOfReceiptStr);
|
|
|
+// } catch (ParseException e) {
|
|
|
+// e.printStackTrace();
|
|
|
+// }
|
|
|
// 收货方姓名
|
|
|
String orderConsignee = (String) map.get("orderConsignee");
|
|
|
// 收货方联系方式
|