|
|
@@ -1930,8 +1930,9 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
|
|
|
erpOrder.setSeller_memo(erpOrder.getSeller_memo() + JSONUtil.toJsonStr(remarkDTO));
|
|
|
|
|
|
erpOrder.setOrder_type_code("order");
|
|
|
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
- erpOrder.setDeal_datetime(sdf.format(new Date()));
|
|
|
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
+// erpOrder.setDeal_datetime(sdf.format(new Date()));
|
|
|
+ erpOrder.setDeal_datetime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,order.getPayTime()));
|
|
|
FsStoreOrderItemScrm itemMap = new FsStoreOrderItemScrm();
|
|
|
itemMap.setOrderId(order.getId());
|
|
|
List<FsStoreOrderItemScrm> orderItems = storeOrderItemService.selectFsStoreOrderItemList(itemMap);
|