From 367281413e2120cb9192a2ec9ecbc49c4331b6af Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 27 八月 2025 18:16:32 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/config/jwt/WebMvcConfig.java | 2
server/services/src/main/java/com/doumee/dao/dto/CateringDTO.java | 3 +
server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java | 36 ++++-------
server/admin/src/main/java/com/doumee/api/business/MemberController.java | 25 ++++++++
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 47 +++++++++++----
server/services/src/main/java/com/doumee/dao/business/model/Member.java | 57 +++++++-----------
server/admin/src/main/java/com/doumee/config/quartz/JobInitializer.java | 3
server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java | 7 +-
8 files changed, 105 insertions(+), 75 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/MemberController.java b/server/admin/src/main/java/com/doumee/api/business/MemberController.java
index 19385dd..ded2490 100644
--- a/server/admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -3,20 +3,25 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.constants.Constants;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.MemberService;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* @author 姹熻箘韫�
@@ -78,7 +83,25 @@
@PostMapping("/exportExcel")
@RequiresPermissions("business:member:exportExcel")
public void exportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(Member.class).export(memberService.findPage(pageWrap).getRecords(), "浼氬憳淇℃伅琛�", response);
+ List<Member> memberList = memberService.findPage(pageWrap).getRecords();
+ if(CollectionUtils.isNotEmpty(memberList)){
+ for (Member m:memberList) {
+ m.setAmountYuan(Objects.nonNull(m.getAmount())&&m.getAmount()> Constants.ZERO? new BigDecimal(m.getAmount()+"").divide(new BigDecimal("100"),2,BigDecimal.ROUND_UP):BigDecimal.ZERO);
+ List<String> identityInfo = new ArrayList<>();
+ if(Constants.equalsInteger(m.getWorkerIdentity(),Constants.TWO)){
+ identityInfo.add("宸ヤ汉");
+ }
+ if(Constants.equalsInteger(m.getDriverIdentity(),Constants.TWO)){
+ identityInfo.add("鍙告満");
+ }
+ if(Constants.equalsInteger(m.getChefIdentity(),Constants.TWO)){
+ identityInfo.add("渚涢");
+ }
+ m.setIdentityApplyInfo(StringUtils.join(identityInfo,","));
+ m.setIdentityInfo("鍙戝崟鏂�" + (StringUtils.isNotBlank(m.getIdentityApplyInfo())?" | 鎺ュ崟鏂�":""));
+ }
+ }
+ ExcelExporter.build(Member.class).export(memberList, "浼氬憳淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
diff --git a/server/admin/src/main/java/com/doumee/config/quartz/JobInitializer.java b/server/admin/src/main/java/com/doumee/config/quartz/JobInitializer.java
index ead56e0..dfc3d69 100644
--- a/server/admin/src/main/java/com/doumee/config/quartz/JobInitializer.java
+++ b/server/admin/src/main/java/com/doumee/config/quartz/JobInitializer.java
@@ -12,6 +12,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.annotation.PostConstruct;
import java.util.List;
/**
@@ -38,7 +39,7 @@
/**
* 鍒濆鍖朖obs
*/
-// @PostConstruct
+ @PostConstruct
public void initJobs () {
log.debug("Initializing jobs");
// 淇JOB
diff --git a/server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java b/server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
index 47d22e5..8e361d5 100644
--- a/server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
+++ b/server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
@@ -76,7 +76,7 @@
public void refreshToken(String token,Member member) {
try {
if(Objects.nonNull(member)){
- redisTemplate.expire(Constants.REDIS_TOKEN_KEY+token,jwtProperties.getExpiration(), TimeUnit.MILLISECONDS);
+// redisTemplate.expire(Constants.REDIS_TOKEN_KEY+token,jwtProperties.getExpiration(), TimeUnit.MILLISECONDS);
// redisTemplate.delete(Constants.REDIS_TOKEN_KEY+token);
// redisTemplate.opsForValue().set(Constants.REDIS_TOKEN_KEY+token,JSONObject.toJSONString(member),jwtProperties.getExpiration(), TimeUnit.MILLISECONDS);
}
@@ -114,8 +114,9 @@
.setExpiration(expirationDate)
.signWith(SignatureAlgorithm.HS512, jwtProperties.getSecret())
.compact();
- redisTemplate.opsForValue().set(Constants.REDIS_TOKEN_KEY+token,JSONObject.toJSONString(member),
- jwtProperties.getExpiration(), TimeUnit.MILLISECONDS);
+ redisTemplate.opsForValue().set(Constants.REDIS_TOKEN_KEY+token,JSONObject.toJSONString(member)
+// , jwtProperties.getExpiration(), TimeUnit.MILLISECONDS
+ );
return token;
}
diff --git a/server/services/src/main/java/com/doumee/config/jwt/WebMvcConfig.java b/server/services/src/main/java/com/doumee/config/jwt/WebMvcConfig.java
index db9c192..a52062a 100644
--- a/server/services/src/main/java/com/doumee/config/jwt/WebMvcConfig.java
+++ b/server/services/src/main/java/com/doumee/config/jwt/WebMvcConfig.java
@@ -89,7 +89,7 @@
}
Integer count = dao.queryForObject("select count(1) from member where id = ?", Integer.class, member.getId());
if (count != null && count > 0) {
- jwtTokenUtil.refreshToken(token,member);
+// jwtTokenUtil.refreshToken(token,member);
request.setAttribute(JwtTokenUtil.MEMBER_INFO, JSONObject.toJSONString(member));
request.setAttribute(JwtTokenUtil.MEMBER_ID, member.getId());
return true;
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java b/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
index 9e29c9d..f8f5a40 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
@@ -25,105 +25,95 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
private Integer deleted;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ @ExcelColumn(name="鐢宠鏃堕棿",index = 10,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "绫诲瀷:0=鐢ㄥ伐韬唤锛�1=璐ц繍韬唤锛�2=渚涢韬唤锛�", example = "1")
- @ExcelColumn(name="绫诲瀷:0=鐢ㄥ伐韬唤锛�1=璐ц繍韬唤锛�2=渚涢韬唤锛�")
+ @ExcelColumn(name="绫诲瀷",valueMapping = "0=鐢ㄥ伐韬唤;1=璐ц繍韬唤;2=渚涢韬唤;",index = 4,width = 10)
private Integer type;
@ApiModelProperty(value = "浼氬憳涓婚敭", example = "1")
- @ExcelColumn(name="浼氬憳涓婚敭")
private Integer memberId;
@ApiModelProperty(value = "璁よ瘉绫诲瀷:0=涓汉锛�1=浼佷笟", example = "1")
- @ExcelColumn(name="璁よ瘉绫诲瀷:0=涓汉锛�1=浼佷笟")
+ @ExcelColumn(name="璁よ瘉绫诲瀷",valueMapping = "0=涓汉;1=浼佷笟;",index = 5,width = 10)
private Integer authType;
@ApiModelProperty(value = "鑱旂郴浜�")
- @ExcelColumn(name="鑱旂郴浜�")
+ @ExcelColumn(name="鑱旂郴浜�",index = 6,width = 10)
private String linkName;
@ApiModelProperty(value = "鑱旂郴鏂瑰紡")
- @ExcelColumn(name="鑱旂郴鏂瑰紡")
+ @ExcelColumn(name="鑱旂郴鏂瑰紡",index = 7,width = 10)
private String telephone;
@ApiModelProperty(value = "鎺ュ崟浣嶇疆")
- @ExcelColumn(name="鎺ュ崟浣嶇疆")
+ @ExcelColumn(name="鎺ュ崟浣嶇疆",index = 8,width = 20)
private String location;
@ApiModelProperty(value = "鍗曚綅鍚嶇О")
- @ExcelColumn(name="鍗曚綅鍚嶇О")
+ @ExcelColumn(name="鍗曚綅鍚嶇О",index = 9,width = 10)
private String companyName;
@ApiModelProperty(value = "绾害", example = "1")
- @ExcelColumn(name="绾害")
private BigDecimal lat;
@ApiModelProperty(value = "缁忓害", example = "1")
- @ExcelColumn(name="缁忓害")
private BigDecimal lgt;
@ApiModelProperty(value = "韬唤璇佷汉鍍忛潰/钀ヤ笟鎵х収")
- @ExcelColumn(name="韬唤璇佷汉鍍忛潰/钀ヤ笟鎵х収")
private String img1;
@ApiModelProperty(value = "韬唤璇佸浗寰介潰/閬撹矾浜ら�氳惀杩愯鍙瘉/椋熷搧缁忚惀璁稿彲璇�")
- @ExcelColumn(name="韬唤璇佸浗寰介潰/閬撹矾浜ら�氳惀杩愯鍙瘉/椋熷搧缁忚惀璁稿彲璇�")
private String img2;
@ApiModelProperty(value = "浠庝笟浜哄憳鍋ュ悍璇�")
- @ExcelColumn(name="浠庝笟浜哄憳鍋ュ悍璇�")
private String img3;
@ApiModelProperty(value = "鍏朵粬璁よ瘉璧勬枡")
- @ExcelColumn(name="鍏朵粬璁よ瘉璧勬枡")
private String img4;
@ApiModelProperty(value = "璁よ瘉瀹℃壒鐘舵��:1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1")
- @ExcelColumn(name="璁よ瘉瀹℃壒鐘舵��:1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�")
+ @ExcelColumn(name="瀹℃牳鐘舵��",valueMapping = "1=鐢宠涓�;2=宸查�氳繃;3=鏈�氳繃;",index = 1,width = 10)
private Integer auditStatus;
@ApiModelProperty(value = "璁よ瘉瀹℃壒鏃堕棿")
- @ExcelColumn(name="璁よ瘉瀹℃壒鏃堕棿")
+ @ExcelColumn(name="璁よ瘉瀹℃壒鏃堕棿",index = 12,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
private Date auditTime;
@ApiModelProperty(value = "璁よ瘉瀹℃壒澶囨敞")
- @ExcelColumn(name="璁よ瘉瀹℃壒澶囨敞")
+ @ExcelColumn(name="璁よ瘉瀹℃壒澶囨敞",index = 13,width = 16)
private String auditRemark;
@ApiModelProperty(value = "瀹℃牳浜哄鍚�")
@TableField(exist = false)
+ @ExcelColumn(name="瀹℃牳浜哄鍚�",index = 11,width = 10)
private String editorName;
@ApiModelProperty(value = "鐢ㄦ埛openid")
+ @ExcelColumn(name="openid",index = 2,width = 20)
@TableField(exist = false)
private String openid;
@ApiModelProperty(value = "鐢ㄦ埛鏄电О")
+ @ExcelColumn(name="浼氬憳鏄电О",index = 3,width = 10)
@TableField(exist = false)
private String memberName;
@ApiModelProperty(value = "鍥剧墖闆嗗悎")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Member.java b/server/services/src/main/java/com/doumee/dao/business/model/Member.java
index 474874c..03ff91f 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Member.java
@@ -26,139 +26,112 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
private Integer deleted;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @ExcelColumn(name="娉ㄥ唽鏃堕棿",index = 8,width = 16, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "澶村儚")
- @ExcelColumn(name="澶村儚")
private String coverImage;
@ApiModelProperty(value = "openid")
- @ExcelColumn(name="openid")
+ @ExcelColumn(name="openid",index = 1,width = 20)
private String openid;
@ApiModelProperty(value = "鏄电О")
- @ExcelColumn(name="鏄电О")
+ @ExcelColumn(name="鏄电О",index = 3,width = 10)
private String nickName;
@ApiModelProperty(value = "鑱旂郴鐢佃瘽")
- @ExcelColumn(name="鑱旂郴鐢佃瘽")
+ @ExcelColumn(name="鎵嬫満鍙�",index = 2,width = 10)
private String telephone;
@ApiModelProperty(value = "濮撳悕")
- @ExcelColumn(name="濮撳悕")
+ @ExcelColumn(name="鐪熷疄濮撳悕",index = 4,width = 10)
private String name;
@ApiModelProperty(value = "鐢ㄥ伐韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1")
- @ExcelColumn(name="鐢ㄥ伐韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�")
private Integer workerIdentity;
@ApiModelProperty(value = "璐ц繍韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1")
- @ExcelColumn(name="璐ц繍韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�")
private Integer driverIdentity;
- @ApiModelProperty(value = "渚涢寰堢矇:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1")
- @ExcelColumn(name="渚涢寰堢矇:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�")
+ @ApiModelProperty(value = "渚涢韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1")
private Integer chefIdentity;
@ApiModelProperty(value = "褰撳墠浣欓(鍗曚綅:鍒�)", example = "1")
- @ExcelColumn(name="褰撳墠浣欓(鍗曚綅:鍒�)")
private Long amount;
@ApiModelProperty(value = "鍘嗗彶鎬婚噾棰�(鍗曚綅:鍒�)", example = "1")
- @ExcelColumn(name="鍘嗗彶鎬婚噾棰�(鍗曚綅:鍒�)")
private Long totalAmount;
@ApiModelProperty(value = "鐘舵��", example = "1")
- @ExcelColumn(name="鐘舵��")
private Integer status;
@ApiModelProperty(value = "鏈�鍚庣櫥褰曟椂闂�")
- @ExcelColumn(name="鏈�鍚庣櫥褰曟椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date loginTime;
@ApiModelProperty(value = "鎬荤櫥褰曟鏁�", example = "1")
- @ExcelColumn(name="鎬荤櫥褰曟鏁�")
private Long loginTimes;
@ApiModelProperty(value = "鎬绘帴鍗曢噺", example = "1")
- @ExcelColumn(name="鎬绘帴鍗曢噺")
private Long receiveNum;
@ApiModelProperty(value = "鎬诲彂鍗曢噺", example = "1")
- @ExcelColumn(name="鎬诲彂鍗曢噺")
private Long publishNum;
@ApiModelProperty(value = "璇勫垎", example = "1")
- @ExcelColumn(name="璇勫垎")
private BigDecimal score;
@ApiModelProperty(value = "璇勫垎鎬绘暟", example = "1")
- @ExcelColumn(name="璇勫垎鎬绘暟")
private BigDecimal totalScore;
@ApiModelProperty(value = "琚瘎浠锋�昏鍗曟暟", example = "1")
- @ExcelColumn(name="琚瘎浠锋�昏鍗曟暟")
private Integer scoreOrderNum;
@ApiModelProperty(value = "瀹氫綅鍦板潃")
- @ExcelColumn(name="瀹氫綅鍦板潃")
private String location;
@ApiModelProperty(value = "绾害", example = "1")
- @ExcelColumn(name="绾害")
private BigDecimal lat;
@ApiModelProperty(value = "缁忓害", example = "1")
- @ExcelColumn(name="缁忓害")
private BigDecimal lgt;
@ApiModelProperty(value = "鐪佷唤")
- @ExcelColumn(name="鐪佷唤")
private String province;
@ApiModelProperty(value = "鍩庡競")
- @ExcelColumn(name="鍩庡競")
private String city;
@ApiModelProperty(value = "鍖哄幙")
- @ExcelColumn(name="鍖哄幙")
private String area;
@ApiModelProperty(value = "鏄惁鎺ュ彈鑷姩娲惧崟:0=鍚︼紱1=鏄紱", example = "1")
- @ExcelColumn(name="鏄惁鎺ュ彈鑷姩娲惧崟:0=鍚︼紱1=鏄紱")
+ @ExcelColumn(name="鎺ュ彈鑷姩娲惧崟",index = 9,width = 10,valueMapping = "0=鍚�;1=鏄�;")
private Integer autoReceiveStatus;
@ApiModelProperty(value = "褰撳墠浣跨敤韬唤:0=鐢ㄥ伐鍙戝竷鏂�;1=鐢ㄥ伐鎺ュ崟鏂�;", example = "1")
- @ExcelColumn(name="褰撳墠浣跨敤韬唤:0=鐢ㄥ伐鍙戝竷鏂�;1=鐢ㄥ伐鎺ュ崟鏂�;")
private Integer useIdentity;
@ApiModelProperty(value = "鎴戠殑 - 鏁版嵁淇℃伅", example = "1")
@@ -197,4 +170,20 @@
@ApiModelProperty(value = "璺濈", example = "1")
@TableField(exist = false)
private BigDecimal distance;
+
+ @ApiModelProperty(value = "韬唤淇℃伅", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="韬唤",index = 5,width = 10)
+ private String identityInfo;
+
+ @ApiModelProperty(value = "鎺ュ崟璁よ瘉韬唤", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎺ュ崟璁よ瘉韬唤",index = 6,width = 10)
+ private String identityApplyInfo;
+
+ @ApiModelProperty(value = "褰撳墠浣欓锛堝厓锛�", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="褰撳墠浣欓锛堝厓锛�",index = 7,width = 10)
+ private BigDecimal amountYuan;
+
}
diff --git a/server/services/src/main/java/com/doumee/dao/dto/CateringDTO.java b/server/services/src/main/java/com/doumee/dao/dto/CateringDTO.java
index 415e0c1..c79607a 100644
--- a/server/services/src/main/java/com/doumee/dao/dto/CateringDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/dto/CateringDTO.java
@@ -17,6 +17,9 @@
@ApiModel("椁愰ギ鏍囧噯淇℃伅")
public class CateringDTO {
+ @ApiModelProperty(value = "鍒嗙被涓婚敭")
+ private Integer id;
+
@ApiModelProperty(value = "绫诲瀷锛氭棭椁愩�佷腑椁愩�佹櫄椁�")
private String name;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
index 0041ca0..465e7f6 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -33,6 +33,7 @@
import com.wechat.pay.java.service.refund.model.RefundNotification;
import jodd.util.StringUtil;
import lombok.With;
+import lombok.extern.slf4j.Slf4j;
import nonapi.io.github.classgraph.json.Id;
import org.apache.poi.sl.image.ImageHeaderEMF;
import org.checkerframework.checker.units.qual.A;
@@ -54,6 +55,7 @@
* @author 姹熻箘韫�
* @date 2025/07/09 12:00
*/
+@Slf4j
@Service
public class OrdersServiceImpl implements OrdersService {
@@ -297,6 +299,12 @@
}
orders.setWayInfo(JSONObject.toJSONString(orders.getWayInfoDTOList()));
}else{
+ List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda().eq(Category::getDeleted,Constants.ZERO)
+ .eq(Category::getType,Constants.TWO)
+ );
+ if(CollectionUtils.isEmpty(categoryList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"椁愭爣淇℃伅閿欒");
+ }
//鐢ㄩ璁㈠崟
if(CollectionUtils.isEmpty(orders.getCateringDTOList())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -309,6 +317,19 @@
|| Objects.isNull(cateringDTO.getNum())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢ㄩ鏍囧噯鏁版嵁閿欒");
+ }
+ //椁愭爣淇℃伅
+ List<Category> categories = categoryList.stream().filter(i->Constants.equalsInteger(i.getId(),cateringDTO.getId())).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(categories)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢ㄩ鏍囧噯鏁版嵁閿欒锛岃鍒锋柊閲嶈瘯");
+ }
+ Category category = categories.get(Constants.ZERO);
+ List<String> priceList = JSONArray.parseArray(category.getDetail(),String.class );
+ if(CollectionUtils.isEmpty(priceList)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢ㄩ鏍囧噯鏁版嵁閿欒锛岃鍒锋柊閲嶈瘯");
+ }
+ if(priceList.stream().filter(i->((Long.valueOf(i)*100)+"").equals((cateringDTO.getPrice()+""))).collect(Collectors.toList()).size()==Constants.ZERO){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢ㄩ鏍囧噯鏁版嵁閿欒锛岃鍒锋柊閲嶈瘯");
}
sumPrice = sumPrice + (cateringDTO.getPrice() * cateringDTO.getNum()) ;
}
@@ -474,9 +495,9 @@
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(orderLogList)){
for (OrderLog orderLog:orderLogList) {
- if(Constants.equalsInteger(orderLog.getOptUserType(),Constants.ZERO)){
+ if(Constants.equalsInteger(orderLog.getOptUserType(),Constants.ZERO)&& org.apache.commons.lang3.StringUtils.isNotBlank(orders.getReleaseName())){
orderLog.setLogInfo(orderLog.getLogInfo().replace("{userName}",orders.getReleaseName()));
- }else if(Constants.equalsInteger(orderLog.getOptUserType(),Constants.ONE)){
+ }else if(Constants.equalsInteger(orderLog.getOptUserType(),Constants.ONE)&& org.apache.commons.lang3.StringUtils.isNotBlank(orders.getAcceptName())){
orderLog.setLogInfo(orderLog.getLogInfo().replace("{userName}",orders.getAcceptName()));
}
}
@@ -651,15 +672,15 @@
//鏌ヨ鐢ㄦ埛鏄惁鏈夊搴旇韩浠�
if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
if(!Constants.equalsInteger(member.getWorkerIdentity(),Constants.TWO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"韬唤淇℃伅寮傚父锛岃鍓嶅線涓汉涓績杩涜韬唤璁よ瘉!");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎮ㄨ繕鏈敞鍐岃鏈嶅姟锛岃鍓嶅線涓汉淇℃伅涓彁浜ょ敵璇枫��");
}
}else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
if(!Constants.equalsInteger(member.getDriverIdentity(),Constants.TWO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"韬唤淇℃伅寮傚父锛岃鍓嶅線涓汉涓績杩涜韬唤璁よ瘉!");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎮ㄨ繕鏈敞鍐岃鏈嶅姟锛岃鍓嶅線涓汉淇℃伅涓彁浜ょ敵璇枫��");
}
}else{
if(!Constants.equalsInteger(member.getChefIdentity(),Constants.TWO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"韬唤淇℃伅寮傚父锛岃鍓嶅線涓汉涓績杩涜韬唤璁よ瘉!");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎮ㄨ繕鏈敞鍐岃鏈嶅姟锛岃鍓嶅線涓汉淇℃伅涓彁浜ょ敵璇枫��");
}
}
@@ -911,13 +932,13 @@
.eq(Orders::getReleaseMemberId,member.getId()));
//鏌ヨ鍙栨秷娆℃暟
if(totalCancelTimes<=cancelTimes){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠婃棩璁㈠崟涓诲姩鍙栨秷娆℃暟宸茶秴鍑�"+totalCancelTimes+"娆�,鏃犳硶鍙栨秷璁㈠崟,濡傞渶澶勭悊璇疯仈绯诲鏈�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠婃棩璁㈠崟涓诲姩鍙栨秷娆℃暟宸茶秴鍑�"+totalCancelTimes+"娆�,鏃犳硶鍙栨秷璁㈠崟");
}
Integer cancelTimeHour = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RELEASE_CANCEL_TIME).getCode());
Long hours = DateUtil.getBetweenHours(new Date(),orders.getStartDate());
if(hours < cancelTimeHour){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璺濈璁㈠崟寮�濮嬫椂闂翠笉瓒�"+cancelTimeHour+"灏忔椂,鏃犳硶鍙栨秷璁㈠崟锛屽闇�澶勭悊璇疯仈绯诲鏈�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璺濈璁㈠崟寮�濮嬫椂闂翠笉瓒�"+cancelTimeHour+"灏忔椂,鏃犳硶鍙栨秷璁㈠崟");
}
return "浠婃棩杩樺彲涓诲姩鍙栨秷"+(totalCancelTimes-cancelTimes)+"娆★紝鏄惁纭鍙栨秷";
@@ -1761,8 +1782,9 @@
*/
@Override
public void autoGrabOrders(){
+ log.error("婊存淮婊存淮");
String autoConfirmTime = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.AUTO_DISPATCH).getCode();
- List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda()
+ List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO)
.eq(Orders::getStatus,Constants.ONE).eq(Orders::getCommentStatus,Constants.ZERO)
.apply(" DATE_ADD(create_time, INTERVAL "+autoConfirmTime+" MINUTE) < now() ")
.last("limit 100")
@@ -1771,9 +1793,10 @@
BigDecimal lat = orders.getLat();
BigDecimal lgt = orders.getLgt();
//鏌ヨ鑼冨洿鍐呯殑浼氬憳
- List<Member> memberList = memberMapper.selectList(new MPJLambdaWrapper<Member>().selectAll(Member.class)
- .select(" ifnull((select r.level from receive_weight r where r.RECEIVE_MAX > t.RECEIVE_NUM and t.RECEIVE_NUM > r.RECEIVE_MIN limit 1 ),0) " ,Member::getLevel)
- .select( " ifnull( (select CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( "+lgt+", "+lat+" )) /1000,DECIMAL(15,2)) from identity_info ii where ii.AUDIT_STATUS = 2 and type = 0 and ii.member_id = t.ID limit 1 ),0) ",Member::getDistance )
+ List<Member> memberList = memberMapper.selectList(new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .select(" ifnull((select r.level from receive_weight r where r.RECEIVE_MAX > RECEIVE_NUM and RECEIVE_NUM > r.RECEIVE_MIN limit 1 ),0) " ,Member::getLevel)
+ .select( " ifnull( (select CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( "+lgt+", "+lat+" )) /1000,DECIMAL(15,2)) from identity_info ii where ii.AUDIT_STATUS = 2 and type = 0 and ii.member_id = ID limit 1 ),0) ",Member::getDistance )
.apply(" id in (" +
" select ii.member_id from identity_info ii where ii.AUDIT_STATUS = 2 and type = '"+orders.getType()+"' " +
@@ -1804,7 +1827,7 @@
);
//鏇存柊鎺ュ崟閲�
- memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" publish_num = (ifnull(publish_num,0) + 1 )").eq(Member::getId,member.getId()));
+ memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" RECEIVE_NUM = (ifnull(RECEIVE_NUM,0) + 1 )").eq(Member::getId,member.getId()));
//鍒涘缓鎿嶄綔鏃ュ織
Constants.OrdersLog ordersLog = Constants.OrdersLog.AUTO;
--
Gitblit v1.9.3