|
@@ -1,5 +1,6 @@
|
|
|
package com.fs.erp.service.impl;
|
|
|
|
|
|
+import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
@@ -35,6 +36,7 @@ import org.springframework.util.CollectionUtils;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Collections;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -113,7 +115,9 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
|
|
|
shopOrderDTO.setFreight(fsStoreOrder.getPayDelivery().doubleValue());
|
|
|
}
|
|
|
// 备注
|
|
|
- shopOrderDTO.setRemark(order.getBuyer_memo());
|
|
|
+ //shopOrderDTO.setRemark(order.getBuyer_memo());
|
|
|
+ shopOrderDTO.setRemark(DateUtil.format(new Date(), "dd"));
|
|
|
+
|
|
|
// 买家留言
|
|
|
shopOrderDTO.setBuyerMessage(order.getBuyer_memo());
|
|
|
|