From 68c299b6eec83a05e398ec85614b584cb5d7b690 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 09 十一月 2023 15:49:44 +0800
Subject: [PATCH] # 修改自行车明细 排除撤销 lock 图片base64
---
server/platform/src/main/java/com/doumee/api/business/LocksController.java | 6 +++
server/services/src/main/java/com/doumee/dao/business/model/Sites.java | 4 ++
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 2 +
server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java | 10 +++--
server/services/src/main/java/com/doumee/service/business/LocksService.java | 13 +++++-
server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java | 42 +++++++++++++++++++++
6 files changed, 71 insertions(+), 6 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/LocksController.java b/server/platform/src/main/java/com/doumee/api/business/LocksController.java
index 1384608..581f75f 100644
--- a/server/platform/src/main/java/com/doumee/api/business/LocksController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/LocksController.java
@@ -96,4 +96,10 @@
public ApiResponse testMqtt(@RequestBody Locks locks) {
return ApiResponse.success(deviceService.openLock(locks));
}
+
+ @ApiOperation("鑾峰彇閿佹鍣ㄥ皬绋嬪簭浜岀淮鐮�")
+ @GetMapping("/findLockBase")
+ public ApiResponse<List<Locks>> findLockBase64List(Locks locks){
+ return ApiResponse.success(locksService.findLockBase64List(locks));
+ }
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Sites.java b/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
index 33317cf..43ffeaf 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
@@ -93,4 +93,8 @@
@TableField(exist = false)
private BigDecimal rate;
+
+ @ApiModelProperty(value = "鍥剧墖base64")
+ @TableField(exist = false)
+ private String base64;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/LocksService.java b/server/services/src/main/java/com/doumee/service/business/LocksService.java
index 645e38b..c9ae943 100644
--- a/server/services/src/main/java/com/doumee/service/business/LocksService.java
+++ b/server/services/src/main/java/com/doumee/service/business/LocksService.java
@@ -14,7 +14,7 @@
/**
* 鍒涘缓
- *
+ *
* @param locks 瀹炰綋瀵硅薄
* @return String
*/
@@ -78,7 +78,16 @@
* @return List<Locks>
*/
List<Locks> findList(Locks locks);
-
+
+
+ /**
+ * 鏉′欢鏌ヨ
+ *
+ * @param locks 瀹炰綋瀵硅薄
+ * @return List<Locks>
+ */
+ List<Locks> findLockBase64List(Locks locks);
+
/**
* 鍒嗛〉鏌ヨ
*
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
index 22f6c64..b8b7008 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
@@ -1,14 +1,20 @@
package com.doumee.service.business.impl;
+import com.doumee.core.model.LoginUserInfo;
+import com.google.common.collect.Lists;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.core.wx.WxMiniUtilService;
import com.doumee.dao.business.LocksMapper;
import com.doumee.dao.business.join.LocksJoinMapper;
import com.doumee.dao.business.model.BaseParam;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Locks;
import com.doumee.dao.business.model.Sites;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.LocksService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -16,11 +22,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.SitesService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 閿佸ご淇℃伅琛⊿ervice瀹炵幇
@@ -35,6 +46,14 @@
@Autowired
private LocksJoinMapper locksJoinMapper;
+
+
+ @Autowired
+ private WxMiniUtilService wxMiniUtilService;
+
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Override
public String create(Locks locks) {
@@ -94,6 +113,29 @@
}
@Override
+ public List<Locks> findLockBase64List(Locks locks) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ QueryWrapper<Locks> wrapper = new QueryWrapper<>(locks);
+ wrapper.lambda().orderByAsc(Locks::getCode);
+ List<Locks> locksList = locksMapper.selectList(wrapper);
+ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.ACCESS_TOKEN);
+ if (!CollectionUtils.isEmpty(locksList)){
+ // 妫�鏌ユ槸鍚︽湁鍥剧墖淇℃伅娌℃湁鏇存柊淇濆瓨鍥剧墖
+ locksList.forEach(s-> {
+ if (StringUtils.isBlank(s.getInfo())){
+ wxMiniUtilService.generateWXMiniCode(s, systemDictData);
+ s.setEditor(loginUserInfo.getId());
+ s.setEditDate(new Date());
+ updateById(s);
+ }
+ });
+ return locksList;
+ }
+ return new ArrayList<>();
+ }
+
+ @Override
public PageData<Locks> findPage(PageWrap<Locks> pageWrap) {
IPage<Locks> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Locks> queryWrapper = new MPJLambdaWrapper<>();
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
index 97c7d10..1bfd82a 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
@@ -10,6 +10,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.core.wx.WxMiniUtilService;
import com.doumee.dao.business.LocksMapper;
import com.doumee.dao.business.SitesMapper;
import com.doumee.dao.business.model.Locks;
@@ -53,6 +54,7 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
@Override
public String create(Sites sites) {
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java
index 00b01c8..230c0f8 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java
@@ -17,6 +17,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Arrays;
import java.util.List;
/**
@@ -86,7 +87,7 @@
QueryWrapper<WxBillDetail> wrapper = new QueryWrapper<>(wxBillDetail);
return wxBillDetailMapper.selectList(wrapper);
}
-
+
@Override
public PageData<WxBillDetail> findPage(PageWrap<WxBillDetail> pageWrap) {
IPage<WxBillDetail> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -126,9 +127,9 @@
if (pageWrap.getModel().getBillType() != null) {
queryWrapper.lambda().eq(WxBillDetail::getBillType, pageWrap.getModel().getBillType());
}
- if (pageWrap.getModel().getBillStatus() != null) {
- queryWrapper.lambda().eq(WxBillDetail::getBillStatus, pageWrap.getModel().getBillStatus());
- }
+// if (pageWrap.getModel().getBillStatus() != null) {
+// queryWrapper.lambda().eq(WxBillDetail::getBillStatus, pageWrap.getModel().getBillStatus());
+// }
if (pageWrap.getModel().getBankType() != null) {
queryWrapper.lambda().eq(WxBillDetail::getBankType, pageWrap.getModel().getBankType());
}
@@ -188,6 +189,7 @@
if (pageWrap.getModel().getRateRemark() != null) {
queryWrapper.lambda().eq(WxBillDetail::getRateRemark, pageWrap.getModel().getRateRemark());
}
+ queryWrapper.lambda().in(WxBillDetail::getBillStatus, Arrays.asList("SUCCESS","REFUND"));
queryWrapper.lambda().ge(pageWrap.getModel().getStartDate() !=null, WxBillDetail::getPid,DateUtil.getShortDateStr(pageWrap.getModel().getStartDate()));
queryWrapper.lambda().le(pageWrap.getModel().getEndDate() !=null,WxBillDetail::getPid, DateUtil.getShortDateStr(pageWrap.getModel().getEndDate()));
//鑷杞︿氦鏄�
--
Gitblit v1.9.3