From 4406bf965a39cf9af71ed822abfce76f64be04f9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 七月 2025 18:17:24 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 5 +
server/web/src/main/java/com/doumee/api/web/UserApi.java | 9 ++
server/web/src/main/java/com/doumee/api/web/OrdersApi.java | 3
server/services/src/main/java/com/doumee/core/constants/Constants.java | 5 +
server/services/src/main/java/com/doumee/dao/vo/UserCenterVO.java | 8 ++
server/services/src/main/java/com/doumee/service/business/MemberService.java | 3
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 46 +++++++----
server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java | 2
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 142 +++++++++++++++++++----------------
9 files changed, 139 insertions(+), 84 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java b/server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java
similarity index 99%
rename from server/web/src/main/java/com/doumee/api/web/PaymentCallback.java
rename to server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java
index 764db1f..b7a6a64 100644
--- a/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java
+++ b/server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java
@@ -1,4 +1,4 @@
-package com.doumee.api.web;
+package com.doumee.api.business;
import com.doumee.config.wx.WxMiniConfig;
import com.doumee.core.model.ApiResponse;
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index e54f6f7..7e8743b 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -44,6 +44,9 @@
public static final String SERVER_INTRODUCE ="SERVER_INTRODUCE" ;
public static final String FEE_STANDARDS ="FEE_STANDARDS" ;
public static final String ABOUT_US ="ABOUT_US" ;
+ public static final String SERVER_PHONE ="SERVER_PHONE" ;
+ public static final String USER_AGREEMENT ="USER_AGREEMENT" ;
+ public static final String PRIVACY_AGREEMENT ="PRIVACY_AGREEMENT" ;
public static final String RELEASE_CANCEL_TIMES ="RELEASE_CANCEL_TIMES" ;
@@ -500,7 +503,7 @@
// 鏅�氭柟娉�
public static String getName(int index) {
- for (OrdersLog c : OrdersLog.values()) {
+ for (workType c : workType.values()) {
if (c.getKey() == index) {
return c.name;
}
diff --git a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
index 526440b..997bd6a 100644
--- a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -2060,6 +2060,11 @@
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
return formatter.format(date);
}
+ public static String getCurrDateTimeShort() {
+ Timestamp date = new Timestamp(System.currentTimeMillis());
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");
+ return formatter.format(date);
+ }
/**
* 寰楀埌褰撳墠鏃ユ湡鏃堕棿,鏍煎紡涓簓yyy-MM-dd.
diff --git a/server/services/src/main/java/com/doumee/dao/vo/UserCenterVO.java b/server/services/src/main/java/com/doumee/dao/vo/UserCenterVO.java
index c759d08..d01f317 100644
--- a/server/services/src/main/java/com/doumee/dao/vo/UserCenterVO.java
+++ b/server/services/src/main/java/com/doumee/dao/vo/UserCenterVO.java
@@ -43,4 +43,12 @@
@ApiModelProperty(value = "鍏充簬鎴戜滑")
private String aboutUs;
+ @ApiModelProperty(value = "鐢ㄦ埛鍗忚")
+ private String userAgreement;
+
+ @ApiModelProperty(value = "闅愮鍗忚")
+ private String privacyAgreement;
+
+ @ApiModelProperty(value = "瀹㈡湇鐢佃瘽 澶氫釜浠�,鍒嗗壊")
+ private String serverPhone;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/MemberService.java b/server/services/src/main/java/com/doumee/service/business/MemberService.java
index 683e5d1..3255553 100644
--- a/server/services/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/services/src/main/java/com/doumee/service/business/MemberService.java
@@ -12,6 +12,7 @@
import com.doumee.dao.business.model.Member;
import com.doumee.dao.dto.WxPhoneRequest;
import com.doumee.dao.vo.AccountResponse;
+import com.doumee.dao.vo.UserCenterVO;
import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.lang3.StringUtils;
@@ -146,4 +147,6 @@
* @return
*/
Member getMemberInfo(Integer memberId);
+
+ UserCenterVO getPlatformAboutUs();
}
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 9620e6f..6602688 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,11 +261,11 @@
if(StringUtils.isBlank(code)){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-// try {
+ try {
//鑾峰彇寰俊鏁忔劅鏁版嵁
-// WxMaJscode2SessionResult session = WxMiniConfig.wxMaService.getUserService().getSessionInfo(code);
- String openId = code ;//session.getOpenid();
-// String unionId = session.getUnionid();
+ WxMaJscode2SessionResult session = WxMiniConfig.wxMaService.getUserService().getSessionInfo(code);
+ String openId = session.getOpenid();
+ String unionId = session.getUnionid();
if (StringUtils.isBlank(openId)) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
}
@@ -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(), "寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
+ }
}
@@ -288,30 +288,30 @@
@Override
public AccountResponse wxAuthPhone(WxPhoneRequest wxPhoneRequest) {
+ if(Objects.isNull(wxPhoneRequest)
+ || StringUtils.isBlank(wxPhoneRequest.getCode())
+ || StringUtils.isBlank(wxPhoneRequest.getOpenid())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
try {
- if(Objects.isNull(wxPhoneRequest)
- || StringUtils.isBlank(wxPhoneRequest.getCode())
- || StringUtils.isBlank(wxPhoneRequest.getOpenid())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
WxMaPhoneNumberInfo userPhoneInfo = WxMiniConfig.wxMaService.getUserService().getPhoneNumber(wxPhoneRequest.getCode());
String mobile = userPhoneInfo.getPhoneNumber();
if(Objects.isNull(mobile)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈幏鍙栧埌鎵嬫満鍙�");
}
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getTelephone,mobile).last("limit 1"));
- member.setOpenid(wxPhoneRequest.getOpenid());
if(Objects.nonNull(member)){
memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getTelephone,mobile)
.set(Member::getOpenid,wxPhoneRequest.getOpenid()).set(Member::getUpdateTime,new Date()).eq(Member::getId,member.getId()));
}else{
member = new Member();
member.setCreateTime(new Date());
+ member.setUpdateTime(member.getCreateTime());
member.setDeleted(Constants.ZERO);
member.setOpenid(wxPhoneRequest.getOpenid());
member.setTelephone(mobile);
member.setNickName(mobile);
- member.setCoverImage("");
+ member.setCoverImage("1.png");
member.setWorkerIdentity(Constants.ZERO);
member.setDriverIdentity(Constants.ZERO);
member.setChefIdentity(Constants.ZERO);
@@ -324,6 +324,7 @@
member.setPublishNum(Constants.ZERO.longValue());
member.setAutoReceiveStatus(Constants.ONE);
member.setUseIdentity(Constants.ZERO);
+ member.setOpenid(wxPhoneRequest.getOpenid());
memberMapper.insert(member);
}
AccountResponse accountResponse = new AccountResponse();
@@ -402,10 +403,6 @@
userCenterVO.setTaskingTotal(acceptOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.accept.getKey())).collect(Collectors.toList()).size());
userCenterVO.setDoneTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.doing.getKey())).collect(Collectors.toList()).size());
}
-
- userCenterVO.setAboutUs(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ABOUT_US).getCode()));
- userCenterVO.setFeeStandards(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FEE_STANDARDS).getCode()));
- userCenterVO.setServerIntroduce(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_INTRODUCE).getCode()));
member.setUserCenterVO(userCenterVO);
return member;
}
@@ -413,6 +410,19 @@
+ @Override
+ public UserCenterVO getPlatformAboutUs(){
+ UserCenterVO userCenterVO = new UserCenterVO();
+ userCenterVO.setAboutUs(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ABOUT_US).getCode()));
+ userCenterVO.setFeeStandards(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FEE_STANDARDS).getCode()));
+ userCenterVO.setServerIntroduce(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_INTRODUCE).getCode()));
+ userCenterVO.setServerPhone(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_PHONE).getCode()));
+ userCenterVO.setUserAgreement(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.USER_AGREEMENT).getCode()));
+ userCenterVO.setPrivacyAgreement(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PRIVACY_AGREEMENT).getCode()));
+ return userCenterVO;
+ }
+
+
}
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 891cdd5..8bd112f 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
@@ -95,7 +95,16 @@
Object objects = null;
this.initVerification(orders);
orders.setCreateTime(new Date());
+ orders.setUpdateTime(orders.getUpdateTime());
orders.setPayStatus(Constants.ZERO);
+ orders.setDeleted(Constants.ZERO);
+ orders.setReleaseMemberId(orders.getMember().getId());
+ //鏌ヨ鎵嬬画璐�
+ Category platformCategory = categoryMapper.selectOne(new QueryWrapper<Category>().lambda().eq(Category::getType,Constants.THREE).eq(Category::getName,orders.getType()).eq(Category::getDeleted,Constants.ZERO).last("limit 1 "));
+ if(Objects.isNull(platformCategory)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈缃钩鍙伴厤缃俊鎭�");
+ }
+ orders.setPlatformRata(new BigDecimal(platformCategory.getDetail()).divide(new BigDecimal("100")));
//璁㈠崟缂栧彿
orders.setCode(this.getNextCode(orders.getType()));
Category category = categoryMapper.selectOne(new QueryWrapper<Category>().lambda()
@@ -132,7 +141,7 @@
multifileMapper.insert(multifileList);
}
//鏇存柊鐢ㄦ埛鍙戝崟閲�
- memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getReceiveNum," (receive_num + 1 )").eq(Member::getId,orders.getMember().getId()));
+ memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" receive_num = ( receive_num + 1 )").eq(Member::getId,orders.getMember().getId()));
//鍒涘缓鎿嶄綔鏃ュ織
Constants.OrdersLog ordersLog = Constants.OrdersLog.UPLOAD;
@@ -215,7 +224,6 @@
|| Objects.isNull(orders.getLat())
|| Objects.isNull(orders.getLgt())
|| Objects.isNull(orders.getCategoryId())
- || Objects.isNull(orders.getTotalDays())
|| (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Objects.isNull(orders.getWorkType()))
|| Objects.isNull(orders.getPriceNum1())
|| Objects.isNull(orders.getEstimatedAccount())
@@ -223,19 +231,20 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if((Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO ))
- || (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO)
- &&Constants.equalsInteger(orders.getCarType(),Constants.TWO))
- || Constants.equalsInteger(orders.getType(),Constants.ONE)
+ if( (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO) &&
+ ( Constants.equalsInteger(orders.getCarType(),Constants.ZERO) || Constants.equalsInteger(orders.getCarType(),Constants.ONE) ))
+ || (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ONE))
){
+ if(Objects.isNull(orders.getPriceNum2())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ }else{
orders.setPriceNum2(Constants.ONE);
}
- if(Objects.isNull(orders.getPriceNum2())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
+ orders.setTotalDays(DateUtil.daysBetweenDates(orders.getEndDate(),orders.getStartDate())+1);
if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
if(Constants.equalsInteger(orders.getWorkType(),Constants.TWO)
- && Objects.isNull(orders.getCarType())){
+ && ( Objects.isNull(orders.getCarType()) ) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
}else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
@@ -527,11 +536,11 @@
if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
if(Objects.nonNull(orders.getPriceNum2())) {
- orders.setOrderContent(orders.getOrderContent() + " | 鐢ㄨ溅" + orders.getPriceNum2() + "澶�");
+ orders.setOrderContent(orders.getOrderContent() + " | 鐢ㄨ溅" + orders.getPriceNum1() + "澶�");
}
}else{
if(Objects.nonNull(orders.getPriceNum2())) {
- orders.setOrderContent(orders.getOrderContent() + " | 鐢ㄨ溅" + orders.getPriceNum2() + "娆�");
+ orders.setOrderContent(orders.getOrderContent() + " | 鐢ㄨ溅" + orders.getPriceNum1() + "娆�");
}
}
}else{
@@ -598,7 +607,7 @@
orders.setStatus(Constants.ordersStatus.accept.getKey());
ordersMapper.updateById(orders);
//鏇存柊鎺ュ崟閲�
- memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getPublishNum," (publish_num + 1 )").eq(Member::getId,member.getId()));
+ memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" publish_num = (publish_num + 1 )").eq(Member::getId,member.getId()));
//鍒涘缓鎿嶄綔鏃ュ織
Constants.OrdersLog ordersLog = Constants.OrdersLog.RECEIVE;
@@ -627,7 +636,7 @@
if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇ユ搷浣�");
}
- if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
+ if(!Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴偍鐨勮鍗曟棤娉曡繘琛岃鎿嶄綔");
}
if(Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){
@@ -655,8 +664,7 @@
if(Objects.isNull(updOrderDataDTO)
|| Objects.isNull(updOrderDataDTO.getOrderId())
|| Objects.isNull(updOrderDataDTO.getStartDate())
- || Objects.isNull(updOrderDataDTO.getEndDate())
- || Objects.isNull(updOrderDataDTO.getTotalDays())){
+ || Objects.isNull(updOrderDataDTO.getEndDate())){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
Orders orders = ordersMapper.selectById(updOrderDataDTO.getOrderId());
@@ -666,7 +674,7 @@
if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇ユ搷浣�");
}
- if(Constants.equalsInteger(orders.getReleaseMemberId(),updOrderDataDTO.getMember().getId())){
+ if(!Constants.equalsInteger(orders.getReleaseMemberId(),updOrderDataDTO.getMember().getId())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴偍鐨勮鍗曟棤娉曡繘琛岃鎿嶄綔");
}
if(Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){
@@ -709,9 +717,7 @@
public Long getTotal(Orders orders){
if(
- (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO )) ||
- (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO)
- &&Constants.equalsInteger(orders.getCarType(),Constants.TWO))
+ (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO ))
|| Constants.equalsInteger(orders.getType(),Constants.ONE)
){
orders.setPriceNum2(Constants.ONE);
@@ -745,7 +751,7 @@
if(!Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟淇敼鐘舵�佸凡娴佽浆锛屾棤娉曡繘琛岃鎿嶄綔");
}
- if(Constants.equalsInteger(orders.getAcceptMemberId(),confirmUpdOrderDTO.getMember().getId())){
+ if(!Constants.equalsInteger(orders.getAcceptMemberId(),confirmUpdOrderDTO.getMember().getId())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴偍鐨勮鍗曟棤娉曡繘琛岃鎿嶄綔");
}
if( Constants.equalsInteger(confirmUpdOrderDTO.getStatus(),Constants.ONE)){
@@ -798,7 +804,7 @@
|| Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜鍙栨秷");
}
- if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
+ if(!Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴偍鐨勮鍗曟棤娉曡繘琛岃鎿嶄綔");
}
//寰呮敮浠樼敤椁愯鍗�/寰呮帴鍗曡鍗曡繘琛屽彇娑�
@@ -891,7 +897,7 @@
if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜鍙栨秷");
}
- if(Constants.equalsInteger(orders.getAcceptMemberId(),member.getId())){
+ if(!Constants.equalsInteger(orders.getAcceptMemberId(),member.getId())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴偍鐨勮鍗曟棤娉曡繘琛岃鎿嶄綔");
}
//鍒ゆ柇鏄惁鍙慨鏀� 宸插彇娑堟鏁� 涓� 鏃堕棿闄愬埗
@@ -950,9 +956,10 @@
if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜鍙栨秷");
}
- if(Constants.equalsInteger(orders.getReleaseMemberId(),doneOrderDTO.getMember().getId())){
+ if(!Constants.equalsInteger(orders.getReleaseMemberId(),doneOrderDTO.getMember().getId())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴偍鐨勮鍗曟棤娉曡繘琛岃鎿嶄綔");
}
+ orders.setPayAccount(doneOrderDTO.getAmount());
Object object = null;
//鐢ㄩ璁㈠崟
if(!Constants.equalsInteger(orders.getType(),Constants.TWO)){
@@ -1012,7 +1019,7 @@
.setSql("receive_num = ifnull(receive_num,0) - 1")
.eq(Member::getId,orders.getAcceptMemberId()));
}
-Date date = new Date();
+ Date date = new Date();
ordersMapper.update(new UpdateWrapper<Orders>().lambda()
.set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
.set(Orders::getUpdateTime,date)
@@ -1175,15 +1182,19 @@
//鎺ュ崟鏂� 鎴戠殑璁㈠崟
queryWrapper.eq(Orders::getAcceptMemberId,model.getMember().getId());
}else{
+ queryWrapper.eq(Orders::getStatus,Constants.ordersStatus.wait.getKey());
//鎺ュ崟澶у巺
- queryWrapper.and(i->
+ queryWrapper.and(Constants.equalsInteger(model.getMember().getWorkerIdentity(),Constants.TWO)||Constants.equalsInteger(model.getMember().getDriverIdentity(),Constants.TWO)||Constants.equalsInteger(model.getMember().getChefIdentity(),Constants.TWO),i->
i.eq(Constants.equalsInteger(model.getMember().getWorkerIdentity(),Constants.TWO),Orders::getType,Constants.ZERO)
.or()
.eq(Constants.equalsInteger(model.getMember().getDriverIdentity(),Constants.TWO),Orders::getType,Constants.ONE)
.or()
.eq(Constants.equalsInteger(model.getMember().getChefIdentity(),Constants.TWO),Orders::getType,Constants.TWO)
);
- queryWrapper.eq(Orders::getStatus,Constants.ONE);
+
+ queryWrapper.apply(!(Constants.equalsInteger(model.getMember().getWorkerIdentity(),Constants.TWO)||Constants.equalsInteger(model.getMember().getDriverIdentity(),Constants.TWO)||Constants.equalsInteger(model.getMember().getChefIdentity(),Constants.TWO))," 1 = 2 "
+ );
+
}
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
@@ -1233,41 +1244,44 @@
//瀹氫綅璺濈
public void getDistance(Member member,Orders orders){
+ try{
+ if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
+ if(Objects.nonNull(member.getWorkerIdentityModel())&&Objects.nonNull(member.getWorkerIdentityModel().getLgt())
+ &&Objects.nonNull(member.getWorkerIdentityModel().getLat())){
+ orders.setDistance(
+ GeoUtils.haversineDistance(
+ orders.getLgt().doubleValue(),orders.getLat().doubleValue(),
+ member.getWorkerIdentityModel().getLgt().doubleValue(),
+ member.getWorkerIdentityModel().getLat().doubleValue()
+ )
+ );
+ }
- if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
- if(Objects.nonNull(member.getWorkerIdentityModel())&&Objects.nonNull(member.getWorkerIdentityModel().getLgt())
- &&Objects.nonNull(member.getWorkerIdentityModel().getLat())){
- orders.setDistance(
- GeoUtils.haversineDistance(
- orders.getLgt().doubleValue(),orders.getLat().doubleValue(),
- member.getWorkerIdentityModel().getLgt().doubleValue(),
- member.getWorkerIdentityModel().getLat().doubleValue()
- )
- );
+ }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
+ if(Objects.nonNull(member.getDriverIdentityModel())&&Objects.nonNull(member.getDriverIdentityModel().getLgt())
+ &&Objects.nonNull(member.getDriverIdentityModel().getLat())) {
+ orders.setDistance(
+ GeoUtils.haversineDistance(
+ orders.getLgt().doubleValue(), orders.getLat().doubleValue(),
+ member.getDriverIdentityModel().getLgt().doubleValue(),
+ member.getDriverIdentityModel().getLat().doubleValue()
+ )
+ );
+ }
+ }else{
+ if(Objects.nonNull(member.getChefIdentityModel())&&Objects.nonNull(member.getChefIdentityModel().getLgt())
+ &&Objects.nonNull(member.getChefIdentityModel().getLat())) {
+ orders.setDistance(
+ GeoUtils.haversineDistance(
+ orders.getLgt().doubleValue(),orders.getLat().doubleValue(),
+ member.getChefIdentityModel().getLgt().doubleValue(),
+ member.getChefIdentityModel().getLat().doubleValue()
+ )
+ );
+ }
}
-
- }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
- if(Objects.nonNull(member.getDriverIdentityModel())&&Objects.nonNull(member.getDriverIdentityModel().getLgt())
- &&Objects.nonNull(member.getDriverIdentityModel().getLat())) {
- orders.setDistance(
- GeoUtils.haversineDistance(
- orders.getLgt().doubleValue(), orders.getLat().doubleValue(),
- member.getDriverIdentityModel().getLgt().doubleValue(),
- member.getDriverIdentityModel().getLat().doubleValue()
- )
- );
- }
- }else{
- if(Objects.nonNull(member.getChefIdentityModel())&&Objects.nonNull(member.getChefIdentityModel().getLgt())
- &&Objects.nonNull(member.getChefIdentityModel().getLat())) {
- orders.setDistance(
- GeoUtils.haversineDistance(
- orders.getLgt().doubleValue(),orders.getLat().doubleValue(),
- member.getChefIdentityModel().getLgt().doubleValue(),
- member.getChefIdentityModel().getLat().doubleValue()
- )
- );
- }
+ }catch (Exception e){
+ orders.setDistance(0L);
}
}
@@ -1321,7 +1335,7 @@
if(!Constants.equalsInteger(type,Constants.ZERO)){
prefix = (Constants.equalsInteger(type,Constants.ONE)?"YH-":"DC-");
}
- prefix = DateUtil.getDate(new Date(),"yyyyMMddHHmmss") +"-";
+ prefix = prefix + DateUtil.getCurrDateTimeShort() +"-";
Integer countNum = (Integer) redisTemplate.opsForValue().get(Constants.RedisKeys.ORDER_CODE);//RedisUtil.getObject(redisTemplate, Constants.RedisKeys.ORDER_CODE, Integer.class);
countNum = Constants.formatIntegerNum(countNum)+1;
@@ -1389,9 +1403,9 @@
);
memberMapper.update(new UpdateWrapper<Member>().lambda()
- .set(Member::getScore," ( total_score +" + Constants.FOUR + " ) / (score_order_num + 1 )")
- .set(Member::getTotalScore," total_score +" + Constants.FOUR)
- .set(Member::getScoreOrderNum," score_order_num + 1 " ).eq(Member::getId,orders.getAcceptMemberId())
+ .setSql(" score = ( ( total_score +" + Constants.FOUR + " ) / (score_order_num + 1 ) ) ")
+ .setSql(" total_score = ( total_score +" + Constants.FOUR + ")")
+ .setSql(" score_order_num = ( score_order_num + 1 ) " ).eq(Member::getId,orders.getAcceptMemberId())
);
//鏃ュ織瀛樺偍
diff --git a/server/web/src/main/java/com/doumee/api/web/OrdersApi.java b/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
index d874b2a..6ca26a2 100644
--- a/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
@@ -167,6 +167,9 @@
@LoginRequired
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
public ApiResponse<PageData<Orders>> findPage (@RequestBody PageWrap<Orders> pageWrap) {
pageWrap.getModel().setMember(this.getMemberResponse());
return ApiResponse.success(ordersService.findPageForMini(pageWrap));
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 17a7b1a..8e97ae8 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
@@ -10,6 +10,7 @@
import com.doumee.dao.business.model.MemberRevenue;
import com.doumee.dao.dto.WxPhoneRequest;
import com.doumee.dao.vo.AccountResponse;
+import com.doumee.dao.vo.UserCenterVO;
import com.doumee.service.business.IdentityInfoService;
import com.doumee.service.business.MemberRevenueService;
import com.doumee.service.business.MemberService;
@@ -46,6 +47,14 @@
@Autowired
private MemberRevenueService memberRevenueService;
+
+ @ApiOperation(value = "鑾峰彇绯荤粺閰嶇疆", notes = "灏忕▼搴忕")
+ @GetMapping("/getPlatformAboutUs")
+ public ApiResponse<UserCenterVO> getPlatformAboutUs() {
+ return ApiResponse.success("鏌ヨ鎴愬姛",memberService.getPlatformAboutUs());
+ }
+
+
@LoginRequired
@ApiOperation(value = "鑾峰彇涓汉淇℃伅", notes = "灏忕▼搴忕")
@GetMapping("/getMemberInfo")
--
Gitblit v1.9.3