From 8238df866d3e5daf50cac7eed510cc51c5f28f7b Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Mon, 24 Aug 2020 15:00:29 +0800 Subject: [PATCH] . --- .../src/main/java/com/cowr/ssjygl/prepay/PrepayService.java | 2 +- .../local/ssjygl/order/ordersale/OrderSaleSyncService.java | 4 ++-- .../local/ssjygl/order/ordertemp/OrderTempSyncService.java | 4 ++-- .../ssjygl/order/ordercluster/OrderclusterSyncService.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java index 5e1e5a9..8508eee 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java @@ -139,7 +139,7 @@ public class PrepayService { return null; } - PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(customer.getId(), transport.getSupermarketId()); + PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(customer.getId()); if (prepayCustomer == null) { log.debug("未找到预付费信息 %s, %s" + customer.getId() + ", " + transport.getSupermarketId()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java index 39006e7..9aed494 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java @@ -267,7 +267,7 @@ public class OrderSaleSyncService { return Result.failedstr("集团订单【%s】没有配置有效的物流公司", ordercluster_id); } - PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(customer.getId(), transport.getSupermarketId()); + PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(customer.getId()); if (prepayCustomer == null) { return Result.failed("没有找到客户预付费信息"); @@ -586,7 +586,7 @@ public class OrderSaleSyncService { return false; } - PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(customer.getId(), order.getSupermarketId()); + PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(customer.getId()); if (prepayCustomer != null) { if (prepayCustomer.getSurplus() == null) { diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java index 8237d82..939d836 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java @@ -551,7 +551,7 @@ public class OrderTempSyncService { return Result.failedstr("未查到有效的单价信息"); } - PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(customer.getId(), transport.getSupermarketId()); + PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(customer.getId()); if (prepayCustomer == null) { return Result.failed("没有找到客户预付费信息"); @@ -859,7 +859,7 @@ public class OrderTempSyncService { return false; } - PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(customer.getId(), order.getSupermarketId()); + PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(customer.getId()); if (prepayCustomer != null) { diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java index 713dac3..107d614 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java @@ -64,7 +64,7 @@ public class OrderclusterSyncService extends BaseSyncService { return Result.failed("还有未完成的集团订单"); } - PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(model.getCustomerId(), model.getSupermarketId()); + PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(model.getCustomerId()); if (prepayCustomer == null) { return Result.failed("不是预付费用户"); }