From 29a8f59a4ceef204c78be5d31cdfeb4810f0360b Mon Sep 17 00:00:00 2001 From: xjm Date: Fri, 22 Dec 2023 10:34:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=B7=BB=E5=8A=A0=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=8A=98=E6=89=A3=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=92=8C=E6=9B=B4=E6=96=B0=E6=9C=AC=E5=9C=B0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=8A=98=E6=89=A3=E9=85=8D=E7=BD=AE=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerdiscount/CustomerDiscountService.java | 10 +++++++--- .../ssjygl/customer/CustomerDiscountController.java | 3 +-- .../main/java/com/cowr/local/ssjygl/main/Config.java | 6 ++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountService.java index f34ebf3..ae549da 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountService.java @@ -23,7 +23,11 @@ public class CustomerDiscountService extends BaseService { private static final Log log = Log.getLog(CustomerDiscountService.class); public static final CustomerDiscountService me = new CustomerDiscountService(); - public Page find(PageParam pp,String customerId,String customerName,String stm,String etm) { + public Page findLocal(PageParam pp, String customerId, String customerName, String stm, String etm) { + return find(pp, customerId, customerName, stm, etm); + } + + public Page find(PageParam pp, String customerId, String customerName, String stm, String etm) { String selectsql = "select t.*,cu.name create_name,uu.name update_name,c.name customer_name "; String fromsql = "from customer_discount t" + " left join customer c on t.customer_id = c .id" + @@ -40,7 +44,7 @@ public class CustomerDiscountService extends BaseService { if (customerName != null) { fromsql += " and c.name like ? \n"; - paraList.add("%"+ customerName + "%"); + paraList.add("%" + customerName + "%"); } if (StrKit.notBlank(stm)) { @@ -66,7 +70,7 @@ public class CustomerDiscountService extends BaseService { } else { findSql += " " + Const.ORDER_BY_DESC; } - }else{ + } else { findSql += " order by t.id desc"; } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerDiscountController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerDiscountController.java index e0b942a..92d41f9 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerDiscountController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerDiscountController.java @@ -21,13 +21,12 @@ public class CustomerDiscountController extends Controller { */ public void find(){ - PageParam pp = getBean(PageParam.class, "", true); String customerId = get("customerId"); String customerName = get("customerName"); String stm = get("stm"); String etm = get("etm"); - renderJson(Result.object(CustomerDiscountService.me.find(pp,customerId,customerName,stm,etm))); + renderJson(Result.object(CustomerDiscountService.me.findLocal(pp,customerId,customerName,stm,etm))); } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index a16d140..a96a7fd 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -13,6 +13,7 @@ import com.cowr.local.ssjygl.authlicense.AuthLicenseSyncService; import com.cowr.local.ssjygl.blacklist.BlacklistController; import com.cowr.local.ssjygl.cache.CacheController; import com.cowr.local.ssjygl.customer.CustomerController; +import com.cowr.local.ssjygl.customer.CustomerDiscountController; import com.cowr.local.ssjygl.customer.contact.CustomerContactController; import com.cowr.local.ssjygl.customer.pact.CustomerPactController; import com.cowr.local.ssjygl.customer.receiver.CustomerReceiverController; @@ -63,19 +64,19 @@ import com.cowr.local.ssjygl.transport.TransportQueryController; import com.cowr.local.ssjygl.transportcompany.TransportCompanyController; import com.cowr.local.ssjygl.truck.TruckController; import com.cowr.local.ssjygl.truck.truckweightlimit.TruckWeightLimitController; -import com.cowr.ssjygl.customer.type.CustomerTypeController; -import com.cowr.ssjygl.truck.weightlimitmodifylog.TruckWeightLimitModifyLogController; import com.cowr.model.Supermarket; import com.cowr.model._MappingKit; import com.cowr.ssjygl.CacheData; import com.cowr.ssjygl.actioncmdlog.ActionCmdLogController; import com.cowr.ssjygl.cctv.CctvController; +import com.cowr.ssjygl.customer.type.CustomerTypeController; import com.cowr.ssjygl.modifylog.ModifyLogController; import com.cowr.ssjygl.stat.invoice.InvoiceUseController; import com.cowr.ssjygl.stat.purchase.OrderPurchaseStatController; import com.cowr.ssjygl.stat.transfer.OrderTransferStatController; import com.cowr.ssjygl.transportcompany.TransportCompanyService; import com.cowr.ssjygl.transprice.TransPriceService; +import com.cowr.ssjygl.truck.weightlimitmodifylog.TruckWeightLimitModifyLogController; import com.jfinal.config.*; import com.jfinal.json.FastJsonFactory; import com.jfinal.kit.PathKit; @@ -214,6 +215,7 @@ public class Config extends JFinalConfig { me.add("/customer/pact", CustomerPactController.class); me.add("/customer/csp", CustomerSupermarketProductController.class); me.add("/customer/type", CustomerTypeController.class); + me.add("/customer/discount", CustomerDiscountController.class); // -- 预付费 me.add("/prepay", PrepayController.class);