From 58d63637b67a7c565618379268da604e6231fc4c Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 27 八月 2025 18:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 243 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 213 insertions(+), 30 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 985805d..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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.wx.SendWxMessage;
import com.doumee.config.wx.WxMiniConfig;
import com.doumee.config.wx.WxMiniUtilService;
import com.doumee.core.constants.Constants;
@@ -18,6 +19,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.dto.*;
import com.doumee.dao.vo.OrderReleaseVO;
+import com.doumee.service.business.AliSmsService;
import com.doumee.service.business.OrdersService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -31,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;
@@ -45,12 +48,14 @@
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
/**
* 璁㈠崟淇℃伅璁板綍Service瀹炵幇
* @author 姹熻箘韫�
* @date 2025/07/09 12:00
*/
+@Slf4j
@Service
public class OrdersServiceImpl implements OrdersService {
@@ -87,6 +92,12 @@
@Autowired
private WxMiniUtilService wxMiniUtilService;
+ @Autowired
+ private SendWxMessage sendWxMessage;
+
+ @Autowired
+ private AliSmsService aliSmsService;
+
@Resource
private RedisTemplate<String,Object> redisTemplate;
@@ -96,6 +107,11 @@
OrderReleaseVO orderReleaseVO = new OrderReleaseVO();
Object objects = null;
this.initVerification(orders);
+ Member member = memberMapper.selectById(orders.getMember().getId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛淇℃伅寮傚父");
+ }
+
orders.setCreateTime(new Date());
orders.setUpdateTime(orders.getUpdateTime());
orders.setPayStatus(Constants.ZERO);
@@ -120,16 +136,19 @@
}
//鐢ㄩ璁㈠崟
if(Constants.equalsInteger(orders.getType(),Constants.TWO)){
+ orders.setPayAccount(orders.getEstimatedAccount());
+ Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue());
+ orders.setReceiveAccount(orders.getPayAccount() - tcje);
orders.setStatus(Constants.ordersStatus.waitPay.getKey());
orders.setOutTradeNo(UUID.randomUUID().toString().replace("-",""));
- orders.setPayAccount(orders.getEstimatedAccount());
//鍞よ捣鏀粯涓氬姟
- objects = this.getWxPayResponse(orders,orders.getMember().getOpenid());
+ objects = this.getWxPayResponse(orders,member.getOpenid());
orderReleaseVO.setObject(objects);
}else{
orders.setStatus(Constants.ordersStatus.wait.getKey());
}
ordersMapper.insert(orders);
+
orderReleaseVO.setId(orders.getId());
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(orders.getMultifileList())){
List<Multifile> multifileList = orders.getMultifileList();
@@ -147,7 +166,7 @@
multifileMapper.insert(multifileList);
}
//鏇存柊鐢ㄦ埛鍙戝崟閲�
- memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" receive_num = ( receive_num + 1 )").eq(Member::getId,orders.getMember().getId()));
+ memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" PUBLISH_NUM = ( ifnull(PUBLISH_NUM,0) + 1 )").eq(Member::getId,orders.getMember().getId()));
//鍒涘缓鎿嶄綔鏃ュ織
Constants.OrdersLog ordersLog = Constants.OrdersLog.UPLOAD;
@@ -280,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);
@@ -292,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()) ;
}
@@ -457,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()));
}
}
@@ -634,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(),"鎮ㄨ繕鏈敞鍐岃鏈嶅姟锛岃鍓嶅線涓汉淇℃伅涓彁浜ょ敵璇枫��");
}
}
@@ -654,18 +692,28 @@
.set(Orders::getStatus,Constants.ordersStatus.accept.getKey())
);
-
-
//鏇存柊鎺ュ崟閲�
- memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" publish_num = (publish_num + 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.RECEIVE;
this.saveOrderLog(orders,ordersLog,
ordersLog.getInfo(),member.getId(),null);
- //TODO 寰俊鍏紬鍙锋彁閱� 宸叉帴鍗曟彁閱�
+ 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(org.apache.commons.lang3.StringUtils.isNotBlank(member.getOpenid())&&Objects.nonNull(wokerIdentityInfo)){
+ //鍙戦�佸井淇￠�氱煡
+ sendWxMessage.acceptMessage(member.getOpenid(),orders,wokerIdentityInfo.getLinkName(),wokerIdentityInfo.getTelephone());
+ }
+ //鐭俊閫氱煡
+ aliSmsService.businessSendSms(Constants.smsContent.accept.getKey(),member.getTelephone(),orders,null,
+ wokerIdentityInfo,categoryMapper);
}
@@ -747,7 +795,23 @@
this.saveOrderLog(model,ordersLog,
ordersLog.getInfo(),orders.getMember().getId(),null);
- //TODO 閫氱煡鎺ュ崟浜� 璁㈠崟鍙戠敓鍙樻洿
+ //閫氱煡鎺ュ崟浜� 璁㈠崟鍙戠敓鍙樻洿
+ 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);
+ }
+
}
@@ -827,8 +891,12 @@
Constants.OrdersLog ordersLog = Constants.OrdersLog.UPD_DISAGREE;
this.saveOrderLog(orders,ordersLog,
ordersLog.getInfo(),confirmUpdOrderDTO.getMember().getId(),null);
- //TODO 鍙戦�佷笉鍚屾剰鍙樻洿閫氱煡
}
+ //鐭俊閫氱煡
+ aliSmsService.businessSendSms(!Constants.equalsInteger(confirmUpdOrderDTO.getStatus(),Constants.ONE)?
+ Constants.smsContent.agreeUpd.getKey():Constants.smsContent.disAgreeUpd.getKey()
+ ,orders.getLinkPhone(),null,null,
+ null,categoryMapper);
}
@@ -845,6 +913,7 @@
}else{
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴偍鐨勮鍗曟棤娉曡繘琛岃鎿嶄綔");
}
+
}
@@ -863,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)+"娆★紝鏄惁纭鍙栨秷";
@@ -950,8 +1019,6 @@
.set(Orders::getCancelType,Constants.ONE)
.eq(Orders::getId,orders.getId())
);
- //TODO 鍙戝崟鏂瑰彇娑堣鍗曢�氱煡鎺ュ崟鏂�
-
//鍑忓皯鎺ュ崟閲�
memberMapper.update(new UpdateWrapper<Member>().lambda().setSql("receive_num = (receive_num - 1) ").eq(Member::getId,orders.getAcceptMemberId()));
}
@@ -963,8 +1030,26 @@
this.saveOrderLog(orders,ordersLog,
ordersLog.getInfo(),member.getId(),null);
+ List<Member> members = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .and(i->i.eq(Member::getId,orders.getReleaseMemberId()).or().eq(Member::getId,orders.getAcceptMemberId()))
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(members)){
+ List<String> openIdList = members.stream().map(i->i.getOpenid()).collect(Collectors.toList());
+ //鍙戦�佸井淇￠�氱煡
+ sendWxMessage.cancelMessage(openIdList,orders,Constants.ONE);
+ }
-
+ IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
+ .eq(IdentityInfo::getMemberId,orders.getAcceptMemberId())
+ .eq(IdentityInfo::getType,orders.getType())
+ .eq(IdentityInfo::getAuditStatus,Constants.TWO)
+ .last("limit 1")
+ );
+ if(Objects.nonNull(wokerIdentityInfo)){
+ //鐭俊閫氱煡
+ aliSmsService.businessSendSms(Constants.smsContent.releaseCancel.getKey(),wokerIdentityInfo.getTelephone(),orders,null,
+ null,categoryMapper);
+ }
}
@@ -1011,8 +1096,18 @@
this.saveOrderLog(orders,ordersLog,
ordersLog.getInfo(),member.getId(),null);
- //TODO 鎺ュ崟鏂瑰彇娑堣鍗曢�氱煡
+ List<Member> members = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .and(i->i.eq(Member::getId,orders.getReleaseMemberId()).or().eq(Member::getId,orders.getAcceptMemberId()))
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(members)){
+ List<String> openIdList = members.stream().map(i->i.getOpenid()).collect(Collectors.toList());
+ //鍙戦�佸井淇￠�氱煡
+ sendWxMessage.cancelMessage(openIdList,orders,Constants.TWO);
+ }
+ //鐭俊閫氱煡
+ aliSmsService.businessSendSms(Constants.smsContent.receiveCancel.getKey(),member.getTelephone(),orders,null,
+ null,categoryMapper);
}
@@ -1039,6 +1134,11 @@
if(!Constants.equalsInteger(orders.getReleaseMemberId(),doneOrderDTO.getMember().getId())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴偍鐨勮鍗曟棤娉曡繘琛岃鎿嶄綔");
}
+ Member payMember = memberMapper.selectById(doneOrderDTO.getMember().getId());
+ if(Objects.isNull(payMember)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛淇℃伅寮傚父");
+ }
+
OrderReleaseVO orderReleaseVO = new OrderReleaseVO();
orderReleaseVO.setId(orders.getId());
Object object = null;
@@ -1051,7 +1151,7 @@
orders.setOutTradeNo(UUID.randomUUID().toString().replace("-",""));
ordersMapper.updateById(orders);
//鍞よ捣鏀粯涓氬姟
- object = this.getWxPayResponse(orders,doneOrderDTO.getMember().getOpenid());
+ object = this.getWxPayResponse(orders,payMember.getOpenid());
orderReleaseVO.setObject(object);
}else{
orders.setStatus(Constants.ordersStatus.done.getKey());
@@ -1084,6 +1184,22 @@
Constants.OrdersLog ordersLog = Constants.OrdersLog.DONE;
this.saveOrderLog(orders,ordersLog,
ordersLog.getInfo(),doneOrderDTO.getMember().getId(),null);
+
+ sendWxMessage.revenueMessage(member.getOpenid(),orders);
+
+ //鐭俊閫氱煡鎺ュ崟鏂�
+ if(Objects.nonNull(orders.getAcceptMemberId())){
+ IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
+ .eq(IdentityInfo::getMemberId,orders.getAcceptMemberId())
+ .eq(IdentityInfo::getType,orders.getType())
+ .eq(IdentityInfo::getAuditStatus,Constants.TWO)
+ .last("limit 1")
+ );
+ if(Objects.nonNull(wokerIdentityInfo)){
+ aliSmsService.businessSendSms(Constants.smsContent.pay.getKey(),wokerIdentityInfo.getTelephone(),orders,null,
+ null,categoryMapper);
+ }
+ }
}
return orderReleaseVO;
}
@@ -1174,6 +1290,32 @@
Constants.OrdersLog ordersLog = Constants.OrdersLog.SYSTEM_CANCEL;
this.saveOrderLog(orders,ordersLog,
ordersLog.getInfo(),null,loginUserInfo.getId());
+
+ List<Member> members = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .and(i->i.eq(Member::getId,orders.getReleaseMemberId()).or().eq(Member::getId,orders.getAcceptMemberId()))
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(members)){
+ List<String> openIdList = members.stream().map(i->i.getOpenid()).collect(Collectors.toList());
+ //鍙戦�佸井淇￠�氱煡
+ sendWxMessage.cancelMessage(openIdList,orders,Constants.ZERO);
+ }
+ //鐭俊閫氱煡鍙戝崟鏂�
+ aliSmsService.businessSendSms(Constants.smsContent.platformCancel.getKey(),orders.getLinkPhone(),orders,null,
+ null,categoryMapper);
+ //鐭俊閫氱煡鎺ュ崟鏂�
+ if(Objects.nonNull(orders.getAcceptMemberId())){
+ IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
+ .eq(IdentityInfo::getMemberId,orders.getAcceptMemberId())
+ .eq(IdentityInfo::getType,orders.getType())
+ .eq(IdentityInfo::getAuditStatus,Constants.TWO)
+ .last("limit 1")
+ );
+ if(Objects.nonNull(wokerIdentityInfo)){
+ aliSmsService.businessSendSms(Constants.smsContent.platformCancel2.getKey(),wokerIdentityInfo.getTelephone(),orders,null,
+ null,categoryMapper);
+ }
+ }
+
}
@@ -1209,9 +1351,10 @@
.eq(Orders::getId,orders.getId())
);
memberMapper.update(new UpdateWrapper<Member>().lambda()
- .setSql(" score = ( total_score +" + commentDTO.getLevel() + " ) / (score_order_num + 1 )")
- .setSql(" total_score = total_score +" + commentDTO.getLevel())
- .setSql(" score_order_num = score_order_num + 1 " ).eq(Member::getId,orders.getAcceptMemberId())
+ .setSql(" score = ( ifnull(total_score,0) +" + commentDTO.getLevel() + " ) / (ifnull(score_order_num,0) + 1 )")
+ .setSql(" total_score = ifnull(total_score,0) +" + commentDTO.getLevel())
+ .setSql(" score_order_num = ifnull(score_order_num,0) + 1 " )
+ .eq(Member::getId,orders.getAcceptMemberId())
);
//鏃ュ織瀛樺偍
Constants.OrdersLog ordersLog = Constants.OrdersLog.COMMENT;
@@ -1303,7 +1446,22 @@
this.saveOrderLog(orders,ordersLog,
ordersLog.getInfo(),orders.getReleaseMemberId(),null);
- //TODO 閫氱煡鎺ュ崟鏂� 娆鹃」宸插埌璐�
+ // 閫氱煡鎺ュ崟鏂� 娆鹃」宸插埌璐�
+ sendWxMessage.revenueMessage(member.getOpenid(),orders);
+
+ //鐭俊閫氱煡鎺ュ崟鏂�
+ if(Objects.nonNull(orders.getAcceptMemberId())){
+ IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
+ .eq(IdentityInfo::getMemberId,orders.getAcceptMemberId())
+ .eq(IdentityInfo::getType,orders.getType())
+ .eq(IdentityInfo::getAuditStatus,Constants.TWO)
+ .last("limit 1")
+ );
+ if(Objects.nonNull(wokerIdentityInfo)){
+ aliSmsService.businessSendSms(Constants.smsContent.pay.getKey(),wokerIdentityInfo.getTelephone(),orders,null,
+ null,categoryMapper);
+ }
+ }
}
}
@@ -1624,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")
@@ -1634,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()+"' " +
@@ -1650,7 +1810,9 @@
if(CollectionUtils.isEmpty(memberList)){
continue;
}
+
Member member = memberList.get(Constants.ZERO);
+ Member releaseMember = memberMapper.selectById(orders.getReleaseMemberId());
//鑷姩娲惧崟
Orders model = ordersMapper.selectById(orders.getStatus());
if(!Constants.equalsInteger(model.getStatus(),Constants.ONE)){
@@ -1665,13 +1827,34 @@
);
//鏇存柊鎺ュ崟閲�
- memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" publish_num = (publish_num + 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;
this.saveOrderLog(orders,ordersLog,
ordersLog.getInfo(),member.getId(),null);
+ 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(org.apache.commons.lang3.StringUtils.isNotBlank(releaseMember.getOpenid())&&Objects.nonNull(wokerIdentityInfo)){
+ //鍙戦�佸井淇￠�氱煡
+ sendWxMessage.acceptMessage(releaseMember.getOpenid(),orders,wokerIdentityInfo.getLinkName(),wokerIdentityInfo.getTelephone());
+ }
+
+ //閫氱煡鎺ュ崟鏂�
+ sendWxMessage.autoDispatchMessage(member.getOpenid(),orders,GeoUtils.haversineDistance(
+ orders.getLgt().doubleValue(), orders.getLat().doubleValue(),
+ member.getDriverIdentityModel().getLgt().doubleValue(),
+ member.getDriverIdentityModel().getLat().doubleValue()
+ ));
+
+ aliSmsService.businessSendSms(Constants.smsContent.dispatch.getKey(),orders.getLinkPhone(),orders,null,
+ null,categoryMapper);
}
}
--
Gitblit v1.9.3