|
@@ -4,6 +4,7 @@ import cn.hutool.json.JSONArray;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.fs.common.annotation.QuartzRunnable;
|
|
import com.fs.common.annotation.QuartzRunnable;
|
|
|
import com.fs.common.core.redis.RedisCache;
|
|
import com.fs.common.core.redis.RedisCache;
|
|
|
|
|
+import com.fs.common.utils.DateUtils;
|
|
|
import com.fs.common.utils.StringUtils;
|
|
import com.fs.common.utils.StringUtils;
|
|
|
import com.fs.huifuPay.domain.HuiFuQueryOrderResult;
|
|
import com.fs.huifuPay.domain.HuiFuQueryOrderResult;
|
|
|
import com.fs.huifuPay.dto.*;
|
|
import com.fs.huifuPay.dto.*;
|
|
@@ -55,10 +56,7 @@ import java.math.BigDecimal;
|
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
-import java.util.ArrayList;
|
|
|
|
|
-import java.util.List;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
-import java.util.Set;
|
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
|
|
import static com.fs.store.constants.StoreConstants.DELIVERY;
|
|
import static com.fs.store.constants.StoreConstants.DELIVERY;
|
|
|
|
|
|
|
@@ -253,8 +251,10 @@ public class StoreTask {
|
|
|
@QuartzRunnable(name = "发货任务")
|
|
@QuartzRunnable(name = "发货任务")
|
|
|
public void deliveryOp() {
|
|
public void deliveryOp() {
|
|
|
List<FsStoreOrder> list = orderService.selectDeliverPenddingData();
|
|
List<FsStoreOrder> list = orderService.selectDeliverPenddingData();
|
|
|
-
|
|
|
|
|
|
|
+ Date nowDate = DateUtils.getNowDate();
|
|
|
for (FsStoreOrder order: list) {
|
|
for (FsStoreOrder order: list) {
|
|
|
|
|
+ order.setUpdateTime(nowDate);
|
|
|
|
|
+ orderService.updateFsStoreOrderDb(order);
|
|
|
String orderCode = order.getOrderCode();
|
|
String orderCode = order.getOrderCode();
|
|
|
ErpOrderQueryRequert request = new ErpOrderQueryRequert();
|
|
ErpOrderQueryRequert request = new ErpOrderQueryRequert();
|
|
|
request.setCode(order.getExtendOrderId());
|
|
request.setCode(order.getExtendOrderId());
|