|
@@ -4,6 +4,7 @@ import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.fs.common.core.domain.R;
|
|
import com.fs.common.core.domain.R;
|
|
@@ -19,6 +20,7 @@ import com.fs.erp.dto.ErpOrderQueryResponse;
|
|
import com.fs.erp.service.IErpOrderService;
|
|
import com.fs.erp.service.IErpOrderService;
|
|
import com.fs.express.FsStoreDeliversService;
|
|
import com.fs.express.FsStoreDeliversService;
|
|
import com.fs.express.dto.DeliveryDTO;
|
|
import com.fs.express.dto.DeliveryDTO;
|
|
|
|
+import com.fs.store.cache.IFsStoreProductCacheService;
|
|
import com.fs.store.domain.*;
|
|
import com.fs.store.domain.*;
|
|
import com.fs.store.dto.*;
|
|
import com.fs.store.dto.*;
|
|
import com.fs.store.enums.ShipperCodeEnum;
|
|
import com.fs.store.enums.ShipperCodeEnum;
|
|
@@ -72,6 +74,9 @@ public class FsStoreOrderController extends BaseController {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private FsStoreDeliversService fsStoreDeliversService;
|
|
private FsStoreDeliversService fsStoreDeliversService;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ private IFsStoreProductCacheService fsStoreProductCacheService;
|
|
/**
|
|
/**
|
|
* 查询订单列表
|
|
* 查询订单列表
|
|
*/
|
|
*/
|
|
@@ -298,7 +303,17 @@ public class FsStoreOrderController extends BaseController {
|
|
|
|
|
|
FsStoreOrderItem itemMap = new FsStoreOrderItem();
|
|
FsStoreOrderItem itemMap = new FsStoreOrderItem();
|
|
itemMap.setOrderId(order.getId());
|
|
itemMap.setOrderId(order.getId());
|
|
|
|
+ // 设置仓库代码
|
|
List<FsStoreOrderItem> items = orderItemService.selectFsStoreOrderItemList(itemMap);
|
|
List<FsStoreOrderItem> items = orderItemService.selectFsStoreOrderItemList(itemMap);
|
|
|
|
+ for (FsStoreOrderItem item : items) {
|
|
|
|
+ if(ObjectUtil.isNotNull(item.getProductId())){
|
|
|
|
+ FsStoreProduct fsStoreProduct =
|
|
|
|
+ fsStoreProductCacheService.selectFsStoreProductById(item.getProductId());
|
|
|
|
+ if(ObjectUtil.isNotNull(fsStoreProduct)){
|
|
|
|
+ item.setWarehouseCode(fsStoreProduct.getWarehouseCode());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
FsStoreOrderStatus statusMap = new FsStoreOrderStatus();
|
|
FsStoreOrderStatus statusMap = new FsStoreOrderStatus();
|
|
statusMap.setOrderId(order.getId());
|
|
statusMap.setOrderId(order.getId());
|
|
List<FsStoreOrderStatus> logs = orderStatusService.selectFsStoreOrderStatusList(statusMap);
|
|
List<FsStoreOrderStatus> logs = orderStatusService.selectFsStoreOrderStatusList(statusMap);
|