From 99e92a155a1b21a8386b482e7aab6fef649aeffa Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 28 八月 2025 17:47:03 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 96 ++++++++++++++++++++++++++++--------------------
1 files changed, 56 insertions(+), 40 deletions(-)
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 465e7f6..e1599db 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
@@ -333,7 +333,7 @@
}
sumPrice = sumPrice + (cateringDTO.getPrice() * cateringDTO.getNum()) ;
}
- if(!sumPrice.equals(orders.getPrice())){
+ if(new BigDecimal(sumPrice.toString()).compareTo(orders.getPrice())!=Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍗曚环璁＄畻閿欒");
}
orders.setWayInfo(JSONObject.toJSONString(orders.getCateringDTOList()));
@@ -706,14 +706,20 @@
.eq(IdentityInfo::getAuditStatus,Constants.TWO)
.last("limit 1")
);
+ Member releaseMember = memberMapper.selectById(orders.getReleaseMemberId());
- if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getOpenid())&&Objects.nonNull(wokerIdentityInfo)){
- //鍙戦�佸井淇￠�氱煡
- sendWxMessage.acceptMessage(member.getOpenid(),orders,wokerIdentityInfo.getLinkName(),wokerIdentityInfo.getTelephone());
+ if(Objects.nonNull(releaseMember)){
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(releaseMember.getOpenid())&&Objects.nonNull(wokerIdentityInfo)){
+ //鍙戦�佸井淇￠�氱煡
+ sendWxMessage.acceptMessage(releaseMember.getOpenid(),orders,wokerIdentityInfo.getLinkName(),wokerIdentityInfo.getTelephone());
+ }
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getLinkPhone())){
+ //鐭俊閫氱煡
+ aliSmsService.businessSendSms(Constants.smsContent.accept.getKey(),orders.getLinkPhone(),orders,null,
+ wokerIdentityInfo,categoryMapper);
+ }
}
- //鐭俊閫氱煡
- aliSmsService.businessSendSms(Constants.smsContent.accept.getKey(),member.getTelephone(),orders,null,
- wokerIdentityInfo,categoryMapper);
+
}
@@ -796,20 +802,25 @@
ordersLog.getInfo(),orders.getMember().getId(),null);
//閫氱煡鎺ュ崟浜� 璁㈠崟鍙戠敓鍙樻洿
- Member member = memberMapper.selectById(orders.getAcceptMemberId());
- //鍙戦�佸井淇￠�氱煡
- sendWxMessage.orderUpdMessage(member.getOpenid(),orders);
-
- IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
- .eq(IdentityInfo::getMemberId,member.getId())
- .eq(IdentityInfo::getType,orders.getType())
- .eq(IdentityInfo::getAuditStatus,Constants.TWO)
- .last("limit 1")
- );
- if(Objects.nonNull(wokerIdentityInfo)){
- //鐭俊閫氱煡
- aliSmsService.businessSendSms(Constants.smsContent.orderUpd.getKey(),wokerIdentityInfo.getTelephone(),orders,null,
- null,categoryMapper);
+ Member member = memberMapper.selectById(model.getAcceptMemberId());
+ if(Objects.nonNull(member)){
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getOpenid())){
+ model.setStartDate(orders.getStartDate());
+ model.setEndDate(orders.getEndDate());
+ //鍙戦�佸井淇￠�氱煡
+ sendWxMessage.orderUpdMessage(member.getOpenid(),model);
+ }
+ IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
+ .eq(IdentityInfo::getMemberId,member.getId())
+ .eq(IdentityInfo::getType,orders.getType())
+ .eq(IdentityInfo::getAuditStatus,Constants.TWO)
+ .last("limit 1")
+ );
+ if(Objects.nonNull(wokerIdentityInfo)){
+ //鐭俊閫氱煡
+ aliSmsService.businessSendSms(Constants.smsContent.orderUpd.getKey(),wokerIdentityInfo.getTelephone(),orders,null,
+ null,categoryMapper);
+ }
}
}
@@ -833,7 +844,8 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
}
- return orders.getPrice() * orders.getPriceNum1() * orders.getPriceNum2();
+ BigDecimal bigDecimalPrice = orders.getPrice().multiply(new BigDecimal(orders.getPriceNum1().toString())).multiply(new BigDecimal(orders.getPriceNum2().toString()));
+ return bigDecimalPrice.divide(new BigDecimal("1"),0,BigDecimal.ROUND_HALF_UP).longValue();//orders.getPrice() * orders.getPriceNum1() * orders.getPriceNum2();
}
@@ -1296,6 +1308,7 @@
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(members)){
List<String> openIdList = members.stream().map(i->i.getOpenid()).collect(Collectors.toList());
+ orders.setCancelTime(new Date());
//鍙戦�佸井淇￠�氱煡
sendWxMessage.cancelMessage(openIdList,orders,Constants.ZERO);
}
@@ -1691,6 +1704,10 @@
}
orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus()));
orders.setCancelStatus(Constants.ZERO);
+ if(Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())&&Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){
+ orders.setConfirmCountdown(DateUtil.getXMinuteAfterDate(orders.getIsUpdateTime(),60).getTime() - System.currentTimeMillis());
+ }
+
this.getPriceUnit(orders);
if(orders.getStatus() <= Constants.ordersStatus.accept.getKey()){
if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
@@ -1782,7 +1799,6 @@
*/
@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().eq(Orders::getDeleted,Constants.ZERO)
.eq(Orders::getStatus,Constants.ONE).eq(Orders::getCommentStatus,Constants.ZERO)
@@ -1793,20 +1809,20 @@
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 > 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()+"' " +
- " and ( CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( "+lgt+", "+lat+" )) /1000,DECIMAL(15,2))) < 100 " +
- ") ")
- .orderByDesc(Member::getLevel)
- .orderByDesc(Member::getScore)
- .orderByAsc(Member::getDistance)
- .last(" limit 1 ")
- );
+ List<Member> memberList = memberMapper.getList(lgt,lat,orders.getType());
+// memberMapper.selectList(new MPJLambdaWrapper<Member>()
+// .select(Member::getId,Member::getScore)
+// .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()+"' " +
+// " and ( CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( "+lgt+", "+lat+" )) /1000,DECIMAL(15,2))) < 100 " +
+// ") ")
+// .orderByDesc(" level , score ")
+// .orderByAsc(Member::getDistance)
+// .last(" limit 1 ")
+// );
if(CollectionUtils.isEmpty(memberList)){
continue;
}
@@ -1814,7 +1830,7 @@
Member member = memberList.get(Constants.ZERO);
Member releaseMember = memberMapper.selectById(orders.getReleaseMemberId());
//鑷姩娲惧崟
- Orders model = ordersMapper.selectById(orders.getStatus());
+ Orders model = ordersMapper.selectById(orders.getId());
if(!Constants.equalsInteger(model.getStatus(),Constants.ONE)){
continue;
}
@@ -1849,8 +1865,8 @@
//閫氱煡鎺ュ崟鏂�
sendWxMessage.autoDispatchMessage(member.getOpenid(),orders,GeoUtils.haversineDistance(
orders.getLgt().doubleValue(), orders.getLat().doubleValue(),
- member.getDriverIdentityModel().getLgt().doubleValue(),
- member.getDriverIdentityModel().getLat().doubleValue()
+ wokerIdentityInfo.getLgt().doubleValue(),
+ wokerIdentityInfo.getLat().doubleValue()
));
aliSmsService.businessSendSms(Constants.smsContent.dispatch.getKey(),orders.getLinkPhone(),orders,null,
--
Gitblit v1.9.3