|
@@ -10,7 +10,7 @@ import com.fjhx.tenant.entity.dict.po.DictCommonData;
|
|
|
import com.fjhx.tenant.service.dict.DictCommonDataService;
|
|
|
import com.sd.business.entity.department.po.Department;
|
|
|
import com.sd.business.entity.order.enums.OrderStatusEnum;
|
|
|
-import com.sd.business.entity.order.po.Order;
|
|
|
+import com.sd.business.entity.order.po.OrderInfo;
|
|
|
import com.sd.business.entity.order.po.OrderSku;
|
|
|
import com.sd.business.entity.sku.po.SkuSpec;
|
|
|
import com.sd.business.service.department.DepartmentService;
|
|
@@ -58,28 +58,28 @@ public class WlnOrderServiceImpl implements WlnOrderService {
|
|
|
}
|
|
|
Map<String, Department> departmentMap = getDepartmentMap();
|
|
|
|
|
|
- List<Order> saveOrderList = new ArrayList<>();
|
|
|
+ List<OrderInfo> saveOrderListInfo = new ArrayList<>();
|
|
|
List<OrderSku> saveOrderSkuList = new ArrayList<>();
|
|
|
|
|
|
- List<Order> updateOrderList = new ArrayList<>();
|
|
|
+ List<OrderInfo> updateOrderListInfo = new ArrayList<>();
|
|
|
|
|
|
- List<Order> orderList = orderService.list(q ->
|
|
|
- q.between(Order::getWlnApproveTime, DateUtil.offsetDay(endDate, -3), endDate));
|
|
|
- Map<String, Order> orderMap = orderList.stream().collect(Collectors.toMap(Order::getWlnUid, Function.identity()));
|
|
|
+ List<OrderInfo> orderInfoList = orderService.list(q ->
|
|
|
+ q.between(OrderInfo::getWlnApproveTime, DateUtil.offsetDay(endDate, -3), endDate));
|
|
|
+ Map<String, OrderInfo> orderMap = orderInfoList.stream().collect(Collectors.toMap(OrderInfo::getWlnUid, Function.identity()));
|
|
|
|
|
|
for (JSONObject wlnOrder : wlnOrderList) {
|
|
|
String uid = wlnOrder.getString("uid");
|
|
|
- Order order = orderMap.get(uid);
|
|
|
- if (order != null) {
|
|
|
+ OrderInfo orderInfo = orderMap.get(uid);
|
|
|
+ if (orderInfo != null) {
|
|
|
Integer processStatus = wlnOrder.getInteger("process_status");
|
|
|
- if (ObjectUtil.notEqual(order.getWlnStatus(), processStatus)) {
|
|
|
- order.setWlnStatus(processStatus);
|
|
|
- updateOrderList.add(order);
|
|
|
+ if (ObjectUtil.notEqual(orderInfo.getWlnStatus(), processStatus)) {
|
|
|
+ orderInfo.setWlnStatus(processStatus);
|
|
|
+ updateOrderListInfo.add(orderInfo);
|
|
|
}
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- order = createOrder(wlnOrder, departmentMap);
|
|
|
+ orderInfo = createOrder(wlnOrder, departmentMap);
|
|
|
List<JSONObject> wlnOrderSkuList = wlnOrder.getJSONArray("orders").toJavaList(JSONObject.class);
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(wlnOrderSkuList)) {
|
|
@@ -94,17 +94,17 @@ public class WlnOrderServiceImpl implements WlnOrderService {
|
|
|
|
|
|
for (JSONObject wlnOrderSku : wlnOrderSkuList) {
|
|
|
SkuSpec skuSpec = skuSpecMap.get(wlnOrderSku.getString("sys_spec_uid"));
|
|
|
- OrderSku orderSku = createOrderSku(wlnOrderSku, order, skuSpec);
|
|
|
+ OrderSku orderSku = createOrderSku(wlnOrderSku, orderInfo, skuSpec);
|
|
|
saveOrderSkuList.add(orderSku);
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
- saveOrderList.add(order);
|
|
|
+ saveOrderListInfo.add(orderInfo);
|
|
|
}
|
|
|
|
|
|
- orderService.saveBatch(saveOrderList);
|
|
|
- orderService.updateBatchById(updateOrderList);
|
|
|
+ orderService.saveBatch(saveOrderListInfo);
|
|
|
+ orderService.updateBatchById(updateOrderListInfo);
|
|
|
orderSkuService.saveBatch(saveOrderSkuList);
|
|
|
return true;
|
|
|
}
|
|
@@ -162,25 +162,25 @@ public class WlnOrderServiceImpl implements WlnOrderService {
|
|
|
return departmentMap;
|
|
|
}
|
|
|
|
|
|
- private Order createOrder(JSONObject wlnOrder, Map<String, Department> departmentMap) {
|
|
|
+ private OrderInfo createOrder(JSONObject wlnOrder, Map<String, Department> departmentMap) {
|
|
|
Department department = departmentMap.get(wlnOrder.getString("storage_code"));
|
|
|
|
|
|
- Order order = new Order();
|
|
|
- order.setId(IdWorker.getId());
|
|
|
- order.setSource(2);
|
|
|
- order.setCode(wlnOrder.getString("tp_tid"));
|
|
|
- order.setWlnCode(wlnOrder.getString("trade_no"));
|
|
|
- order.setWlnUid(wlnOrder.getString("uid"));
|
|
|
- order.setWlnCreateTime(wlnOrder.getDate("create_time"));
|
|
|
- order.setWlnApproveTime(wlnOrder.getDate("approve_time"));
|
|
|
- order.setModifyTime(wlnOrder.getLong("modify_time"));
|
|
|
- order.setRemark(wlnOrder.getString("remark"));
|
|
|
- order.setProvince(wlnOrder.getString("province"));
|
|
|
- order.setCity(wlnOrder.getString("city"));
|
|
|
- order.setCounty(wlnOrder.getString("district"));
|
|
|
- order.setDetailedAddress(wlnOrder.getString("address"));
|
|
|
- order.setPostcode(wlnOrder.getString("zip"));
|
|
|
- order.setWlnStatus(wlnOrder.getInteger("process_status"));
|
|
|
+ OrderInfo orderInfo = new OrderInfo();
|
|
|
+ orderInfo.setId(IdWorker.getId());
|
|
|
+ orderInfo.setSource(2);
|
|
|
+ orderInfo.setCode(wlnOrder.getString("tp_tid"));
|
|
|
+ orderInfo.setWlnCode(wlnOrder.getString("trade_no"));
|
|
|
+ orderInfo.setWlnUid(wlnOrder.getString("uid"));
|
|
|
+ orderInfo.setWlnCreateTime(wlnOrder.getDate("create_time"));
|
|
|
+ orderInfo.setWlnApproveTime(wlnOrder.getDate("approve_time"));
|
|
|
+ orderInfo.setModifyTime(wlnOrder.getLong("modify_time"));
|
|
|
+ orderInfo.setRemark(wlnOrder.getString("remark"));
|
|
|
+ orderInfo.setProvince(wlnOrder.getString("province"));
|
|
|
+ orderInfo.setCity(wlnOrder.getString("city"));
|
|
|
+ orderInfo.setCounty(wlnOrder.getString("district"));
|
|
|
+ orderInfo.setDetailedAddress(wlnOrder.getString("address"));
|
|
|
+ orderInfo.setPostcode(wlnOrder.getString("zip"));
|
|
|
+ orderInfo.setWlnStatus(wlnOrder.getInteger("process_status"));
|
|
|
|
|
|
StringBuilder builder = new StringBuilder();
|
|
|
// 订单来源平台
|
|
@@ -192,30 +192,30 @@ public class WlnOrderServiceImpl implements WlnOrderService {
|
|
|
builder.append("_");
|
|
|
builder.append(wlnOrder.getString("shop_name"));
|
|
|
}
|
|
|
- order.setCommercePlatform(builder.toString());
|
|
|
+ orderInfo.setCommercePlatform(builder.toString());
|
|
|
|
|
|
if (department != null) {
|
|
|
- order.setDepartmentId(department.getId());
|
|
|
+ orderInfo.setDepartmentId(department.getId());
|
|
|
if (Objects.equals(department.getOrderMode(), "2")) {
|
|
|
- order.setStatus(OrderStatusEnum.REJECT.getKey());
|
|
|
+ orderInfo.setStatus(OrderStatusEnum.REJECT.getKey());
|
|
|
} else {
|
|
|
- order.setStatus(OrderStatusEnum.UNDER_REVIEW.getKey());
|
|
|
+ orderInfo.setStatus(OrderStatusEnum.UNDER_REVIEW.getKey());
|
|
|
}
|
|
|
} else {
|
|
|
- order.setStatus(OrderStatusEnum.UNDER_REVIEW.getKey());
|
|
|
+ orderInfo.setStatus(OrderStatusEnum.UNDER_REVIEW.getKey());
|
|
|
}
|
|
|
|
|
|
- if (order.getWlnStatus() == 10 || order.getWlnStatus() == 11 || order.getWlnStatus() == 12) {
|
|
|
- order.setStatus(OrderStatusEnum.EXCEPTION.getKey());
|
|
|
+ if (orderInfo.getWlnStatus() == 10 || orderInfo.getWlnStatus() == 11 || orderInfo.getWlnStatus() == 12) {
|
|
|
+ orderInfo.setStatus(OrderStatusEnum.EXCEPTION.getKey());
|
|
|
}
|
|
|
|
|
|
- return order;
|
|
|
+ return orderInfo;
|
|
|
}
|
|
|
|
|
|
- private OrderSku createOrderSku(JSONObject wlnOrderSku, Order order, SkuSpec skuSpec) {
|
|
|
+ private OrderSku createOrderSku(JSONObject wlnOrderSku, OrderInfo orderInfo, SkuSpec skuSpec) {
|
|
|
OrderSku orderSku = new OrderSku();
|
|
|
orderSku.setId(IdWorker.getId());
|
|
|
- orderSku.setOrderId(order.getId());
|
|
|
+ orderSku.setOrderId(orderInfo.getId());
|
|
|
orderSku.setQuantity(wlnOrderSku.getBigDecimal("size"));
|
|
|
orderSku.setPrintType(1);
|
|
|
orderSku.setWlnSkuId(wlnOrderSku.getString("sys_goods_uid"));
|