From 8ecb4619e1356ae9ebdf86c1f554956da29d77e9 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Wed, 26 Aug 2020 15:39:10 +0800 Subject: [PATCH] . --- .../SupermarketCustomerDistanceService.java | 7 +++ .../ordercluster/OrderclusterController.java | 51 +++++++++++++++++++ ...SupermarketCustomerDistanceController.java | 5 ++ ...SupermarketCustomerDistanceController.java | 5 ++ 4 files changed, 68 insertions(+) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java index 9362b29..67a7048 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java @@ -2,6 +2,7 @@ package com.cowr.ssjygl.supermarket.customerdistance; import com.cowr.common.base.BaseService; import com.cowr.common.view.PageParam; +import com.cowr.common.view.Result; import com.cowr.model.Supermarket; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; @@ -40,6 +41,12 @@ public class SupermarketCustomerDistanceService extends BaseService { } } + public List customerDistance(Integer customer_id){ + return Db.find("select t.id, t.name, t.name2, cr.distance, cr.customer_id, c.name customer_name from supermarket t\n" + + " left join supermarket_customer_distance cr on cr.supermarket_id = t.id and cr.customer_id = ? \n" + + " left join customer c on c.id = cr.customer_id ", customer_id); + } + /** * 列出所砂站的 * diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java index e5b7b86..6d68d2a 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java @@ -1,9 +1,12 @@ package com.cowr.local.ssjygl.order.ordercluster; import com.cowr.common.base.BaseController; +import com.cowr.common.enums.UserTypeEnum; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.Ordercluster; +import com.cowr.model.Sysuser; import com.cowr.ssjygl.order.ordercluster.OrderclusterPKValidator; import com.cowr.ssjygl.order.ordercluster.OrderclusterService; import com.cowr.ssjygl.supermarket.SupermarketIdValidator; @@ -11,6 +14,54 @@ import com.jfinal.aop.Before; public class OrderclusterController extends BaseController { + /** + * 分页查找 ordercluster 订单簇 - 集团客户订单 + */ + public void findTemp() { + PageParam pp = getBean(PageParam.class, "", true); + String stm = get("stm"); + String etm = get("etm"); + String customer_name = get("customer_name"); + Integer supermarket_id = getInt("supermarket_id"); + + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + // 是客户账户 + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } + + Integer state = getInt("state"); + Integer product_id = getInt("product_id"); + renderJson(Result.object(OrderclusterService.me.findTemp(pp, supermarket_id, customer_name, stm, etm, product_id, state))); + } + /** + * 分页查找 ordercluster 订单簇 - 集团客户订单 + */ + public void findCluster() { + PageParam pp = getBean(PageParam.class, "", true); + String stm = get("stm"); + String etm = get("etm"); + String customer_name = get("customer_name"); + Integer supermarket_id = getInt("supermarket_id"); + Integer customer_id = getInt("customer_id"); + + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + // 是客户账户 + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } else if (tokenuser.getType() == UserTypeEnum.CUSTOMER.getTypeid()) { + customer_id = tokenuser.getEntityId(); + } + + Integer state = getInt("state"); + Integer product_id = getInt("product_id"); + Integer trans_co_id = getInt("trans_co_id"); + renderJson(Result.object(OrderclusterService.me.findCluster(pp, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, product_id, state))); + } /** * 分页查找 ordercluster 订单簇 - 集团客户订单 */ diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java index a5869e4..efd46e6 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java @@ -12,6 +12,11 @@ public class SupermarketCustomerDistanceController extends Controller { renderJson(Result.success(SupermarketCustomerDistanceService.me.getDistance(supermarket_id, customer_id))); } + public void customerDistance(){ + Integer customer_id = getInt("customer_id"); + renderJson(Result.success(SupermarketCustomerDistanceService.me.customerDistance(customer_id))); + } + public void findAllSupermarket() { PageParam pp = getBean(PageParam.class, "", true); Integer customer_id = getInt("customer_id"); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java index 05ea2ad..b33dd79 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java @@ -16,6 +16,11 @@ public class SupermarketCustomerDistanceController extends BaseController { renderJson(Result.success(SupermarketCustomerDistanceService.me.getDistance(supermarket_id, customer_id))); } + public void customerDistance(){ + Integer customer_id = getInt("customer_id"); + renderJson(Result.success(SupermarketCustomerDistanceService.me.customerDistance(customer_id))); + } + public void findAllSupermarket() { PageParam pp = getBean(PageParam.class, "", true); Integer customer_id = getInt("customer_id");