From 43a6c8d5b15f9f117741931aa9e9385641b583b1 Mon Sep 17 00:00:00 2001 From: xiaocui <1334950895@qq.com> Date: Tue, 30 Mar 2021 19:41:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A0=82=E7=AB=99=E8=BF=90=E8=BE=93=E9=87=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ssjygl/customer/CustomerController.java | 6 +++++ .../InvoiceInvalidVerifyController.java | 3 ++- .../service/ssjygl/main/AuthInterceptor.java | 3 +++ .../ordercluster/OrderclusterSyncService.java | 4 ++-- .../refunddetail/RefundDetailSyncService.java | 22 ++++++++++++++++++- .../ssjygl/stat/sale/OrderStatController.java | 18 +++++++++++++++ 6 files changed, 52 insertions(+), 4 deletions(-) diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerController.java index 71f6030..88388dc 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerController.java @@ -8,6 +8,7 @@ import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.customer.CustomerPKValidator; import com.cowr.ssjygl.customer.CustomerService; import com.cowr.ssjygl.customer.CustomerValidator; +import com.cowr.ssjygl.prepay.refunddetail.RefundDetailService; import com.jfinal.aop.Before; import com.jfinal.core.Controller; @@ -145,4 +146,9 @@ public class CustomerController extends Controller { public void list() { renderJson(Result.object(CustomerService.me.list())); } + + public void getCustomerAccountBalance(){ + Integer customer_id = getInt("customer_id"); + renderJson(RefundDetailService.me.getCustomerAccountBalance(customer_id)); + } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyController.java index 71c38d4..031fecd 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyController.java @@ -1,5 +1,6 @@ package com.cowr.service.ssjygl.invoice.invalidverify; +import com.cowr.common.enums.RoleEnum; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.Sysuser; @@ -36,7 +37,7 @@ public class InvoiceInvalidVerifyController extends Controller { if (tokenuser == null) { renderJson(Result.noauth()); return; - } else if (!SysuserSyncService.me.isTreasurer(tokenuser.getRole())) { // 财务才能审核 + } else if (!SysuserSyncService.me.isTreasurer(tokenuser.getRole())&&!SysuserSyncService.me.isPresident(tokenuser.getRole())) { // 财务/结算中心才能审核 renderJson(Result.permissionDenied()); return; } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java index 814f24b..455dd41 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java @@ -48,9 +48,12 @@ public class AuthInterceptor implements Interceptor { add("/customer/get"); add("/customer/edit"); + add("/customer/getCustomerAccountBalance"); add("/sysuser/edit"); add("/sysuser/modpwd"); + add("/sysuser/modpwd"); + }}); } 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 2b77638..180f5be 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 @@ -1320,8 +1320,8 @@ public class OrderclusterSyncService extends BaseSyncService { public Map getMaximumConfiguration( int customer_id,String unit_price){ Map result=new HashMap(); Integer count = Db.queryInt("select count(distinct s.name) from ordercluster t \n" + - " left join supermarket s on s.id = t.supermarket_id \n" + - " where t.customer_id =?", customer_id); + " join supermarket s on s.id = t.supermarket_id \n" + + " where t.state<5 and t.customer_id =?", customer_id); result.put("count",count); //当前用户如果只在一个沙场里面买沙，就计算最大可购买重量 if(count<=1){ diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java index 46b4600..d24f180 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java @@ -6,19 +6,23 @@ import com.cowr.common.enums.Enums; import com.cowr.common.view.Result; import com.cowr.model.*; import com.cowr.service.ssjygl.base.BaseSyncService; +import com.cowr.service.ssjygl.order.ordercluster.OrderclusterSyncService; import com.cowr.service.ssjygl.sms.log.SmsService; import com.cowr.service.ssjygl.synctask.SyncTaskService; import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.ssjygl.order.ordercluster.OrderclusterService; import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.IAtom; +import com.jfinal.plugin.activerecord.Record; import java.math.BigDecimal; import java.sql.SQLException; import java.util.Date; +import java.util.List; public class RefundDetailSyncService extends BaseSyncService { public static RefundDetailSyncService me = new RefundDetailSyncService(); @@ -32,7 +36,8 @@ public class RefundDetailSyncService extends BaseSyncService { if (customer == null) { return Result.failed("按客户 id 未找到对应客户信息"); } - + //取消订单 + cancelOrder( customer_id, user); PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(customer.getId()); if (prepayCustomer == null) { @@ -95,6 +100,21 @@ public class RefundDetailSyncService extends BaseSyncService { } } + /** + * 取消订单 + * @param customer_id + */ + public void cancelOrder(Integer customer_id,Sysuser user){ + List recordList = OrderclusterService.me.getUncompletedOrdersFromUsers(customer_id); + if (recordList!=null && !recordList.isEmpty()) { + for (Record record : recordList) { + Integer id = record.getInt("id"); + OrderclusterSyncService.me.complete(id, user); + } + } + + } + /** * 审核退费记录 * 审核通过后，才由财务退款，财务退款后，才更新客户余额 diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java index b13cdba..5fc837a 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java @@ -12,8 +12,11 @@ import com.cowr.model.Sysuser; import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.stat.sale.OrderStatService; import com.jfinal.aop.Before; +import com.jfinal.plugin.activerecord.Record; import org.apache.poi.ss.usermodel.Workbook; +import java.util.List; + public class OrderStatController extends BaseController { /** @@ -391,4 +394,19 @@ public class OrderStatController extends BaseController { render(new ExcelRender("按砂站总销售汇总表_" + System.currentTimeMillis() + ".xlsx", wb)); } } + + /** + * 各砂站运输量统计表 + */ + public void trafficStatisticsOfEachSandStation(){ + String stm=get("stm"); + String etm=get("etm"); + int export = getInt("export", 0); // 是否导出为exce 0 不导出，1 导出 + if (export == 0) { + renderJson(Result.object(OrderStatService.me.trafficStatisticsOfEachSandStation(stm, etm))); + }else { + Workbook wb = OrderStatService.me.trafficStatisticsOfEachSandStationExport(stm, etm); + render(new ExcelRender("各砂站运输量统计表_" + System.currentTimeMillis() + ".xlsx", wb)); + } + } }