From a1188a66f0549522068adde2fee430015077410c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十月 2023 15:48:14 +0800
Subject: [PATCH] 接口整理

---
 server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
index b5d1112..a77d0db 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
@@ -38,8 +38,8 @@
         PricingParam insert = new PricingParam();
         insert.setCreateDate(new Date());
         insert.setCreator(principal.getId());
-        insert.setEditDate(new Date());
-        insert.setEditor(principal.getId());
+//        insert.setEditDate(new Date());
+//        insert.setEditor(principal.getId());
         insert.setIsdeleted(Constants.ZERO);
         insert.setName(pricingParam.getName());
         insert.setStartDate(pricingParam.getStartDate());
@@ -71,9 +71,12 @@
 
     @Override
     public void update(PricingParam pricingParam) {
+
+        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         UpdateWrapper<PricingParam> wrapper = new UpdateWrapper<>();
         wrapper.lambda()
                 .eq(PricingParam::getId,pricingParam.getId())
+                .set(PricingParam::getEditor,principal.getId())
                 .set(PricingParam::getName,pricingParam.getName())
                 .set(PricingParam::getStartDate,pricingParam.getStartDate())
                 .set(PricingParam::getEndDate,pricingParam.getEndDate())
@@ -105,7 +108,7 @@
     @Override
     public PricingParam findOne(PricingParam pricingParam) {
         QueryWrapper<PricingParam> wrapper = new QueryWrapper<>(pricingParam);
-        return pricingParamMapper.selectOne(wrapper);
+        return pricingParamMapper.selectOne(wrapper.last(" limit 1"));
     }
 
     @Override
@@ -140,7 +143,7 @@
             queryWrapper.lambda().eq(PricingParam::getIsdeleted, pageWrap.getModel().getIsdeleted());
         }
         if (pageWrap.getModel().getName() != null) {
-            queryWrapper.lambda().eq(PricingParam::getName, pageWrap.getModel().getName());
+            queryWrapper.lambda().like(PricingParam::getName, pageWrap.getModel().getName());
         }
         if (pageWrap.getModel().getStartDate() != null) {
             queryWrapper.lambda().ge(PricingParam::getStartDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
@@ -159,13 +162,7 @@
         if (pageWrap.getModel().getInfo() != null) {
             queryWrapper.lambda().eq(PricingParam::getInfo, pageWrap.getModel().getInfo());
         }
-        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
-            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
-                queryWrapper.orderByDesc(sortData.getProperty());
-            } else {
-                queryWrapper.orderByAsc(sortData.getProperty());
-            }
-        }
+        queryWrapper.lambda().orderByAsc(PricingParam::getSortnum);
         return PageData.from(pricingParamMapper.selectPage(page, queryWrapper));
     }
 

--
Gitblit v1.9.3