server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java
@@ -4,6 +4,7 @@ import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.Constants; import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.HttpsUtil; import com.doumee.dao.business.model.IdentityInfo; import com.doumee.dao.business.model.Orders; import com.doumee.dao.business.model.WithdrawalOrders; @@ -69,14 +70,15 @@ Map<String, TemplateData> m = new HashMap<>(4); m.put("thing2", new TemplateData(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO)?"实名认证":Constants.equalsInteger(identityInfo.getType(),Constants.ONE)?"运货认证":"供餐认证")); m.put("phrase6", new TemplateData(Constants.equalsInteger(identityInfo.getAuditStatus(),Constants.TWO)?"通过":"未通过")); m.put("time12", new TemplateData(DateUtil.getFomartDate(identityInfo.getAuditTime(),"yyyy-MM-dd HH:mm"))); m.put("time12", new TemplateData(DateUtil.formatDate(identityInfo.getAuditTime(),"yyyy-MM-dd HH:mm"))); m.put("thing14", new TemplateData(identityInfo.getAuditRemark())); // wxMsgVO.setPage(mineUrl); wxMsgVO.setPage(mineUrl); wxMsgVO.setData(m); log.info("微信小程序->微信消息通知 认证信息：{}", JSONObject.toJSONString(wxMsgVO)); ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, wxMsgVO, String.class); log.info("微信小程序->微信消息通知 认证信息：{}", JSONObject.toJSONString(responseEntity)); log.error("微信小程序->微信消息通知 认证信息：{}", JSONObject.toJSONString(wxMsgVO)); String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO)); // ResponseEntity<String> responseEntity = // restTemplate.postForEntity(url, wxMsgVO, String.class); log.error("微信小程序->微信消息通知 认证信息：{}", JSONObject.toJSONString(responseEntity)); }catch (WxErrorException wxErrorException){ } @@ -95,9 +97,10 @@ RestTemplate restTemplate = new RestTemplate(); try{ String accessToken = WxMiniConfig.wxMaService.getAccessToken(); log.info("微信小程序->微信消息通知 - 订单取消业务 -> accessToken：{}",accessToken); log.error("微信小程序->微信消息通知 - 订单取消业务 -> accessToken：{}",accessToken); //这里简单起见我们每次都获取最新的access_token（时间开发中，应该在access_token快过期时再重新获取） String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken; log.error("微信小程序->微信消息通知 订单取消业务URL：{}", url); //拼接推送的模版 WxMsgVO wxMsgVO = new WxMsgVO(); //订阅消息模板id @@ -110,20 +113,21 @@ m.put("thing6", new TemplateData(Constants.equalsInteger(cancelType,Constants.ZERO)?"平台取消":Constants.equalsInteger(cancelType,Constants.ONE)?"发单方取消":"接单方取消")); String pageUrl = Constants.equalsInteger(orders.getType(),Constants.orderType.hyd.getKey())?orderDetailFreight: Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())?orderDetailFood:orderDetail; pageUrl.replace("{id}",orders.getId().toString()); pageUrl = pageUrl.replace("{id}",orders.getId().toString()); wxMsgVO.setPage(pageUrl); wxMsgVO.setData(m); if(CollectionUtils.isNotEmpty(openidList)){ for (String openid:openidList) { //用户的openid（要发送给那个用户） wxMsgVO.setTouser(openid); log.info("微信小程序->微信消息通知 订单取消业务：{}", JSONObject.toJSONString(wxMsgVO)); ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, wxMsgVO, String.class); log.info("微信小程序->微信消息通知 订单取消业务：{}", JSONObject.toJSONString(responseEntity)); log.error("微信小程序->微信消息通知 订单取消业务：{}", JSONObject.toJSONString(wxMsgVO)); String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO)); // ResponseEntity<String> responseEntity = // restTemplate.postForEntity(url, wxMsgVO, String.class); log.error("微信小程序->微信消息通知 订单取消业务：{}", JSONObject.toJSONString(responseEntity)); } }else{ log.info("微信小程序->微信消息通知 订单取消业务：{}", "无人员信息"); log.error("微信小程序->微信消息通知 订单取消业务：{}", "无人员信息"); } }catch (WxErrorException wxErrorException){ @@ -144,7 +148,7 @@ RestTemplate restTemplate = new RestTemplate(); try{ String accessToken = WxMiniConfig.wxMaService.getAccessToken(); log.info("微信小程序->微信消息通知 - 接单业务 -> accessToken：{}",accessToken); log.error("微信小程序->微信消息通知 - 接单业务 -> accessToken：{}",accessToken); //这里简单起见我们每次都获取最新的access_token（时间开发中，应该在access_token快过期时再重新获取） String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken; //拼接推送的模版 @@ -159,14 +163,15 @@ m.put("phone_number8", new TemplateData(memberPhone)); String pageUrl = Constants.equalsInteger(orders.getType(),Constants.orderType.hyd.getKey())?orderDetailFreight: Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())?orderDetailFood:orderDetail; pageUrl.replace("{id}",orders.getId().toString()); pageUrl = pageUrl.replace("{id}",orders.getId().toString()); wxMsgVO.setPage(pageUrl); wxMsgVO.setData(m); //用户的openid（要发送给那个用户） log.info("微信小程序->微信消息通知 接单通知：{}", JSONObject.toJSONString(wxMsgVO)); ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, wxMsgVO, String.class); log.info("微信小程序->微信消息通知 接单通知：{}", JSONObject.toJSONString(responseEntity)); log.error("微信小程序->微信消息通知 接单通知：{}", JSONObject.toJSONString(wxMsgVO)); String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO)); // ResponseEntity<String> responseEntity = // restTemplate.postForEntity(url, wxMsgVO, String.class); log.error("微信小程序->微信消息通知 接单通知：{}", JSONObject.toJSONString(responseEntity)); }catch (WxErrorException wxErrorException){ } @@ -178,7 +183,7 @@ RestTemplate restTemplate = new RestTemplate(); try{ String accessToken = WxMiniConfig.wxMaService.getAccessToken(); log.info("微信小程序->微信消息通知 - 订单变更通知 -> accessToken：{}",accessToken); log.error("微信小程序->微信消息通知 - 订单变更通知 -> accessToken：{}",accessToken); //这里简单起见我们每次都获取最新的access_token（时间开发中，应该在access_token快过期时再重新获取） String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken; //拼接推送的模版 @@ -190,17 +195,18 @@ m.put("character_string1", new TemplateData(orders.getCode())); m.put("thing3", new TemplateData("变更订单日期")); //变更后日期：07-23至07-25 m.put("thing5", new TemplateData("变更后日期:" +DateUtil.getFomartDate(orders.getStartDate(),"MM-dd") + "至" +DateUtil.getFomartDate(orders.getEndDate(),"MM-dd"))); m.put("thing5", new TemplateData("变更后日期：" +DateUtil.getFomartDate(orders.getStartDate(),"MM-dd") + "至" +DateUtil.getFomartDate(orders.getEndDate(),"MM-dd"))); String pageUrl = Constants.equalsInteger(orders.getType(),Constants.orderType.hyd.getKey())?orderDetailFreight: Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())?orderDetailFood:orderDetail; pageUrl.replace("{id}",orders.getId().toString()); pageUrl = pageUrl.replace("{id}",orders.getId().toString()); wxMsgVO.setPage(pageUrl); wxMsgVO.setData(m); //用户的openid（要发送给那个用户） log.info("微信小程序->微信消息通知 订单变更通知：{}", JSONObject.toJSONString(wxMsgVO)); ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, wxMsgVO, String.class); log.info("微信小程序->微信消息通知 订单变更通知：{}", JSONObject.toJSONString(responseEntity)); log.error("微信小程序->微信消息通知 订单变更通知：{}", JSONObject.toJSONString(wxMsgVO)); String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO)); // ResponseEntity<String> responseEntity = // restTemplate.postForEntity(url, wxMsgVO, String.class); log.error("微信小程序->微信消息通知 订单变更通知：{}", JSONObject.toJSONString(responseEntity)); }catch (WxErrorException wxErrorException){ } @@ -214,7 +220,7 @@ try{ RestTemplate restTemplate = new RestTemplate(); String accessToken = WxMiniConfig.wxMaService.getAccessToken(); log.info("微信小程序->微信消息通知 - 提现成功通知 -> accessToken：{}",accessToken); log.error("微信小程序->微信消息通知 - 提现成功通知 -> accessToken：{}",accessToken); //这里简单起见我们每次都获取最新的access_token（时间开发中，应该在access_token快过期时再重新获取） String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken; //拼接推送的模版 @@ -230,10 +236,11 @@ wxMsgVO.setPage(balanceUrl); wxMsgVO.setData(m); //用户的openid（要发送给那个用户） log.info("微信小程序->微信消息通知 提现成功通知：{}", JSONObject.toJSONString(wxMsgVO)); ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, wxMsgVO, String.class); log.info("微信小程序->微信消息通知 提现成功通知：{}", JSONObject.toJSONString(responseEntity)); log.error("微信小程序->微信消息通知 提现成功通知：{}", JSONObject.toJSONString(wxMsgVO)); String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO)); // ResponseEntity<String> responseEntity = // restTemplate.postForEntity(url, wxMsgVO, String.class); log.error("微信小程序->微信消息通知 提现成功通知：{}", JSONObject.toJSONString(responseEntity)); }catch (WxErrorException wxErrorException){ } @@ -244,7 +251,7 @@ try{ RestTemplate restTemplate = new RestTemplate(); String accessToken = WxMiniConfig.wxMaService.getAccessToken(); log.info("微信小程序->微信消息通知 - 订单收益通知 -> accessToken：{}",accessToken); log.error("微信小程序->微信消息通知 - 订单收益通知 -> accessToken：{}",accessToken); //这里简单起见我们每次都获取最新的access_token（时间开发中，应该在access_token快过期时再重新获取） String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken; //拼接推送的模版 @@ -260,11 +267,12 @@ m.put("date7", new TemplateData(DateUtil.getFomartDate(new Date(),"yyyy-MM-dd HH:mm:ss"))); wxMsgVO.setPage(balanceUrl); wxMsgVO.setData(m); log.info("微信小程序->微信消息通知 订单收益通知：{}", JSONObject.toJSONString(wxMsgVO)); log.error("微信小程序->微信消息通知 订单收益通知：{}", JSONObject.toJSONString(wxMsgVO)); //用户的openid（要发送给那个用户） ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, wxMsgVO, String.class); log.info("微信小程序->微信消息通知 订单收益通知：{}", JSONObject.toJSONString(responseEntity)); String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO)); // ResponseEntity<String> responseEntity = // restTemplate.postForEntity(url, wxMsgVO, String.class); log.error("微信小程序->微信消息通知 订单收益通知：{}", JSONObject.toJSONString(responseEntity)); }catch (WxErrorException wxErrorException){ } @@ -275,7 +283,7 @@ try{ RestTemplate restTemplate = new RestTemplate(); String accessToken = WxMiniConfig.wxMaService.getAccessToken(); log.info("微信小程序->微信消息通知 - 服务派单 -> accessToken：{}",accessToken); log.error("微信小程序->微信消息通知 - 服务派单 -> accessToken：{}",accessToken); //这里简单起见我们每次都获取最新的access_token（时间开发中，应该在access_token快过期时再重新获取） String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken; //拼接推送的模版 @@ -291,14 +299,15 @@ m.put("thing12", new TemplateData("工单将于"+DateUtil.getFomartDate(orders.getStartDate(),"MM-dd")+"开始")); String pageUrl = Constants.equalsInteger(orders.getType(),Constants.orderType.hyd.getKey())?orderDetailFreight: Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())?orderDetailFood:orderDetail; pageUrl.replace("{id}",orders.getId().toString()); pageUrl = pageUrl.replace("{id}",orders.getId().toString()); wxMsgVO.setPage(pageUrl); wxMsgVO.setData(m); log.info("微信小程序->微信消息通知 服务派单：{}", JSONObject.toJSONString(wxMsgVO)); log.error("微信小程序->微信消息通知 服务派单：{}", JSONObject.toJSONString(wxMsgVO)); //用户的openid（要发送给那个用户） ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, wxMsgVO, String.class); log.info("微信小程序->微信消息通知 服务派单：{}", JSONObject.toJSONString(responseEntity)); String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO)); // ResponseEntity<String> responseEntity = // restTemplate.postForEntity(url, wxMsgVO, String.class); log.error("微信小程序->微信消息通知 服务派单：{}", JSONObject.toJSONString(responseEntity)); }catch (WxErrorException wxErrorException){ } server/services/src/main/java/com/doumee/dao/business/MemberMapper.java
@@ -2,11 +2,28 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.doumee.dao.business.model.Member; import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.math.BigDecimal; import java.util.List; /** * @author 江蹄蹄 * @date 2025/07/09 12:00 */ public interface MemberMapper extends BaseMapper<Member> { public interface MemberMapper extends MPJBaseMapper<Member> { @Select(" select * , " + " ifnull((select r.level from receive_weight r where r.RECEIVE_MAX > RECEIVE_NUM and RECEIVE_NUM > r.RECEIVE_MIN limit 1 ),0) as level ," + " 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) as distance " + " from member " + " where id in ( " + " select ii.member_id from identity_info ii where ii.AUDIT_STATUS = 2 and type = #{orderType} " + " and ( CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( #{lgt}, #{lat} )) /1000,DECIMAL(15,2))) < 100 " + " )" + " order by level , score desc , distance asc ") List<Member> getList(@Param("lgt") BigDecimal lgt, @Param("lat") BigDecimal lat, @Param("orderType") Integer orderType); } server/services/src/main/java/com/doumee/dao/business/model/Orders.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; @@ -100,14 +101,13 @@ private String supplement; @ApiModelProperty(value = "费用标准", example = "1") private Long price; private BigDecimal price; @ApiModelProperty(value = "预估费用", example = "1") private Long estimatedAccount; @ApiModelProperty(value = "实际支付费用", example = "1") private Long payAccount; @ApiModelProperty(value = "实收费用", example = "1") private Long receiveAccount; @@ -253,6 +253,9 @@ @TableField(exist = false) private Integer queryMyOrderType; @Schema(description ="修改确认倒计时") @TableField(exist = false) private Long confirmCountdown; @ApiModelProperty(value = "需求类型") @TableField(exist = false) server/services/src/main/java/com/doumee/service/business/AliSmsService.java
@@ -52,10 +52,10 @@ Constants.smsContent smsContent = Constants.smsContent.getSmsContent(type); Map<String,Object> tempParam = new HashMap<>(); if(smsContent.getName().indexOf("time1")>=Constants.ZERO){ tempParam.put("time1", DateUtil.formatDate(orders.getStartDate(),"MM-dd")); tempParam.put("time1", DateUtil.formatDate(orders.getStartDate(),"yyyy-MM-dd")+" "); } if(smsContent.getName().indexOf("time2")>=Constants.ZERO){ tempParam.put("time2", DateUtil.formatDate(orders.getEndDate(),"MM-dd")); tempParam.put("time2", " "+DateUtil.formatDate(orders.getEndDate(),"yyyy-MM-dd")); } if(smsContent.getName().indexOf("money")>=Constants.ZERO){ tempParam.put("money", new BigDecimal(orders.getReceiveAccount().toString()).divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP)+"元"); server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
@@ -162,6 +162,7 @@ if(!Constants.equalsInteger(model.getAuditStatus(),Constants.THREE)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"当前状态无法进行该操作"); } identityInfo.setAuditRemark(""); identityInfo.setUpdateTime(new Date()); identityInfo.setAuditStatus(Constants.ONE); identityInfoMapper.updateById(identityInfo); server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -313,7 +313,7 @@ member.setOpenid(wxPhoneRequest.getOpenid()); member.setTelephone(mobile); member.setNickName(mobile); member.setCoverImage("1.png"); // member.setCoverImage("1.png"); member.setWorkerIdentity(Constants.ZERO); member.setDriverIdentity(Constants.ZERO); member.setChefIdentity(Constants.ZERO); 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,
