productDev/jinkuai.git

			@@ -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;
			@@ -17,6 +18,8 @@
			import com.doumee.dao.business.*;
			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;
			@@ -30,9 +33,11 @@
			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;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.data.redis.core.RedisTemplate;
			import org.springframework.stereotype.Service;
			@@ -42,17 +47,17 @@

			import javax.annotation.Resource;
			import java.math.BigDecimal;
			import java.util.Date;
			import java.util.List;
			import java.util.Objects;
			import java.util.UUID;
			import java.math.RoundingMode;
			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 {

			@@ -84,18 +89,43 @@
			private WithdrawalOrdersMapper withdrawalOrdersMapper;

			@Autowired
			private ReceiveWeightMapper receiveWeightMapper;

			@Autowired
			private WxMiniUtilService wxMiniUtilService;

			@Autowired
			private SendWxMessage sendWxMessage;

			@Autowired
			private AliSmsService aliSmsService;

			@Resource
			private RedisTemplate<String,Object> redisTemplate;

			@Override
			@Transactional(rollbackFor = {Exception.class,BusinessException.class})
			public Object create(Orders orders) {
			public OrderReleaseVO create(Orders orders) {
			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);
			orders.setDeleted(Constants.ZERO);
			orders.setReleaseMemberId(orders.getMember().getId());
			orders.setCommentStatus(Constants.ZERO);
			//查询手续费
			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()
			@@ -106,20 +136,30 @@
			if(Objects.isNull(category)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"参数配置错误,请联系管理员");
			}
			orders.setPayAccount(orders.getEstimatedAccount());
			Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue());
			orders.setReceiveAccount(orders.getPayAccount() - tcje);
			//用餐订单
			if(Constants.equalsInteger(orders.getType(),Constants.TWO)){
			orders.setStatus(Constants.ordersStatus.waitPay.getKey());
			orders.setOutTradeNo(UUID.randomUUID().toString().replace("-",""));
			//唤起支付业务
			objects = this.getWxPayResponse(orders,orders.getMember().getOpenid());
			objects = this.getWxPayResponse(orders,member.getOpenid());
			orderReleaseVO.setObject(objects);
			}else{
			orders.setStatus(Constants.ordersStatus.wait.getKey());
			}
			orders.setOriginPriceNum1(orders.getPriceNum1());
			orders.setOriginPriceNum2(orders.getPriceNum2());
			orders.setOriginEstimatedAccount(orders.getEstimatedAccount());
			orders.setConfirmOtherFee(0l);
			ordersMapper.insert(orders);

			orderReleaseVO.setId(orders.getId());
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(orders.getMultifileList())){
			List<Multifile> multifileList = orders.getMultifileList();
			for (Multifile multifile:multifileList) {
			if(Objects.isNull(multifile)
			\|\| Objects.isNull(multifile.getObjType())
			\|\| StringUtils.isEmpty(multifile.getFileurl())
			\|\| StringUtils.isEmpty(multifile.getName())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"附件信息错误");
			@@ -132,11 +172,11 @@
			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(" PUBLISH_NUM = ( ifnull(PUBLISH_NUM,0) + 1 )").eq(Member::getId,orders.getMember().getId()));

			//创建操作日志
			Constants.OrdersLog ordersLog = Constants.OrdersLog.UPLOAD;
			String orderTypeInfo = "用工单";
			String orderTypeInfo = Constants.getOrderInfo(orders);/*"用工单";
			if(!Constants.equalsInteger(orders.getType(),Constants.ZERO)){
			orderTypeInfo = Constants.equalsInteger(orders.getType(),Constants.ONE)?"用车单":"送餐单";
			}else{
			@@ -145,12 +185,12 @@
			}else{
			orderTypeInfo = orderTypeInfo + (Constants.equalsInteger(orders.getWorkType(),Constants.ONE)?"-分拣工":"-包装工");
			}
			}
			}*/
			String logInfo = ordersLog.getInfo()
			.replace("{param}",orderTypeInfo);
			this.saveOrderLog(orders,ordersLog,
			logInfo,orders.getReleaseMemberId(),null);
			return objects;
			return orderReleaseVO;
			}

			private Object getWxPayResponse(Orders orders,String openid){
			@@ -163,13 +203,14 @@
			request.setSpAppid(WxMiniConfig.wxProperties.getAppId());
			request.setSubMchid(WxMiniConfig.wxProperties.getSubMchId());
			request.setSubAppid(WxMiniConfig.wxProperties.getSubAppId());

			Payer payer = new Payer();
			payer.setSubOpenid(openid);
			request.setPayer(payer);
			request.setOutTradeNo(orders.getCode());
			request.setOutTradeNo(orders.getOutTradeNo());
			request.setNotifyUrl(WxMiniConfig.wxProperties.getNotifyUrl());//这个回调url必须是https开头的
			Amount amount = new Amount();
			amount.setTotal(orders.getEstimatedAccount().intValue());
			amount.setTotal(orders.getPayAccount().intValue());
			request.setAmount(amount);
			// PrepayResponse res = WxMiniConfig.wxPayService.prepay(request);
			// 跟之前下单示例一样，填充预下单参数
			@@ -210,11 +251,10 @@
			\|\| Objects.isNull(orders.getStartDate())
			\|\| 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())
			\|\| Objects.isNull(orders.getTotalDays())
			\|\| (!Constants.equalsInteger(orders.getType(),Constants.TWO) && Objects.isNull(orders.getCategoryId()))
			\|\| (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Objects.isNull(orders.getWorkType()))
			\|\| Objects.isNull(orders.getPriceNum1())
			\|\| Objects.isNull(orders.getEstimatedAccount())
			@@ -222,19 +262,24 @@
			){
			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)
			Integer priceNum2 = orders.getPriceNum2();
			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)){
			@@ -243,6 +288,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())
			@@ -252,9 +298,9 @@
			for (WayInfoDTO wayInfoDTO:orders.getWayInfoDTOList()) {
			if(Objects.isNull(wayInfoDTO)
			\|\|StringUtils.isEmpty(wayInfoDTO.getLocation())
			\|\|StringUtils.isEmpty(wayInfoDTO.getProvince())
			\|\|StringUtils.isEmpty(wayInfoDTO.getCity())
			\|\|StringUtils.isEmpty(wayInfoDTO.getArea())
			// \|\|StringUtils.isEmpty(wayInfoDTO.getProvince())
			// \|\|StringUtils.isEmpty(wayInfoDTO.getCity())
			// \|\|StringUtils.isEmpty(wayInfoDTO.getArea())
			\|\|Objects.isNull(wayInfoDTO.getLat())
			\|\|Objects.isNull(wayInfoDTO.getLgt())
			){
			@@ -263,11 +309,18 @@
			}
			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);
			}
			Long sumPrice = 0L;
			// List<CateringDTO> cateringDTOList = new ArrayList<>();
			for (CateringDTO cateringDTO:orders.getCateringDTOList()) {
			if(Objects.isNull(cateringDTO)
			\|\| StringUtils.isEmpty(cateringDTO.getName())
			@@ -276,17 +329,37 @@
			){
			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()) ;

			}
			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()));
			}
			if(!orders.getEstimatedAccount().equals(this.getTotal(orders))){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"金额计算错误!");
			}
			orders.setPriceNum2(priceNum2);
			}






			@@ -311,12 +384,38 @@
			}

			@Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void updateById(Orders orders) {
			public void update(Orders orders){
			if(Objects.isNull(orders)
			\|\| Objects.isNull(orders.getId())){
			\|\| Objects.isNull(orders.getId())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			Orders model = ordersMapper.selectById(orders.getId());
			if(!Constants.equalsInteger(model.getReleaseMemberId(),orders.getMember().getId())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
			}
			if(Constants.equalsInteger(model.getIsUpdate(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单已修改，待接单方确认，无法进行该操作");
			}
			if(!Constants.equalsInteger(model.getType(),Constants.TWO)){
			if(Constants.equalsInteger(model.getStatus(),Constants.ZERO)
			\|\|Constants.equalsInteger(model.getStatus(),Constants.ONE)){
			this.updateById(orders);
			}else if(Constants.equalsInteger(model.getStatus(),Constants.TWO)){
			this.updOrderData(orders,model);
			}else{
			throw new BusinessException(ResponseStatus.NOT_ALLOWED);
			}
			}else{
			throw new BusinessException(ResponseStatus.NOT_ALLOWED);
			}
			}



			// @Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void updateById(Orders orders) {

			Orders model = ordersMapper.selectById(orders.getId());
			if(Constants.equalsInteger(model.getType(),Constants.TWO)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"此类订单无法进行修改");
			@@ -345,6 +444,7 @@
			\|\| StringUtils.isEmpty(multifile.getName())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"附件信息错误");
			}
			multifile.setId(null);
			multifile.setIsdeleted(Constants.ZERO);
			multifile.setCreateDate(new Date());
			multifile.setObjId(orders.getId());
			@@ -352,6 +452,10 @@
			}
			multifileMapper.insert(multifileList);
			}
			orders.setOriginPriceNum1(orders.getPriceNum1());
			orders.setOriginPriceNum2(orders.getPriceNum2());
			orders.setOriginEstimatedAccount(orders.getOriginEstimatedAccount());
			orders.setConfirmOtherFee(0L);
			ordersMapper.updateById(orders);
			}

			@@ -361,7 +465,7 @@
			return;
			}
			for (Orders orders: orderss) {
			this.updateById(orders);
			//this.updateById(orders);
			}
			}

			@@ -387,6 +491,8 @@
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus()));
			this.getPriceUnit(orders);

			//附件信息
			List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,orders.getId())
			.eq(Multifile::getIsdeleted,Constants.ZERO).eq(Multifile::getObjType,Constants.ONE).orderByAsc(Multifile::getId));
			@@ -406,9 +512,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()));
			}
			}
			@@ -417,6 +523,29 @@
			return orders;
			}

			public void getPriceUnit(Orders orders){
			if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
			if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
			orders.setPriceUnit("元/斤");
			}else if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
			orders.setPriceUnit("元/人/天");
			}else{
			if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
			orders.setPriceUnit("元/人/天");
			}else if(Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
			orders.setPriceUnit("元/人/小时");
			}else{
			orders.setPriceUnit("元/斤");
			}
			}
			}else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
			if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
			orders.setPriceUnit("元/天");
			}else if(Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
			orders.setPriceUnit("元/次");
			}
			}
			}
			@Override
			public Orders findOne(Orders orders) {
			QueryWrapper<Orders> wrapper = new QueryWrapper<>(orders);
			@@ -459,8 +588,11 @@
			queryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(model.getCode()),Orders::getCode, model.getCode());
			queryWrapper.eq(Objects.nonNull(model.getType()),Orders::getType, model.getType());
			queryWrapper.eq(Objects.nonNull(model.getStatus()),Orders::getStatus, model.getStatus());
			queryWrapper.eq(Objects.nonNull(model.getCommentStatus()),Orders::getCommentStatus, model.getCommentStatus());
			queryWrapper.eq(Objects.nonNull(model.getReleaseMemberId()),Orders::getReleaseMemberId, model.getReleaseMemberId());
			queryWrapper.eq(Objects.nonNull(model.getAcceptMemberId()),Orders::getAcceptMemberId, model.getAcceptMemberId());
			queryWrapper.eq(Objects.nonNull(model.getAcceptType()),Orders::getAcceptType, model.getAcceptType());
			queryWrapper.apply(org.apache.commons.lang3.StringUtils.isNotBlank(model.getReleaseName()),"m1.name", model.getReleaseName());
			queryWrapper.apply(org.apache.commons.lang3.StringUtils.isNotBlank(model.getReleaseName()),"m1.name like '%"+model.getReleaseName()+"%' or m1.TELEPHONE like '%"+model.getReleaseName()+"%' ");
			queryWrapper.apply(org.apache.commons.lang3.StringUtils.isNotBlank(model.getAcceptName()),"( i.LINK_NAME like '%"+model.getAcceptName()+"%' or i.company_name like '%"+model.getAcceptName()+"%' or i.TELEPHONE like '%"+model.getAcceptName()+"%' ) ");
			IPage<Orders> iPage = ordersMapper.selectJoinPage(page,Orders.class,queryWrapper);
			for (Orders orders:iPage.getRecords()) {
			@@ -503,11 +635,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{
			@@ -516,9 +648,9 @@
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(cateringDTOList)){
			for (CateringDTO cateringDTO:cateringDTOList) {
			if(StringUtils.isEmpty(orders.getOrderContent())){
			orders.setOrderContent(cateringDTO.getName()+cateringDTO.getPrice()+" 需"+cateringDTO.getNum()+"份");
			orders.setOrderContent(cateringDTO.getName()+(new BigDecimal(cateringDTO.getPrice().toString()).divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP))+" 需"+cateringDTO.getNum()+"份");
			}else{
			orders.setOrderContent(orders.getOrderContent()+" \| "+cateringDTO.getName()+cateringDTO.getPrice()+" 需"+cateringDTO.getNum()+"份");
			orders.setOrderContent(orders.getOrderContent()+" \| "+cateringDTO.getName()+(new BigDecimal(cateringDTO.getPrice().toString()).divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP))+" 需"+cateringDTO.getNum()+"份");
			}
			}
			}
			@@ -553,35 +685,57 @@
			if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"您自己的订单无法进行该操作");
			}
			member = memberMapper.selectById(member.getId());
			//查询用户是否有对应身份
			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(),"您还未注册该服务，请前往\"我的\"页面提交申请");
			}
			}
			orders.setUpdateTime(new Date());
			orders.setAcceptType(Constants.ZERO);
			orders.setAcceptTime(new Date());
			orders.setAcceptMemberId(member.getId());
			orders.setStatus(Constants.ordersStatus.accept.getKey());
			ordersMapper.updateById(orders);

			ordersMapper.update(new UpdateWrapper<Orders>().lambda().eq(Orders::getId,orders.getId())
			.set(Orders::getUpdateTime,new Date())
			.set(Orders::getAcceptType,Constants.ZERO)
			.set(Orders::getAcceptTime,new Date())
			.set(Orders::getAcceptMemberId,member.getId())
			.set(Orders::getStatus,Constants.ordersStatus.accept.getKey())
			);

			//更新接单量
			memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getPublishNum," (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")
			);
			Member releaseMember = memberMapper.selectById(orders.getReleaseMemberId());

			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);
			}
			}



			@@ -603,11 +757,14 @@
			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)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单修改待确认，无法进行该操作");
			}
			if(orders.getStartDate().getTime()>System.currentTimeMillis()){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单未到开始时间无法进行该操作");
			}
			orders.setUpdateTime(new Date());
			orders.setStatus(Constants.ordersStatus.doing.getKey());
			@@ -623,78 +780,182 @@

			/**
			* 发单方修改订单 - 已接单状态
			* @param updOrderDataDTO
			*/
			@Override
			// @Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void updOrderData(UpdOrderDataDTO updOrderDataDTO){
			if(Objects.isNull(updOrderDataDTO)
			\|\| Objects.isNull(updOrderDataDTO.getOrderId())
			\|\| Objects.isNull(updOrderDataDTO.getStartDate())
			\|\| Objects.isNull(updOrderDataDTO.getEndDate())
			\|\| Objects.isNull(updOrderDataDTO.getTotalDays())){
			public void updOrderData(Orders orders,Orders model){
			if(Objects.isNull(orders)
			\|\| Objects.isNull(orders.getStartDate())
			\|\| Objects.isNull(orders.getEndDate())){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			Orders orders = ordersMapper.selectById(updOrderDataDTO.getOrderId());
			if(Objects.isNull(orders)\|\|Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行该操作");
			}
			if(Constants.equalsInteger(orders.getReleaseMemberId(),updOrderDataDTO.getMember().getId())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
			}
			if(Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单已修改，待接单方确认，无法进行该操作");
			}
			orders.setStartDate(updOrderDataDTO.getStartDate());
			orders.setEndDate(updOrderDataDTO.getEndDate());
			orders.setTotalDays(updOrderDataDTO.getTotalDays());
			model.setTotalDays(DateUtil.daysBetweenDates(orders.getEndDate(),orders.getStartDate())+1);
			model.setStartDate(orders.getStartDate());
			model.setEndDate(orders.getEndDate());
			//用车类型
			if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
			if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)) {
			orders.setPriceNum1(updOrderDataDTO.getTotalDays());
			if(Constants.equalsInteger(model.getType(),Constants.ONE)){
			if(Constants.equalsInteger(model.getCarType(),Constants.ZERO)) {
			model.setPriceNum1(orders.getTotalDays());
			}
			}else if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
			if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)\|\|(Constants.equalsInteger(orders.getWorkType(),Constants.TWO)&&Constants.equalsInteger(orders.getCarType(),Constants.ZERO))){
			orders.setPriceNum1(updOrderDataDTO.getTotalDays());
			}else if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
			if(Constants.equalsInteger(model.getWorkType(),Constants.ONE)\|\|
			(Constants.equalsInteger(model.getWorkType(),Constants.TWO)&&Constants.equalsInteger(model.getCarType(),Constants.ZERO))){
			model.setPriceNum1(orders.getTotalDays());
			}
			}else{
			orders.setPriceNum1(updOrderDataDTO.getTotalDays());
			model.setPriceNum1(orders.getTotalDays());
			}
			Long total = this.getTotal(orders);
			Long tcje = Long.valueOf(new BigDecimal(total.toString()).multiply(model.getPlatformRata()).intValue());
			Long reciveTotal = total - tcje;
			ordersMapper.update(new UpdateWrapper<Orders>().lambda()
			.set(Orders::getStartDate,updOrderDataDTO.getStartDate())
			.set(Orders::getEndDate,updOrderDataDTO.getEndDate())
			.set(Orders::getTotalDays,updOrderDataDTO.getTotalDays())
			.set(Orders::getStartDate,model.getStartDate())
			.set(Orders::getEndDate,model.getEndDate())
			.set(Orders::getTotalDays,model.getTotalDays())
			.set(Orders::getIsUpdate,Constants.ONE)
			.set(Orders::getIsUpdateTime,"now()")
			.set(Orders::getUpdateTime,"now()")
			.set(Orders::getIsUpdateTime,new Date())
			.set(Orders::getUpdateTime,new Date())
			.set(Orders::getEstimatedAccount,total)
			.set(Orders::getOriginEstimatedAccount,total)
			.set(Orders::getReceiveAccount,reciveTotal)
			.eq(Orders::getId,orders.getId())
			);
			//创建操作日志
			Constants.OrdersLog ordersLog = Constants.OrdersLog.UPD_ORDER;
			this.saveOrderLog(orders,ordersLog,
			ordersLog.getInfo(),updOrderDataDTO.getMember().getId(),null);
			this.saveOrderLog(model,ordersLog,
			ordersLog.getInfo(),orders.getMember().getId(),null);

			//TODO 通知接单人订单发生变更
			}


			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.ONE)
			){
			orders.setPriceNum2(Constants.ONE);
			//通知接单人订单发生变更
			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);
			}
			}
			return orders.getPrice() * orders.getPriceNum1() * orders.getPriceNum2();

			}


			@Override
			public Long getTotal(Orders orders){
			if(Objects.isNull(orders)
			\|\|Objects.isNull(orders.getPrice())
			\|\|Objects.isNull(orders.getPriceNum1())
			\|\|Objects.isNull(orders.getType())
			){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			BigDecimal bigDecimalPrice = BigDecimal.ZERO;
			if(
			(Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO ))
			\|\| (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Objects.nonNull(orders.getCarType()) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO ) && Constants.equalsInteger(orders.getCarType(),Constants.TWO))
			\|\| Constants.equalsInteger(orders.getType(),Constants.ONE)
			\|\| Constants.equalsInteger(orders.getType(),Constants.TWO)
			){
			bigDecimalPrice = orders.getPrice().multiply(new BigDecimal(orders.getPriceNum1().toString()));
			}else{
			if(Objects.isNull(orders.getPriceNum2())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			bigDecimalPrice = orders.getPrice().multiply(new BigDecimal(orders.getPriceNum1().toString())).multiply(new BigDecimal(orders.getPriceNum2().toString()));
			}
			if(Objects.nonNull(orders.getConfirmOtherFee())){
			bigDecimalPrice = bigDecimalPrice.add(new BigDecimal(orders.getConfirmOtherFee().toString()));
			}
			return bigDecimalPrice.divide(new BigDecimal("1"),0,BigDecimal.ROUND_HALF_UP).longValue();//orders.getPrice() * orders.getPriceNum1() * orders.getPriceNum2();
			}


			/**
			* 接单方确认订单费用
			*/
			@Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void confirmFee(ConfirmFeeOrderDTO confirmUpdOrderDTO){
			if(Objects.isNull(confirmUpdOrderDTO)
			\|\| Objects.isNull(confirmUpdOrderDTO.getOrderId())
			\|\| Objects.isNull(confirmUpdOrderDTO.getPriceNum1())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			Orders orders = ordersMapper.selectById(confirmUpdOrderDTO.getOrderId());
			if(Objects.isNull(orders)\|\|Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			if(!Constants.equalsInteger(orders.getAcceptMemberId(),confirmUpdOrderDTO.getMember().getId())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
			}
			if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行该操作");
			}
			//类型:0=用工；1=运货；2=订餐
			if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
			//用工类型:0=采摘工；1=分拣工；2=包装工；（用工订单）
			if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
			//1=分拣工
			if( Objects.isNull(confirmUpdOrderDTO.getPriceNum2())){//必须有用工数量（人）
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			}else if(Constants.equalsInteger(orders.getWorkType(),Constants.TWO)){
			//包装工用车类型(用工包装/运货使用):0=天;1=次/小时;2=重量
			if( !Constants.equalsInteger(orders.getCarType(),Constants.TWO)
			&& Objects.isNull(confirmUpdOrderDTO.getPriceNum2())){
			//不是按重量计费的，必须有用工数量（人）
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			}
			}else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
			//运货订单

			}else{
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该订单不支持该操作，请返回刷新重试！");
			}
			orders.setPriceNum1(confirmUpdOrderDTO.getPriceNum1());
			orders.setPriceNum2(confirmUpdOrderDTO.getPriceNum2());
			orders.setConfirmOtherFee(confirmUpdOrderDTO.getConfirmOtherFee());
			Long totalFee = this.getTotal(orders);//重新计算费用
			Long payFee = totalFee;//重新计算费用
			Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue());
			Long reciveTotal = payFee - tcje;
			//BigDecimal recFee = new BigDecimal(payFee).multiply((new BigDecimal(1).subtract(Constants.formatBigDecimal(orders.getPlatformRata())))).setScale(0, RoundingMode.HALF_UP) ;
			ordersMapper.update(new UpdateWrapper<Orders>().lambda()
			.set(Orders::getPriceNum1,confirmUpdOrderDTO.getPriceNum1())
			.set(Orders::getPriceNum2,confirmUpdOrderDTO.getPriceNum2())
			.set(Orders::getConfirmFeeRemark,confirmUpdOrderDTO.getConfirmFeeRemark())
			.set(Orders::getConfirmOtherFee,confirmUpdOrderDTO.getConfirmOtherFee())
			.set(Orders::getEstimatedAccount,totalFee)
			.set(Orders::getStatus,Constants.ordersStatus.feeconfirm.getKey())
			.set(Orders::getPayAccount,payFee)
			.set(Orders::getReceiveAccount,reciveTotal)
			.set(Orders::getUpdateTime,new Date())
			.set(Orders::getConfirmFeeTime,new Date())
			.eq(Orders::getId,orders.getId())
			);
			//记录同意修改的日志
			Constants.OrdersLog ordersLog = Constants.OrdersLog.FEE_CONFIRM;
			this.saveOrderLog(orders,ordersLog,
			ordersLog.getInfo(),confirmUpdOrderDTO.getMember().getId(),null);

			//微信通知
			Member member = memberMapper.selectById(orders.getReleaseMemberId());
			if(Objects.nonNull(member)&& org.apache.commons.lang3.StringUtils.isNotBlank(member.getOpenid())){
			sendWxMessage.waitPayMessage(member.getOpenid(),orders);
			}

			}

			/**
			* 接单方处理订单修改
			@@ -721,13 +982,13 @@
			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)){
			if(!Constants.equalsInteger(confirmUpdOrderDTO.getStatus(),Constants.ONE)){
			ordersMapper.update(new UpdateWrapper<Orders>().lambda()
			.set(Orders::getIsUpdate,Constants.TWO)
			.set(Orders::getUpdateTime,"now()")
			.set(Orders::getUpdateTime,new Date())
			.eq(Orders::getId,orders.getId())
			);
			//记录同意修改的日志
			@@ -737,44 +998,84 @@
			}else{
			ordersMapper.update(new UpdateWrapper<Orders>().lambda()
			.set(Orders::getIsUpdate,Constants.TWO)
			.set(Orders::getUpdateTime,"now()")
			.set(Orders::getUpdateTime,new Date())
			.set(Orders::getStatus,Constants.ordersStatus.wait.getKey())
			.set(Orders::getAcceptMemberId,null)
			.set(Orders::getAcceptType,null)
			.eq(Orders::getId,orders.getId())
			);

			memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getReceiveNum,"receive_num - 1").eq(Member::getId,confirmUpdOrderDTO.getMember().getId()));
			memberMapper.update(new UpdateWrapper<Member>().lambda().setSql("receive_num = receive_num - 1").eq(Member::getId,confirmUpdOrderDTO.getMember().getId()));

			//记录不同意修改的日志
			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);
			}


			/**
			* 发单方取消订单
			* @param orderId
			* @param member
			*/
			@Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void releaseCancelOrder(Integer orderId,Member member){
			public void cancelOrder(Integer orderId,Member member){
			Orders orders = ordersMapper.selectById(orderId);
			if(Objects.isNull(orders)\|\|Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
			this.releaseCancelOrder(orders,member);
			}else if(Constants.equalsInteger(orders.getAcceptMemberId(),member.getId())){
			this.receiveCancelOrder(orders,member);
			}else{
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
			}


			}


			@Override
			public String cancelTips(Integer orderId,Member member){
			Orders orders = ordersMapper.selectById(orderId);
			if(Objects.isNull(orders)\|\|Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}

			Integer totalCancelTimes = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RELEASE_CANCEL_TIMES).getCode());
			Long cancelTimes = ordersMapper.selectCount(new QueryWrapper<Orders>().lambda()
			.apply(" DATE(cancel_time) = DATE(NOW()) ")
			.eq(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
			.eq(Orders::getReleaseMemberId,member.getId()));
			//查询取消次数
			if(totalCancelTimes<=cancelTimes){
			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+"小时,无法取消订单");
			}
			return "今日还可主动取消"+(totalCancelTimes-cancelTimes)+"次，是否确认取消";

			}

			/**
			* 发单方取消订单
			* @param member
			*/
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void releaseCancelOrder(Orders orders,Member member){
			if(!(Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.wait.getKey())
			\|\|Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.waitPay.getKey())
			\|\| 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(),"非您的订单无法进行该操作");
			}
			//待支付用餐订单/待接单订单进行取消
			@@ -784,6 +1085,7 @@
			//退款业务
			WithdrawalOrders withdrawalOrders = new WithdrawalOrders();
			withdrawalOrders.setCreateTime(new Date());
			withdrawalOrders.setDeleted(Constants.ZERO);
			withdrawalOrders.setMemberId(orders.getReleaseMemberId());
			withdrawalOrders.setAmount(orders.getPayAccount());
			withdrawalOrders.setStatus(Constants.ZERO);
			@@ -794,8 +1096,8 @@
			}
			ordersMapper.update(new UpdateWrapper<Orders>().lambda()
			.set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
			.set(Orders::getUpdateTime,"now()")
			.set(Orders::getCancelTime,"now()")
			.set(Orders::getUpdateTime,new Date())
			.set(Orders::getCancelTime,new Date())
			.set(Orders::getCancelType,Constants.ZERO)
			.eq(Orders::getId,orders.getId())
			);
			@@ -808,13 +1110,13 @@
			.eq(Orders::getReleaseMemberId,orders.getReleaseMemberId()));
			//查询取消次数
			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+"小时,无法取消订单");
			}

			if(Constants.equalsInteger(orders.getType(),Constants.TWO)){
			@@ -832,42 +1134,56 @@
			}
			ordersMapper.update(new UpdateWrapper<Orders>().lambda()
			.set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
			.set(Orders::getUpdateTime,"now()")
			.set(Orders::getCancelTime,"now()")
			.set(Orders::getUpdateTime,new Date())
			.set(Orders::getCancelTime,new Date())
			.set(Orders::getCancelType,Constants.ONE)
			.eq(Orders::getId,orders.getId())
			);
			//TODO 发单方取消订单通知接单方

			//减少接单量
			memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getReceiveNum,"receive_num - 1").eq(Member::getId,orders.getAcceptMemberId()));
			memberMapper.update(new UpdateWrapper<Member>().lambda().setSql("receive_num = (receive_num - 1) ").eq(Member::getId,orders.getAcceptMemberId()));
			}
			//减少发单量
			memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getPublishNum,"publish_num - 1").eq(Member::getId,orders.getReleaseMemberId()));
			memberMapper.update(new UpdateWrapper<Member>().lambda().setSql("publish_num = (publish_num - 1)").eq(Member::getId,orders.getReleaseMemberId()));

			//日志存储
			Constants.OrdersLog ordersLog = Constants.OrdersLog.RELEASE_CANCEL;
			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());
			//发送微信通知
			orders.setCancelTime(new Date());
			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);
			}
			}


			/**
			* 接单方取消接单
			* @param orderId
			* @param member
			*/
			@Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void receiveCancelOrder(Integer orderId,Member member){
			Orders orders = ordersMapper.selectById(orderId);
			if(Objects.isNull(orders)\|\|Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			public void receiveCancelOrder(Orders orders,Member member){
			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(),"非您的订单无法进行该操作");
			}
			//判断是否可修改已取消次数与时间限制
			@@ -878,16 +1194,17 @@
			.eq(OrderLog::getMemberId,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.RECEIVE_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+"小时,无法取消订单");
			}
			ordersMapper.update(new UpdateWrapper<Orders>().lambda()
			.set(Orders::getUpdateTime,"now()")
			.set(Orders::getUpdateTime,new Date())
			.set(Orders::getCancelTime,new Date())
			.set(Orders::getStatus,Constants.ordersStatus.wait.getKey())
			.set(Orders::getAcceptMemberId,null)
			.set(Orders::getAcceptType,null)
			@@ -895,14 +1212,25 @@
			);

			//减少接单量
			memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getReceiveNum,"receive_num - 1").eq(Member::getId,orders.getAcceptMemberId()));
			memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" receive_num = receive_num - 1 ").eq(Member::getId,orders.getAcceptMemberId()));
			//日志存储
			Constants.OrdersLog ordersLog = Constants.OrdersLog.CANCEL;
			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());
			//发送微信通知
			orders.setCancelTime(new Date());
			sendWxMessage.cancelMessage(openIdList,orders,Constants.TWO);
			}
			//短信通知
			aliSmsService.businessSendSms(Constants.smsContent.receiveCancel.getKey(),member.getTelephone(),orders,null,
			null,categoryMapper);
			}


			@@ -912,7 +1240,7 @@
			*/
			@Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public Object doneOrder(DoneOrderDTO doneOrderDTO){
			public OrderReleaseVO doneOrder(DoneOrderDTO doneOrderDTO){
			if(Objects.isNull(doneOrderDTO)\|\|Objects.isNull(doneOrderDTO.getOrderId())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			@@ -923,33 +1251,132 @@
			if(Objects.isNull(orders)\|\|Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行取消");
			if(Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())){
			if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行取消");
			}
			}else{
			if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.feeconfirm.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(),"非您的订单无法进行该操作");
			}
			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;
			//用餐订单
			if(!Constants.equalsInteger(orders.getType(),Constants.TWO)){
			orders.setPayAccount(doneOrderDTO.getAmount());
			//提成金额
			// Long tcje = (new BigDecimal(orders.getPayAccount().toString()).multiply(Constants.formatBigDecimal(orders.getPlatformRata())).setScale(0,RoundingMode.HALF_UP).longValue());
			Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue());
			orders.setReceiveAccount(orders.getPayAccount() - tcje);
			orders.setOutTradeNo(UUID.randomUUID().toString().replace("-",""));
			ordersMapper.updateById(orders);
			//唤起支付业务
			object = this.getWxPayResponse(orders,orders.getMember().getOpenid());
			object = this.getWxPayResponse(orders,payMember.getOpenid());
			orderReleaseVO.setObject(object);
			}else{
			orders.setStatus(Constants.ordersStatus.done.getKey());
			orders.setFinishTime(new Date());
			ordersMapper.updateById(orders);

			Member member = memberMapper.selectById(orders.getAcceptMemberId());

			//存储流水记录
			MemberRevenue memberRevenue = new MemberRevenue();
			memberRevenue.setCreateTime(new Date());
			memberRevenue.setMemberId(orders.getAcceptMemberId());
			memberRevenue.setType(orders.getType());
			memberRevenue.setOptType(Constants.ONE);
			memberRevenue.setBeforeAmount(member.getAmount());
			memberRevenue.setAmount(orders.getReceiveAccount());
			memberRevenue.setAfterAmount(member.getAmount() + orders.getReceiveAccount());
			if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
			memberRevenue.setRemark(Constants.RevenueType.getInfo(memberRevenue.getType()) + "-" +
			(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)?"采摘工":(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)?"分拣工":"包装工")));
			}else{
			memberRevenue.setRemark(Constants.RevenueType.getInfo(memberRevenue.getType()));
			}
			memberRevenue.setObjId(orders.getId());
			memberRevenue.setObjType(Constants.ZERO);
			memberRevenue.setStatus(Constants.ZERO);
			memberRevenueMapper.insert(memberRevenue);

			//日志存储
			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 object;
			return orderReleaseVO;
			}



			@Override
			public OrderReleaseVO reusePay(ReusePayDTO reusePayDTO){
			if(Objects.isNull(reusePayDTO)\|\|Objects.isNull(reusePayDTO.getOrderId())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			Orders orders = ordersMapper.selectById(reusePayDTO.getOrderId());
			if(Objects.isNull(orders)\|\|Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			if(!Constants.equalsInteger(orders.getType(),Constants.TWO)&&Objects.isNull(reusePayDTO.getAmount())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}

			if(!((( Constants.equalsInteger(orders.getType(),Constants.TWO) && Constants.equalsInteger(orders.getStatus(),Constants.ZERO) )
			\|\| ( !Constants.equalsInteger(orders.getType(),Constants.TWO) && Constants.equalsInteger(orders.getStatus(),Constants.FIVE) ))
			&& Constants.equalsInteger(orders.getPayStatus(),Constants.ZERO) )){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转");
			}
			Member payMember = memberMapper.selectById(reusePayDTO.getMember().getId());
			if(Objects.isNull(payMember)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户信息异常");
			}

			OrderReleaseVO orderReleaseVO = new OrderReleaseVO();
			if(!Constants.equalsInteger(orders.getType(),Constants.TWO)){
			orders.setPayAccount(reusePayDTO.getAmount());
			//提成金额
			Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue());
			orders.setReceiveAccount(orders.getPayAccount() - tcje);
			orders.setOutTradeNo(UUID.randomUUID().toString().replace("-",""));
			ordersMapper.updateById(orders);
			}
			orders.setOutTradeNo(UUID.randomUUID().toString().replace("-",""));
			ordersMapper.updateById(orders);
			//唤起支付业务
			Object object = this.getWxPayResponse(orders,payMember.getOpenid());
			orderReleaseVO.setObject(object);
			orderReleaseVO.setId(orders.getId());
			return orderReleaseVO;
			}


			@Override
			@@ -978,17 +1405,21 @@
			}

			//减少发单量
			memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getPublishNum,"publish_num - 1").eq(Member::getId,orders.getReleaseMemberId()));
			memberMapper.update(new UpdateWrapper<Member>().lambda()
			.setSql("publish_num = ifnull(publish_num,0) - 1")
			.eq(Member::getId,orders.getReleaseMemberId()));

			if(Constants.equalsInteger(orders.getStatus(),Constants.TWO)\|\|Constants.equalsInteger(orders.getStatus(),Constants.THREE)){
			//减少接单量
			memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getReceiveNum,"receive_num - 1").eq(Member::getId,orders.getAcceptMemberId()));
			memberMapper.update(new UpdateWrapper<Member>().lambda()
			.setSql("receive_num = ifnull(receive_num,0) - 1")
			.eq(Member::getId,orders.getAcceptMemberId()));
			}

			Date date = new Date();
			ordersMapper.update(new UpdateWrapper<Orders>().lambda()
			.set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
			.set(Orders::getUpdateTime,"now()")
			.set(Orders::getCancelTime,"now()")
			.set(Orders::getUpdateTime,date)
			.set(Orders::getCancelTime,date)
			.set(Orders::getCancelType,Constants.TWO)
			.eq(Orders::getId,orders.getId())
			);
			@@ -997,6 +1428,34 @@
			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());
			orders.setCancelTime(new Date());
			//发送微信通知
			orders.setCancelTime(new Date());
			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);
			}
			}

			}


			@@ -1024,26 +1483,24 @@

			ordersMapper.update(new UpdateWrapper<Orders>().lambda()
			.set(Orders::getCommentStatus,Constants.ONE)
			.set(Orders::getUpdateTime,"now()")
			.set(Orders::getCommentTime,"now()")
			.set(Orders::getUpdateTime,new Date())
			.set(Orders::getCommentTime,new Date())
			.set(Orders::getCommentLevel,commentDTO.getLevel())
			.set(org.apache.commons.lang3.StringUtils.isNotBlank(commentDTO.getInfo()),Orders::getCommentInfo,commentDTO.getInfo())
			.set(Orders::getCommentType,Constants.ZERO)
			.eq(Orders::getId,orders.getId())
			);

			memberMapper.update(new UpdateWrapper<Member>().lambda()
			.set(Member::getScore," ( total_score +" + commentDTO.getLevel() + " ) / (score_order_num + 1 )")
			.set(Member::getTotalScore," total_score +" + commentDTO.getLevel())
			.set(Member::getScoreOrderNum," 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;
			this.saveOrderLog(orders,ordersLog,
			ordersLog.getInfo(),orders.getAcceptMemberId(),null);
			}




			/**
			@@ -1055,7 +1512,7 @@
			@Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public String payNotify(String preOrderId,String paymentNo){
			Orders orders = ordersMapper.selectOne(new QueryWrapper<Orders>().lambda().eq(Orders::getCode,preOrderId).last("limit 1"));
			Orders orders = ordersMapper.selectOne(new QueryWrapper<Orders>().lambda().eq(Orders::getOutTradeNo,preOrderId).last("limit 1"));
			if(Constants.equalsInteger(orders.getType(),Constants.TWO)){
			//用餐订单如果已经流转到已支付则直接返回
			if(!Constants.equalsInteger(orders.getStatus(),Constants.ZERO)){
			@@ -1063,9 +1520,11 @@
			}else{
			//处理支付完成逻辑
			ordersMapper.update(new UpdateWrapper<Orders>().lambda()
			.set(Orders::getUpdateTime,"now()")
			.set(Orders::getStatus,Constants.ordersStatus.wait)
			.set(Orders::getUpdateTime,new Date())
			.set(Orders::getStatus,Constants.ordersStatus.wait.getKey())
			.set(Orders::getPayStatus,Constants.ONE)
			.set(Orders::getPayTime,new Date())
			.set(Orders::getPayMethod,Constants.ZERO)
			.set(Orders::getWxExternalNo,paymentNo)
			.eq(Orders::getId,orders.getId())
			);
			@@ -1077,16 +1536,18 @@
			}
			}else{
			//非用餐类订单
			if(!Constants.equalsInteger(orders.getStatus(),Constants.THREE)){
			if(!Constants.equalsInteger(orders.getStatus(),Constants.FIVE)){
			return ("处理成功!");
			}else{
			//处理支付完成逻辑
			ordersMapper.update(new UpdateWrapper<Orders>().lambda()
			.set(Orders::getUpdateTime,"now()")
			.set(Orders::getUpdateTime,new Date())
			.set(Orders::getStatus,Constants.FOUR)
			.set(Orders::getPayStatus,Constants.ONE)
			.set(Orders::getPayTime,new Date())
			.set(Orders::getPayMethod,Constants.ZERO)
			.set(Orders::getWxExternalNo,paymentNo)
			.set(Orders::getFinishTime,"now()")
			.set(Orders::getFinishTime,new Date())
			.eq(Orders::getId,orders.getId())
			);

			@@ -1094,12 +1555,20 @@
			//存储流水记录
			MemberRevenue memberRevenue = new MemberRevenue();
			memberRevenue.setCreateTime(new Date());
			memberRevenue.setDeleted(Constants.ZERO);
			memberRevenue.setTransactionNo(orders.getCode());
			memberRevenue.setMemberId(orders.getAcceptMemberId());
			memberRevenue.setType(orders.getType());
			memberRevenue.setOptType(Constants.ONE);
			memberRevenue.setBeforeAmount(member.getAmount());
			memberRevenue.setAmount(orders.getReceiveAccount());
			memberRevenue.setAfterAmount(member.getAmount() + orders.getReceiveAccount());
			if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
			memberRevenue.setRemark(Constants.RevenueType.getInfo(memberRevenue.getType()) + "-" +
			(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)?"采摘工":(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)?"分拣工":"包装工")));
			}else{
			memberRevenue.setRemark(Constants.RevenueType.getInfo(memberRevenue.getType()));
			}
			memberRevenue.setObjId(orders.getId());
			memberRevenue.setObjType(Constants.ZERO);
			memberRevenue.setStatus(Constants.ZERO);
			@@ -1107,8 +1576,8 @@

			//更新接单用户的余额与历史总金额
			memberMapper.update(new UpdateWrapper<Member>().lambda()
			.set(Member::getAmount,"amount + " + orders.getReceiveAccount() )
			.set(Member::getTotalAmount,"amount + " + orders.getReceiveAccount() )
			.setSql(" amount = ( amount + " + orders.getReceiveAccount() +")" )
			.setSql(" total_amount = ( amount + " + orders.getReceiveAccount() + ")" )
			.eq(Member::getId,member.getId())
			);

			@@ -1117,7 +1586,23 @@
			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);
			}
			}

			}
			}
			return ("处理成功!");
			@@ -1130,67 +1615,100 @@
			MPJLambdaWrapper<Orders> queryWrapper = new MPJLambdaWrapper<>();
			Utils.MP.blankToNull(pageWrap.getModel());
			Orders model = pageWrap.getModel();
			if(Objects.isNull(model)
			\|\| Objects.isNull(model.getQueryMyOrderType())
			){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			BigDecimal chefLat = model.getQueryLat();
			BigDecimal chefLgt = model.getQueryLgt();
			BigDecimal driverLat = model.getQueryLat();
			BigDecimal driverLgt = model.getQueryLgt();
			BigDecimal workerLat = model.getQueryLat();
			BigDecimal workerLgt = model.getQueryLgt();
			IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
			.eq(IdentityInfo::getMemberId,model.getMember().getId())
			.eq(IdentityInfo::getType,Constants.ZERO)
			.eq(IdentityInfo::getAuditStatus,Constants.TWO)
			.last("limit 1")
			);
			if(Objects.nonNull(wokerIdentityInfo)){
			workerLat = wokerIdentityInfo.getLat();
			workerLgt = wokerIdentityInfo.getLgt();
			}
			IdentityInfo driverIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
			.eq(IdentityInfo::getMemberId,model.getMember().getId())
			.eq(IdentityInfo::getType,Constants.ONE)
			.eq(IdentityInfo::getAuditStatus,Constants.TWO)
			.last("limit 1")
			);
			if(Objects.nonNull(driverIdentityInfo)){
			driverLat = driverIdentityInfo.getLat();
			driverLgt = driverIdentityInfo.getLgt();
			}
			IdentityInfo chefIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
			.eq(IdentityInfo::getMemberId,model.getMember().getId())
			.eq(IdentityInfo::getType,Constants.TWO)
			.eq(IdentityInfo::getAuditStatus,Constants.TWO)
			.last("limit 1")
			);
			if(Objects.nonNull(chefIdentityInfo)){
			chefLat = chefIdentityInfo.getLat();
			chefLgt = chefIdentityInfo.getLgt();
			}
			queryWrapper.selectAll(Orders.class)
			.select("c1.name",Orders::getCategoryName)
			.select("c2.name",Orders::getTransportTypeName)
			.leftJoin(" category c1 on t.category_id = c1.id ")
			.leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id ");
			.leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id ")
			.eq(Objects.nonNull(model.getType()),Orders::getType,model.getType())
			.eq(Objects.nonNull(model.getCommentStatus()),Orders::getCommentStatus,model.getCommentStatus());;
			if(!(Objects.isNull(model.getQueryLat())\|\|Objects.isNull(model.getQueryLgt()))){
			queryWrapper.select(" case when T.LGT IS NULL OR T.LAT IS NULL THEN 0 " +
			" when t.TYPE = 0 then CONVERT( ST_Distance_Sphere ( POINT ( t.LGT, t.LAT ), POINT ( "+workerLgt+", "+workerLat+" )) /1000,DECIMAL(15,2)) " +
			" when t.TYPE = 1 then CONVERT( ST_Distance_Sphere ( POINT ( t.LGT, t.LAT ), POINT ( "+driverLgt+", "+driverLat+" )) /1000,DECIMAL(15,2)) " +
			" else CONVERT( ST_Distance_Sphere ( POINT ( t.LGT, t.LAT ), POINT ( "+chefLgt+", "+chefLat+" )) /1000,DECIMAL(15,2)) end " , Orders::getDistance);
			}
			if(Objects.nonNull(model.getQueryMyOrderType())){
			if(Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ZERO)){
			//发单方我的订单
			queryWrapper.eq(Orders::getReleaseMemberId,model.getMember().getId());
			queryWrapper.eq(Objects.nonNull(model.getStatus())&&!Constants.equalsInteger(model.getStatus(),Constants.ordersStatus.waitPay.getKey()),Orders::getStatus,model.getStatus());
			queryWrapper.in(Objects.nonNull(model.getStatus())&&Constants.equalsInteger(model.getStatus(),Constants.ordersStatus.waitPay.getKey()),Orders::getStatus,model.getStatus(),Constants.ordersStatus.feeconfirm.getKey());
			queryWrapper.orderByDesc(Orders::getCreateTime);
			}else if(Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ONE)){
			//接单方我的订单
			queryWrapper.eq(Orders::getAcceptMemberId,model.getMember().getId());
			queryWrapper.eq(Objects.nonNull(model.getStatus()),Orders::getStatus,model.getStatus());
			// queryWrapper.in(Objects.nonNull(model.getStatus())&&Constants.equalsInteger(model.getStatus(),Constants.ordersStatus.waitPay.getKey()),Orders::getStatus,model.getStatus(),Constants.ordersStatus.feeconfirm.getKey());
			queryWrapper.orderByDesc(Orders::getAcceptTime);
			}else{
			//接单大厅
			queryWrapper.and(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);
			//查询用户的接单权重接单大厅
			ReceiveWeight receiveWeight = receiveWeightMapper.selectOne(new QueryWrapper<ReceiveWeight>().lambda().eq(ReceiveWeight::getDeleted,Constants.ZERO).apply(" RECEIVE_MIN < "+model.getMember().getReceiveNum()+" and RECEIVE_MAX > " + model.getMember().getReceiveNum()).last(" limit 1 "));
			if(Objects.nonNull(receiveWeight)){
			queryWrapper.apply(" DATE_ADD(t.CREATE_TIME, INTERVAL "+receiveWeight.getDelayTime()+" MINUTE) < now() ");
			}
			queryWrapper.eq(Orders::getStatus,Constants.ordersStatus.wait.getKey());
			queryWrapper.ne(Orders::getReleaseMemberId,model.getMember().getId());
			if(Objects.nonNull(model.getSortType())){
			if(Constants.equalsInteger(model.getSortType(),Constants.ZERO)){
			queryWrapper.orderByDesc(Orders::getCreateTime);
			}else if(Constants.equalsInteger(model.getSortType(),Constants.ONE)){
			queryWrapper.orderByAsc(" distance ");
			}else{
			queryWrapper.orderByDesc(Orders::getEstimatedAccount);
			}
			}
			}
			}
			for(PageWrap.SortData sortData: pageWrap.getSorts()) {
			if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
			queryWrapper.orderByDesc(sortData.getProperty());
			} else {
			queryWrapper.orderByAsc(sortData.getProperty());
			}
			}
			}
			IPage<Orders> iPage = ordersMapper.selectJoinPage(page,Orders.class,queryWrapper);
			if(Objects.nonNull(model.getQueryMyOrderType())&&Constants.equalsInteger(model.getQueryMyOrderType(),Constants.TWO)){
			if(Constants.equalsInteger(model.getMember().getUseIdentity(),Constants.ONE)){
			model.getMember().setWorkerIdentityModel(
			identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
			.eq(IdentityInfo::getMemberId,model.getMember().getId())
			.eq(IdentityInfo::getType,Constants.ZERO)
			.eq(IdentityInfo::getAuditStatus,Constants.TWO)
			.last("limit 1")
			)
			for (Orders orders:iPage.getRecords()) {
			this.getPriceUnit(orders);
			if(Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ZERO)\|\|Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ONE)){
			orders.setStatusName(
			Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ZERO)?Constants.ordersStatus.getName(orders.getStatus()):
			Constants.ordersStatus.getInfo(orders.getStatus())
			);
			model.getMember().setDriverIdentityModel(
			identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
			.eq(IdentityInfo::getMemberId,model.getMember().getId())
			.eq(IdentityInfo::getType,Constants.ONE)
			.eq(IdentityInfo::getAuditStatus,Constants.TWO)
			.last("limit 1")
			)
			);
			model.getMember().setChefIdentityModel(
			identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
			.eq(IdentityInfo::getMemberId,model.getMember().getId())
			.eq(IdentityInfo::getType,Constants.TWO)
			.eq(IdentityInfo::getAuditStatus,Constants.TWO)
			.last("limit 1")
			)
			);
			}
			for (Orders orders:iPage.getRecords()) {
			this.getDistance(model.getMember(),orders);
			}
			}
			return PageData.from(iPage);
			@@ -1201,72 +1719,83 @@

			//定位距离
			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);
			}
			}



			@Override
			public Orders getDetail(Integer id,Integer userType) {
			public Orders getDetail(Integer id,Member member) {
			Orders orders = ordersMapper.selectJoinOne(Orders.class,new MPJLambdaWrapper<Orders>()
			.selectAll(Orders.class)
			.select(" m1.name " , Orders::getReleaseName)
			.select(" m1.telephone " , Orders::getReleasePhone)
			.select(" case when i.AUTH_TYPE = 0 then i.LINK_NAME else i.COMPANY_NAME end " , Orders::getAcceptName)
			.select(" i.TELEPHONE " , Orders::getAcceptPhone)
			.select("c1.name",Orders::getCategoryName)
			.select("c2.name",Orders::getTransportTypeName)
			.select(" m2.SCORE " , Orders::getScore)
			.select(" m1.PUBLISH_NUM " , Orders::getPublishNum)
			.select(" m2.RECEIVE_NUM " , Orders::getReceiveNum)
			.select(" m1.COVER_IMAGE " , Orders::getReleaseCoverImage)
			.select(" m2.COVER_IMAGE " , Orders::getAcceptCoverImage)
			.leftJoin(" category c1 on t.category_id = c1.id ")
			.leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id ")
			.leftJoin("member m1 on t.RELEASE_MEMBER_ID = m1.id ")
			.leftJoin("member m2 on t.ACCEPT_MEMBER_ID = m2.id ")
			.leftJoin("identity_info i on m2.id = i.MEMBER_ID and i.TYPE = t.type and i.AUDIT_STATUS = 2 ")

			.eq(Orders::getId,id)
			);
			if(Objects.isNull(orders)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			if(Objects.nonNull(userType)){
			Member member = memberMapper.selectById(
			Constants.equalsInteger(userType,Constants.ZERO)?orders.getReleaseMemberId():orders.getAcceptMemberId()
			);
			if(Objects.nonNull(member)){
			if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getCoverImage())){
			//头像信息
			String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
			+systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MEMBER_FILES).getCode();
			member.setFullCoverImage(path + member.getCoverImage());
			}
			orders.setMember(member);
			}
			//头像信息
			String coverPath = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
			+systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MEMBER_FILES).getCode();
			if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getReleaseCoverImage())){
			orders.setReleaseCoverImage(coverPath + orders.getReleaseCoverImage());
			}
			if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getAcceptCoverImage())){
			orders.setAcceptCoverImage(coverPath + orders.getAcceptCoverImage());
			}
			List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,orders.getId())
			.eq(Multifile::getIsdeleted,Constants.ZERO).eq(Multifile::getObjType,Constants.ONE).orderByAsc(Multifile::getId));
			@@ -1278,10 +1807,72 @@
			}
			orders.setMultifileList(multifileList);
			}
			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)){
			String autoConfirmTime = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.AUTO_CONFIRM).getCode();
			orders.setConfirmCountdown(DateUtil.getXMinuteAfterDate(orders.getIsUpdateTime(),Integer.valueOf(autoConfirmTime)).getTime() - System.currentTimeMillis());
			if(orders.getConfirmCountdown()<=Constants.ZERO){
			orders.setConfirmCountdown(0L);
			}
			}
			if(Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.waitPay.getKey())){
			orders.setCancelCountdown(DateUtil.getXMinuteAfterDate(orders.getCreateTime(),15).getTime() - System.currentTimeMillis());
			if(orders.getCancelCountdown()<=Constants.ZERO){
			orders.setCancelCountdown(0L);
			}
			}
			this.getPriceUnit(orders);
			orders.setCanStart(Constants.ZERO);
			if(orders.getStatus() <= Constants.ordersStatus.accept.getKey()){
			if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
			if(Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())&&orders.getStartDate().getTime() <= System.currentTimeMillis()){
			orders.setCanStart(Constants.ONE);
			}
			//判断是否可修改已取消次数与时间限制
			Integer totalCancelTimes = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RELEASE_CANCEL_TIMES).getCode());
			Long cancelTimes = ordersMapper.selectCount(new QueryWrapper<Orders>().lambda()
			.apply(" DATE(cancel_time) = DATE(NOW()) ")
			.eq(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
			.eq(Orders::getReleaseMemberId,orders.getReleaseMemberId()));
			//查询取消次数
			if(totalCancelTimes<=cancelTimes){
			orders.setCancelStatus(Constants.ONE);
			return orders;
			}
			Integer cancelTimeHour = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RELEASE_CANCEL_TIME).getCode());
			Long hours = DateUtil.getBetweenHours(new Date(),orders.getStartDate());
			if(hours < cancelTimeHour){
			orders.setCancelStatus(Constants.ONE);
			return orders;
			}
			}else if(Constants.equalsInteger(orders.getAcceptMemberId(),member.getId())){
			//判断是否可修改已取消次数与时间限制
			Integer totalCancelTimes = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RECEIVE_CANCEL_TIMES).getCode());
			Long cancelTimes = orderLogMapper.selectCount(new QueryWrapper<OrderLog>().lambda()
			.apply(" DATE(create_time) = DATE(NOW()) ")
			.eq(OrderLog::getObjType,Constants.OrdersLog.CANCEL.getKey())
			.eq(OrderLog::getMemberId,member.getId()));
			//查询取消次数
			if(totalCancelTimes<=cancelTimes){
			orders.setCancelStatus(Constants.ONE);
			return orders;
			}


			Integer cancelTimeHour = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RECEIVE_CANCEL_TIME).getCode());
			Long hours = DateUtil.getBetweenHours(new Date(),orders.getStartDate());
			if(hours < cancelTimeHour){
			orders.setCancelStatus(Constants.ONE);
			return orders;
			}
			}
			} else{
			orders.setCancelStatus(Constants.ONE);
			}
			return orders;
			}




			public synchronized String getNextCode(Integer type){
			@@ -1289,7 +1880,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;
			@@ -1321,11 +1912,85 @@
			}



			//todo 自动派单
			/**
			* 自动派单
			*/
			@Override
			public void autoGrabOrders(){
			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)
			.apply(" DATE_ADD(create_time, INTERVAL "+autoConfirmTime+" MINUTE) < now() ")
			.last("limit 100")
			);
			for (Orders orders:ordersList) {
			BigDecimal lat = orders.getLat();
			BigDecimal lgt = orders.getLgt();
			//查询范围内的会员
			List<Member> memberList = memberMapper.getList(lgt,lat,orders.getType(),orders.getReleaseMemberId());
			// 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;
			}

			Member member = memberList.get(Constants.ZERO);
			Member releaseMember = memberMapper.selectById(orders.getReleaseMemberId());
			//自动派单
			Orders model = ordersMapper.selectById(orders.getId());
			if(!Constants.equalsInteger(model.getStatus(),Constants.ONE) \|\| Constants.equalsInteger(releaseMember.getId(),model.getReleaseMemberId())){
			//如果订单已删除并且非发布方
			continue;
			}
			ordersMapper.update(new UpdateWrapper<Orders>().lambda().eq(Orders::getId,model.getId())
			.set(Orders::getUpdateTime,new Date())
			.set(Orders::getAcceptType,Constants.ONE)
			.set(Orders::getAcceptTime,new Date())
			.set(Orders::getAcceptMemberId,member.getId())
			.set(Orders::getStatus,Constants.ordersStatus.accept.getKey())
			);

			//更新接单量
			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(),
			wokerIdentityInfo.getLgt().doubleValue(),
			wokerIdentityInfo.getLat().doubleValue()
			));

			aliSmsService.businessSendSms(Constants.smsContent.dispatch.getKey(),orders.getLinkPhone(),orders,null,
			null,categoryMapper);
			}
			}

			//自动评价订单完成7天后自动评价4星
			@@ -1341,17 +2006,17 @@
			for (Orders orders:ordersList) {
			ordersMapper.update(new UpdateWrapper<Orders>().lambda()
			.set(Orders::getCommentStatus,Constants.ONE)
			.set(Orders::getUpdateTime,"now()")
			.set(Orders::getCommentTime,"now()")
			.set(Orders::getUpdateTime,new Date())
			.set(Orders::getCommentTime,new Date())
			.set(Orders::getCommentLevel,Constants.FOUR)
			.set(Orders::getCommentType,Constants.ZERO)
			.eq(Orders::getId,orders.getId())
			);

			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())
			);

			//日志存储
			@@ -1368,7 +2033,8 @@
			public void autoConfirm(){
			String autoConfirmTime = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.AUTO_CONFIRM).getCode();
			List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda()
			.eq(Orders::getStatus,Constants.ordersStatus.accept).eq(Orders::getIsUpdate,Constants.ONE)
			.eq(Orders::getStatus,Constants.ordersStatus.accept.getKey())
			.eq(Orders::getIsUpdate,Constants.ONE)
			.apply(" DATE_ADD(IS_UPDATE_TIME, INTERVAL "+autoConfirmTime+" MINUTE) < now() ")
			.last("limit 100")
			);
			@@ -1376,11 +2042,39 @@
			for (Orders orders:ordersList) {
			ordersMapper.update(new UpdateWrapper<Orders>().lambda()
			.set(Orders::getIsUpdate,Constants.TWO)
			.set(Orders::getUpdateTime,"now()")
			.set(Orders::getUpdateTime,new Date())
			.eq(Orders::getId,orders.getId())
			);
			//记录同意修改的日志
			Constants.OrdersLog ordersLog = Constants.OrdersLog.AUTO_AGREE;
			this.saveOrderLog(orders,ordersLog,
			ordersLog.getInfo(),null,null);
			}
			}
			}



			//自动取消订单未支付
			@Override
			@Transactional(rollbackFor = {Exception.class,BusinessException.class})
			public void autoCancelWaitPay(){
			List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda()
			.eq(Orders::getStatus,Constants.ordersStatus.waitPay)
			.apply(" DATE_ADD(CREATE_TIME, INTERVAL 15 MINUTE) < now() ")
			.last("limit 100")
			);
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ordersList)){
			for (Orders orders:ordersList) {
			ordersMapper.update(new UpdateWrapper<Orders>().lambda()
			.set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
			.set(Orders::getUpdateTime,DateUtil.getCurrDateTime())
			.set(Orders::getCancelTime,DateUtil.getCurrDateTime())
			.set(Orders::getCancelType,Constants.TWO)
			.eq(Orders::getId,orders.getId())
			);
			//记录同意修改的日志
			Constants.OrdersLog ordersLog = Constants.OrdersLog.SYSTEM_CANCEL;
			this.saveOrderLog(orders,ordersLog,
			ordersLog.getInfo(),orders.getAcceptMemberId(),null);
			}
			@@ -1388,6 +2082,11 @@
			}


			@Override
			public void initializeCode(){
			//更新缓存
			redisTemplate.opsForValue().set(Constants.RedisKeys.ORDER_CODE,0);
			}