From 4e334f94828bf9842649cfd91399b6ee00fbeef0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 七月 2025 11:54:01 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java | 1
server/services/src/main/java/com/doumee/dao/business/model/Multifile.java | 3 +
server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java | 1
server/web/src/main/java/com/doumee/api/web/UserApi.java | 4 +
server/services/src/main/java/com/doumee/config/jwt/WebMvcConfig.java | 2
server/services/src/main/java/com/doumee/dao/business/model/WithdrawalOrders.java | 1
server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java | 22 ++++++++++-
server/services/src/main/java/com/doumee/config/shiro/ShiroConfig.java | 2
server/services/src/main/java/com/doumee/dao/business/model/ReceiveWeight.java | 1
server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java | 2 +
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 10 +++++
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 22 +++++-----
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 8 ++-
server/services/src/main/java/com/doumee/dao/business/model/Category.java | 1
server/services/src/main/java/com/doumee/dao/business/model/Member.java | 1
15 files changed, 62 insertions(+), 19 deletions(-)
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 f55b4d5..db9c192 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
@@ -83,7 +83,7 @@
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"闀挎椂闂存湭鎿嶄綔,璇烽噸鏂扮櫥褰�");
}
- Integer isDeleted = dao.queryForObject(" select COALESCE(isdeleted,1) from member where id = ?", Integer.class, member.getId());
+ Integer isDeleted = dao.queryForObject(" select COALESCE(DELETED,1) from member where id = ?", Integer.class, member.getId());
if(isDeleted.equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
}
diff --git a/server/services/src/main/java/com/doumee/config/shiro/ShiroConfig.java b/server/services/src/main/java/com/doumee/config/shiro/ShiroConfig.java
index b4603cb..2c82de1 100644
--- a/server/services/src/main/java/com/doumee/config/shiro/ShiroConfig.java
+++ b/server/services/src/main/java/com/doumee/config/shiro/ShiroConfig.java
@@ -92,7 +92,7 @@
// - 鏀捐swagger
map.put("/doc.html", "anon");
map.put("/webjars/**", "anon");
- map.put("/web/api/**", "anon");
+ map.put("/web/**", "anon");
map.put("/swagger-resources/**", "anon");
map.put("/v2/api-docs/**", "anon");
// - 鍏朵粬鎺ュ彛缁熶竴鎷︽埅
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Category.java b/server/services/src/main/java/com/doumee/dao/business/model/Category.java
index a8a1c4e..06048b0 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Category.java
@@ -24,6 +24,7 @@
@TableName("`category`")
public class Category {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
private Integer id;
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 5cf29cc..82fda4b 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
@@ -23,6 +23,7 @@
@TableName("`identity_info`")
public class IdentityInfo {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
private Integer id;
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 fbbcd18..d041151 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
@@ -24,6 +24,7 @@
@TableName("`member`")
public class Member {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
private Integer id;
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java
index db46db3..5415345 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java
@@ -21,6 +21,8 @@
@ApiModel("浼氬憳鏀舵敮璁板綍")
@TableName("`member_revenue`")
public class MemberRevenue {
+
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
private Integer id;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java b/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
index c3a415f..f09837d 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
@@ -1,6 +1,8 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -18,6 +20,7 @@
@TableName("`multifile`")
public class Multifile {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
private Integer id;
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java b/server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java
index 471c200..23af747 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java
@@ -20,6 +20,7 @@
@TableName("`order_log`")
public class OrderLog {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
private Integer id;
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
index 67a3239..15ba306 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
@@ -25,6 +25,7 @@
@TableName("`orders`")
public class Orders {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
private Integer id;
@@ -210,6 +211,15 @@
@ApiModelProperty(value = "鏀粯鏃堕棿", example = "1")
private Date payTime;
+ @ApiModelProperty(value = "鑱旂郴浜�", example = "1")
+ private String linkPhone;
+
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡", example = "1")
+ private String linkName;
+
+ @ApiModelProperty(value = "杞﹁締瑙勬牸", example = "1")
+ private String carUnit;
+
@ApiModelProperty(value = "鍥剧墖")
@TableField(exist = false)
private List<Multifile> multifileList;
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/ReceiveWeight.java b/server/services/src/main/java/com/doumee/dao/business/model/ReceiveWeight.java
index 13cc708..bf27239 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/ReceiveWeight.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/ReceiveWeight.java
@@ -23,6 +23,7 @@
@TableName("`receive_weight`")
public class ReceiveWeight {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
private Integer id;
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/WithdrawalOrders.java b/server/services/src/main/java/com/doumee/dao/business/model/WithdrawalOrders.java
index 01c042b..02ed5ef 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/WithdrawalOrders.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/WithdrawalOrders.java
@@ -20,6 +20,7 @@
@TableName("`withdrawal_orders`")
public class WithdrawalOrders {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
private Integer id;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
index a9f3b7f..34ae3da 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
@@ -52,6 +52,7 @@
private SystemDictDataBiz systemDictDataBiz;
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(IdentityInfo identityInfo) {
if(Objects.isNull(identityInfo)
|| Objects.isNull(identityInfo.getType())
@@ -71,13 +72,22 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
//鏌ヨ鐢ㄦ埛鏄惁宸插瓨鍦ㄥ綋鍓嶈韩浠�
- if(identityInfoMapper.selectCount(new QueryWrapper<IdentityInfo>().lambda().eq(IdentityInfo::getMemberId,identityInfo.getMemberId())
+ if(identityInfoMapper.selectCount(new QueryWrapper<IdentityInfo>().lambda().eq(IdentityInfo::getDeleted,Constants.ZERO).eq(IdentityInfo::getMemberId,identityInfo.getMemberId())
.eq(IdentityInfo::getType,identityInfo.getType()))>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸插瓨鍦ㄨ韬唤璇峰埛鏂版煡鐪嬶紒");
};
+ identityInfo.setDeleted(Constants.ZERO);
identityInfo.setCreateTime(new Date());
- identityInfo.setAuditStatus(Constants.ZERO);
+ identityInfo.setUpdateTime(identityInfo.getCreateTime());
+ identityInfo.setAuditStatus(Constants.ONE);
identityInfoMapper.insert(identityInfo);
+
+ memberMapper.update(new UpdateWrapper<Member>().lambda()
+ .set(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO),Member::getWorkerIdentity,Constants.ONE)
+ .set(Constants.equalsInteger(identityInfo.getType(),Constants.ONE),Member::getDriverIdentity,Constants.ONE)
+ .set(Constants.equalsInteger(identityInfo.getType(),Constants.TWO),Member::getChefIdentity,Constants.ONE)
+ .eq(Member::getId,identityInfo.getMemberId()));
+
return identityInfo.getId();
}
@@ -101,6 +111,7 @@
}
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void updateById(IdentityInfo identityInfo) {
if(Objects.isNull(identityInfo)
|| Objects.isNull(identityInfo.getId())
@@ -131,11 +142,18 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐘舵�佹棤娉曡繘琛岃鎿嶄綔");
}
identityInfo.setUpdateTime(new Date());
+ identityInfo.setAuditStatus(Constants.ONE);
identityInfoMapper.updateById(identityInfo);
+ memberMapper.update(new UpdateWrapper<Member>().lambda()
+ .set(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO),Member::getWorkerIdentity,Constants.ONE)
+ .set(Constants.equalsInteger(identityInfo.getType(),Constants.ONE),Member::getDriverIdentity,Constants.ONE)
+ .set(Constants.equalsInteger(identityInfo.getType(),Constants.TWO),Member::getChefIdentity,Constants.ONE)
+ .eq(Member::getId,identityInfo.getMemberId()));
}
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void updateLocation(IdentityInfo identityInfo) {
if(Objects.isNull(identityInfo)
|| Objects.isNull(identityInfo.getId())
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 8e21399..9620e6f 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -261,15 +261,15 @@
if(StringUtils.isBlank(code)){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- try {
+// try {
//鑾峰彇寰俊鏁忔劅鏁版嵁
- WxMaJscode2SessionResult session = WxMiniConfig.wxMaService.getUserService().getSessionInfo(code);
- String openId = session.getOpenid();
- String unionId = session.getUnionid();
+// WxMaJscode2SessionResult session = WxMiniConfig.wxMaService.getUserService().getSessionInfo(code);
+ String openId = code ;//session.getOpenid();
+// String unionId = session.getUnionid();
if (StringUtils.isBlank(openId)) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
}
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("openid", openId).eq("isdeleted", Constants.ZERO).last("limit 1"));
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("openid", openId).eq("DELETED", Constants.ZERO).last("limit 1"));
AccountResponse accountResponse = new AccountResponse();
accountResponse.setOpenid(openId);
if(Objects.isNull(member)){
@@ -278,9 +278,9 @@
accountResponse.setToken(jwtTokenUtil.generateToken(member));
accountResponse.setMember(member);
return accountResponse;
- } catch (WxErrorException e) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
- }
+// } catch (WxErrorException e) {
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
+// }
}
@@ -348,7 +348,7 @@
.set(StringUtils.isNotBlank(member.getNickName()),Member::getNickName,member.getNickName())
.set(StringUtils.isNotBlank(member.getName()),Member::getName,member.getName())
.set(StringUtils.isNotBlank(member.getCoverImage()),Member::getCoverImage,member.getCoverImage())
- .set(Objects.nonNull(member.getAutoReceiveStatus()),Member::getCoverImage,member.getAutoReceiveStatus())
+ .set(Objects.nonNull(member.getAutoReceiveStatus()),Member::getAutoReceiveStatus,member.getAutoReceiveStatus())
.set(Member::getUpdateTime,new Date())
.eq(Member::getId,member.getId()));
}
@@ -389,14 +389,14 @@
userCenterVO.setTaskingTotal(Constants.ZERO);
userCenterVO.setDoneTotal(Constants.ZERO);
userCenterVO.setReceiveTotal(Constants.ZERO);
- List<Orders> releaseOrders = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO).eq(Orders::getReleaseMemberId,member));
+ List<Orders> releaseOrders = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO).eq(Orders::getReleaseMemberId,member.getId()));
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(releaseOrders)){
userCenterVO.setReleaseTaskTotal(releaseOrders.size());
userCenterVO.setWaitCommentTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.waitPay.getKey())).collect(Collectors.toList()).size());
userCenterVO.setDoingTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.accept.getKey())).collect(Collectors.toList()).size());
userCenterVO.setWaitCommentTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.doing.getKey())&&Constants.equalsInteger(i.getCommentStatus(),Constants.ZERO)).collect(Collectors.toList()).size());
}
- List<Orders> acceptOrders = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO).eq(Orders::getAcceptMemberId,member));
+ List<Orders> acceptOrders = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO).eq(Orders::getAcceptMemberId,member.getId()));
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(acceptOrders)){
userCenterVO.setReceiveTotal(acceptOrders.size());
userCenterVO.setTaskingTotal(acceptOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.accept.getKey())).collect(Collectors.toList()).size());
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 4e6467d..aa1864e 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
@@ -211,6 +211,7 @@
|| Objects.isNull(orders.getEndDate())
|| StringUtil.isBlank(orders.getLocation())
|| StringUtil.isBlank(orders.getLocationRemark())
+ || StringUtil.isBlank(orders.getLinkPhone())
|| Objects.isNull(orders.getLat())
|| Objects.isNull(orders.getLgt())
|| Objects.isNull(orders.getCategoryId())
@@ -243,6 +244,7 @@
|| Objects.isNull(orders.getTransportNum())
|| StringUtils.isEmpty(orders.getTransportUnit())
|| StringUtils.isEmpty(orders.getLocationEnd())
+ || StringUtils.isEmpty(orders.getCarUnit())
|| Objects.isNull(orders.getLatEnd())
|| Objects.isNull(orders.getLgtEnd())
|| CollectionUtils.isEmpty(orders.getWayInfoDTOList())
@@ -392,12 +394,12 @@
if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
orders.setPriceUnit("鍏�/鏂�");
}else if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
- orders.setPriceUnit("鍏�/浜�*澶�");
+ orders.setPriceUnit("鍏�/浜�/澶�");
}else{
if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
- orders.setPriceUnit("鍏�/浜�*澶�");
+ orders.setPriceUnit("鍏�/浜�/澶�");
}else if(Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
- orders.setPriceUnit("鍏�/浜�*灏忔椂");
+ orders.setPriceUnit("鍏�/浜�/灏忔椂");
}else{
orders.setPriceUnit("鍏�/鏂�");
}
diff --git a/server/web/src/main/java/com/doumee/api/web/UserApi.java b/server/web/src/main/java/com/doumee/api/web/UserApi.java
index ebc7de0..17a7b1a 100644
--- a/server/web/src/main/java/com/doumee/api/web/UserApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/UserApi.java
@@ -133,10 +133,12 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
-
@LoginRequired
@ApiOperation("浣欓鏄庣粏")
@PostMapping("/revenuePage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
public ApiResponse<PageData<MemberRevenue>> revenuePage (@RequestBody PageWrap<MemberRevenue> pageWrap) {
pageWrap.getModel().setMemberId(this.getMemberId());
return ApiResponse.success(memberRevenueService.findPage(pageWrap));
--
Gitblit v1.9.3