diff --git a/src/main/java/cn/van/business/repository/JDOrderRepository.java b/src/main/java/cn/van/business/repository/JDOrderRepository.java index 4a99725..9bf429f 100644 --- a/src/main/java/cn/van/business/repository/JDOrderRepository.java +++ b/src/main/java/cn/van/business/repository/JDOrderRepository.java @@ -4,7 +4,6 @@ import cn.van.business.model.jd.JDOrder; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import java.time.LocalDateTime; import java.util.Date; import java.util.List; @@ -16,10 +15,10 @@ public interface JDOrderRepository extends JpaRepository { /** * 根据订单号查询订单 * - * @param orderId 订单号 + * @param remark 订单号 * @return JDOrder 实体 */ - JDOrder findByOrderId(String orderId); + JDOrder findByRemark(String remark); /** * 根据下单人查询订单列表 diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index accc14b..52307da 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -2084,12 +2084,12 @@ public class JDUtil { if (Util.isAnyEmpty(jdOrder.getOrderId(), jdOrder.getBuyer(), jdOrder.getOrderTime(), jdOrder.getPaymentAmount(), jdOrder.getRebateAmount(), jdOrder.getAddress(), jdOrder.getLogisticsLink(), jdOrder.getModelNumber(), jdOrder.getLink(), jdOrder.getOrderId(), jdOrder.getBuyer())) { return; } - JDOrder byOrderId = jdOrderRepository.findByOrderId(jdOrder.getOrderId()); + JDOrder byRemark = jdOrderRepository.findByRemark(jdOrder.getRemark()); String info = ""; - if (byOrderId != null) { - logger.info("订单已存在:{}", byOrderId); + if (byRemark != null) { + logger.info("订单已存在:{}", byRemark); info = "更新成功"; - jdOrder.setId(byOrderId.getId()); + jdOrder.setId(byRemark.getId()); } else { info = "新增成功"; logger.info("订单不存在,新增:{}", jdOrder);