From 2f8c9df7639ab68bf52cede8f17edae6885a2f5f Mon Sep 17 00:00:00 2001 From: wuwenxiong <646448316@qq.com> Date: Wed, 15 Sep 2021 16:22:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=AE=A2=E5=8D=95=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=A4=9A=E5=93=81=E7=B1=BB=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ssjygl/order/ordercluster/OrderclusterController.java | 5 +++-- .../ssjygl/order/ordercluster/OrderclusterSyncService.java | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java index 2b73b3b..121b9cd 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java @@ -57,12 +57,13 @@ public class OrderclusterController extends BaseController { String customer_texpayer_name = get("customer_texpayer_name"); Integer req_receipt = getInt("req_receipt"); double total_weight = getParaToDouble("total_weight"); - Date start_time = getDate("start_time"); + Date start_time = getDate("start_time"); Date cutoff_time = getDate("cutoff_time"); int supermarket_id = getInt("supermarket_id"); String trucks = get("trucks"); + Integer product_id = getInt("product_id"); - renderJson(OrderclusterSyncService.me.saveTemp(customer_name, customer_texpayer_name, customer_texpayer_num, req_receipt, total_weight, start_time, cutoff_time, supermarket_id, trucks, tokenuser)); + renderJson(OrderclusterSyncService.me.saveTemp(customer_name, customer_texpayer_name, customer_texpayer_num, req_receipt, total_weight, start_time, cutoff_time, supermarket_id, trucks, product_id, tokenuser)); } /** 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 99fc378..b3c718c 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 @@ -248,6 +248,7 @@ public class OrderclusterSyncService extends BaseSyncService { Date cutoff_time, int supermarket_id, String trucks, + Integer product_id, Sysuser sysuser ) { String query_start_time = DateTimeUtil.sdf.get().format(start_time); @@ -267,12 +268,12 @@ public class OrderclusterSyncService extends BaseSyncService { return Result.failedstr("客户[%s][%s]至[%s]在砂站[%s]还有未完成的配额", customer_name, query_start_time, query_cutoff_time, SvrCacheData.SUP_CACHE.get(supermarket_id).getName()); } - Product product = Product.dao.findById(Const.DEFAULT_PRODUCT_ID); + Product product = Product.dao.findById(product_id); if (product == null) { return Result.failedstr("商品信息配置错误"); } - BigDecimal unitprice = SupermarketProductService.me.getUnitPrice(supermarket_id, product.getId()); + BigDecimal unitprice = SupermarketProductService.me.getUnitPrice(supermarket_id, product_id); if (unitprice == null) { return Result.failed("未配置商品单价"); } @@ -359,7 +360,7 @@ public class OrderclusterSyncService extends BaseSyncService { model.setTimeInterval(1); model.setMiniTruck(1); - model.setProductId(product.getId()); + model.setProductId(product_id); model.setProductName(product.getName()); model.setUnitPrice(unitprice); // 后端获取数据库中单价