111

rk

2025-09-15 0544913da2cca58f690f5f12966c214ff08eda7e

111

 server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java

@@ -1,6 +1,7 @@
package com.doumee.api.business;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.doumee.config.wx.TransferDetailEntityNew;
import com.doumee.config.wx.WxMiniConfig;
import com.doumee.core.constants.Constants;
@@ -59,6 +60,7 @@
     */
    @PostMapping("/web/wxPayNotify")
    public ApiResponse wxPay_notify(HttpServletRequest request) {
        log.error("微信支付回调结果开始===========" );
        try {
            ServletInputStream inputStream = request.getInputStream();
            StringBuffer stringBuffer = new StringBuffer();
@@ -97,6 +99,7 @@


            Transaction result = parser.parse(requestParam, Transaction.class);
            log.error("支付回调信息：{}"+ JSONObject.toJSONString(result));
            //自定义订单号
            String outTradeNo = result.getOutTradeNo();
            //微信订单号
@@ -113,11 +116,12 @@
            } else {
                // æ”¯ä»˜å¤±è´¥
                switch (result.getAttach()) {
                    case "createGoodsOrder": {
                    case "createOrder": {
                        break;
                    }
                }
            }
            log.error("微信支付回调结果结束===========" );
            return ApiResponse.success("处理成功!");
        } catch (Exception e) {
            e.printStackTrace();

 server/admin/src/main/java/com/doumee/job/AutoCancelOrdersJob.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
package com.doumee.job;

import com.doumee.core.job.BaseJob;
import com.doumee.core.job.JobContext;
import com.doumee.core.job.JobParam;
import com.doumee.service.business.OrdersService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

/**
 * è‡ªåŠ¨å–消未支付订单
 * @author  dm
 * @since 2025/03/31 16:44
 */
@Slf4j
@Component("AutoCancelOrdersJob")
public class AutoCancelOrdersJob extends BaseJob {

    @Autowired
    private OrdersService ordersService;

    @Override
    public JobContext execute(JobParam param) {
        JobContext jobContext = new JobContext();
        try {
            ordersService.autoCancelWaitPay();
            jobContext.setContext("自动取消未支付订单");
        } catch (Exception e) {
            e.printStackTrace();
        }
        return jobContext;
    }
}

 server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java

@@ -56,7 +56,7 @@
     */
    public  void  identityInfoMessage(String openid, IdentityInfo identityInfo){
        try{
            RestTemplate restTemplate = new RestTemplate();

            String accessToken = WxMiniConfig.wxMaService.getAccessToken();
            log.info("微信小程序->微信消息通知 - è®¤è¯ä¿¡æ¯  -> accessToken：{}",accessToken);
            //这里简单起见我们每次都获取最新的access_token（时间开发中，应该在access_token快过期时再重新获取）
@@ -66,12 +66,11 @@
            //用户的openid（要发送给那个用户）
            wxMsgVO.setTouser(openid);
            //订阅消息模板id
            wxMsgVO.setTemplate_id("VJho7-lf-4_WZFfOzenDndgwNDIA0EvCiE6vqBnExpQ");
            wxMsgVO.setTemplate_id("VJho7-lf-4_WZFfOzenDnX6sOhYBJWwkLExVjBB563U");
            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("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.formatDate(identityInfo.getAuditTime(),"yyyy-MM-dd HH:mm")));
            m.put("thing14", new TemplateData(identityInfo.getAuditRemark()));
            wxMsgVO.setPage(mineUrl);
            wxMsgVO.setData(m);
            log.error("微信小程序->微信消息通知 è®¤è¯ä¿¡æ¯ï¼š{}", JSONObject.toJSONString(wxMsgVO));
@@ -94,7 +93,7 @@
     * @throws WxErrorException
     */
    public  void  cancelMessage(List<String> openidList, Orders orders,Integer cancelType ){
        RestTemplate restTemplate = new RestTemplate();

        try{
            String accessToken = WxMiniConfig.wxMaService.getAccessToken();
            log.error("微信小程序->微信消息通知 - è®¢å•å–消业务  -> accessToken：{}",accessToken);
@@ -109,7 +108,7 @@
            m.put("character_string3", new TemplateData(orders.getCode()));
            m.put("thing2", new TemplateData(Constants.orderType.getName(orders.getType())));
            m.put("thing1", new TemplateData(orders.getLocation() + (StringUtils.isNotBlank(orders.getLocationRemark())?orders.getLocationRemark():"")));
            m.put("date8", new TemplateData(DateUtil.getFomartDate(orders.getCancelTime(),"yyyy-MM-dd HH:mm:ss")));
            m.put("date8", new TemplateData(DateUtil.formatDate(orders.getCancelTime(),"yyyy-MM-dd HH:mm:ss")));
            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;
@@ -145,7 +144,7 @@
     * @throws WxErrorException
     */
    public  void  acceptMessage(String openid, Orders orders,String memberName,String memberPhone){
        RestTemplate restTemplate = new RestTemplate();

        try{
            String accessToken = WxMiniConfig.wxMaService.getAccessToken();
            log.error("微信小程序->微信消息通知 - æŽ¥å•ä¸šåŠ¡  -> accessToken：{}",accessToken);
@@ -180,7 +179,7 @@


    public  void  orderUpdMessage(String openid, Orders orders){
        RestTemplate restTemplate = new RestTemplate();

        try{
            String accessToken = WxMiniConfig.wxMaService.getAccessToken();
            log.error("微信小程序->微信消息通知 - è®¢å•å˜æ›´é€šçŸ¥  -> accessToken：{}",accessToken);
@@ -218,7 +217,7 @@

    public  void  withdrawalMessage(String openid, WithdrawalOrders withdrawalOrders){
        try{
            RestTemplate restTemplate = new RestTemplate();

            String accessToken = WxMiniConfig.wxMaService.getAccessToken();
            log.error("微信小程序->微信消息通知 - æçŽ°æˆåŠŸé€šçŸ¥  -> accessToken：{}",accessToken);
            //这里简单起见我们每次都获取最新的access_token（时间开发中，应该在access_token快过期时再重新获取）
@@ -249,7 +248,7 @@

    public  void  revenueMessage(String openid, Orders orders){
        try{
            RestTemplate restTemplate = new RestTemplate();

            String accessToken = WxMiniConfig.wxMaService.getAccessToken();
            log.error("微信小程序->微信消息通知 - è®¢å•æ”¶ç›Šé€šçŸ¥  -> accessToken：{}",accessToken);
            //这里简单起见我们每次都获取最新的access_token（时间开发中，应该在access_token快过期时再重新获取）
@@ -281,7 +280,7 @@

    public  void  autoDispatchMessage(String openid, Orders orders,double distance){
        try{
            RestTemplate restTemplate = new RestTemplate();

            String accessToken = WxMiniConfig.wxMaService.getAccessToken();
            log.error("微信小程序->微信消息通知 - æœåŠ¡æ´¾å•  -> accessToken：{}",accessToken);
            //这里简单起见我们每次都获取最新的access_token（时间开发中，应该在access_token快过期时再重新获取）
@@ -296,7 +295,7 @@
            m.put("thing3", new TemplateData(orders.getOrderContent()));
            m.put("phrase4", new TemplateData("此地距离您"+distance+"公里"));
            m.put("amount28", new TemplateData(orders.getEstimatedAccount().toString()));
            m.put("thing12", new TemplateData("工单将于"+DateUtil.getFomartDate(orders.getStartDate(),"MM-dd")+"开始"));
            m.put("thing12", new TemplateData("工单将于"+DateUtil.formatDate(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 = pageUrl.replace("{id}",orders.getId().toString());
@@ -311,8 +310,35 @@
        }catch (WxErrorException wxErrorException){

        }

    }

    public  void  waitPayMessage(String openid, Orders orders){
        try{

            String accessToken = WxMiniConfig.wxMaService.getAccessToken();
            log.error("微信小程序->微信消息通知 - è®¢å•é‡‘额确认待支付  -> accessToken：{}",accessToken);
            //这里简单起见我们每次都获取最新的access_token（时间开发中，应该在access_token快过期时再重新获取）
            String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken;
            //拼接推送的模版
            WxMsgVO wxMsgVO = new WxMsgVO();
            wxMsgVO.setTouser(openid);
            //订阅消息模板id
            wxMsgVO.setTemplate_id("3rOz7DAnawrkKDM8b5_XW4FLivISWYov6d7QSC4ORsg");
            Map<String, TemplateData> m = new HashMap<>(5);
            m.put("character_string1", new TemplateData(orders.getCode()));
            m.put("thing7", new TemplateData( Constants.getOrderInfo(orders)));
            m.put("amount14", new TemplateData(new BigDecimal(orders.getPayAccount().toString()).divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP).toString()));
            String pageUrl = Constants.equalsInteger(orders.getType(),Constants.orderType.hyd.getKey())?orderDetailFreight:
                    Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())?orderDetailFood:orderDetail;
            pageUrl = pageUrl.replace("{id}",orders.getId().toString());
            wxMsgVO.setPage(pageUrl);
            wxMsgVO.setData(m);
            log.error("微信小程序->微信消息通知 è®¢å•é‡‘额确认待支付：{}", JSONObject.toJSONString(wxMsgVO));
            //用户的openid（要发送给那个用户）
            String responseEntity  = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO));
            log.error("微信小程序->微信消息通知 è®¢å•é‡‘额确认待支付：{}", JSONObject.toJSONString(responseEntity));
        }catch (WxErrorException wxErrorException){

        }
    }
}

 server/services/src/main/java/com/doumee/core/constants/Constants.java

@@ -1,5 +1,6 @@
package com.doumee.core.constants;

import com.doumee.dao.business.model.Orders;
import lombok.AllArgsConstructor;
import lombok.Getter;

@@ -56,6 +57,7 @@
    public static final String AUTO_DISPATCH ="AUTO_DISPATCH" ;
    public static final String AUTO_DISPATCH_DISTANCE ="AUTO_DISPATCH_DISTANCE" ;
    public static final String AUTO_CONFIRM ="AUTO_CONFIRM" ;
    public static final String AUTO_CANCEL_WAIT_PAY ="AUTO_CANCEL_WAIT_PAY" ;

    public static final String QYWX = "QYWX";
    public static final  Integer ONE = 1;
@@ -561,22 +563,23 @@


    public  enum ordersStatus {
        waitPay(0, "待支付"),
        wait(1, "待接单"),
        accept(2, "已接单"),
        doing(3, "进行中"),
        done(4, "已完成"),
        feeconfirm(5, "已确认费用"),
        cancel(99, "已取消"),
        waitPay(0, "待支付","待支付"),
        wait(1, "待接单","待接单"),
        accept(2, "已接单","已接单"),
        doing(3, "进行中","进行中"),
        done(4, "已完成","已完成"),
        feeconfirm(5, "待支付","待发单方支付"),//金额已确认
        cancel(99, "已取消","已取消"),
        ;
        // æˆå‘˜å˜é‡
        private int key;
        private String name;

        private String name; //接单方文案
        private String info; //发单方文案
        // æž„造方法
        ordersStatus(int key, String name) {
        ordersStatus(int key, String name,String info) {
            this.name = name;
            this.key = key;
            this.info = info;
        }

        // æ™®é€šæ–¹æ³•
@@ -584,6 +587,15 @@
            for (ordersStatus c : ordersStatus.values()) {
                if (c.getKey() == index) {
                    return c.name;
                }
            }
            return null;
        }

        public static String getInfo(int index) {
            for (ordersStatus c : ordersStatus.values()) {
                if (c.getKey() == index) {
                    return c.info;
                }
            }
            return null;
@@ -603,6 +615,14 @@

        public void setKey(int key) {
            this.key = key;
        }

        public String getInfo() {
            return info;
        }

        public void setInfo(String info) {
            this.info = info;
        }

    }
@@ -717,6 +737,21 @@
    }


    public static  String getOrderInfo(Orders orders){
        String orderTypeInfo = "用工单";
        if(!Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            orderTypeInfo =   Constants.equalsInteger(orders.getType(),Constants.ONE)?"用车单":"送餐单";
        }else{
            if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
                orderTypeInfo = orderTypeInfo + "-采摘工";
            }else{
                orderTypeInfo = orderTypeInfo + (Constants.equalsInteger(orders.getWorkType(),Constants.ONE)?"-分拣工":"-包装工");
            }
        }
        return orderTypeInfo;

    }



}

 server/services/src/main/java/com/doumee/dao/business/MemberMapper.java

@@ -22,8 +22,8 @@
            " 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 " +
            "  )" +
            "  ) and RELEASE_MEMBER_ID != #{releaseMemberId} " +
            " order by level , score desc , distance asc  ")
    List<Member> getList(@Param("lgt") BigDecimal lgt, @Param("lat") BigDecimal lat, @Param("orderType") Integer orderType);
    List<Member> getList(@Param("lgt") BigDecimal lgt, @Param("lat") BigDecimal lat, @Param("orderType") Integer orderType,  @Param("releaseMemberId") Integer releaseMemberId);

}

 server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java

@@ -31,10 +31,10 @@
    private Integer deleted;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="申请时间",index = 10,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
    private Integer createUser;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="申请时间",index = 10,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
    private Date createTime;

    @ApiModelProperty(value = "更新人编码", example = "1")

 server/services/src/main/java/com/doumee/dao/business/model/Orders.java

@@ -153,8 +153,8 @@
    @ExcelColumn(name = "订单编号",index = 1,width = 10)
    private String code;

    @ApiModelProperty(value = "订单状态:0=待支付 1=待接单；2=已接单；3=进行中；4=已完成；99=已取消；", example = "1")
    @ExcelColumn(name = "订单状态",index = 11,width = 10,valueMapping = "0=待支付;1=待接单;2=已接单;3=进行中;4=已完成;99=已取消;")
    @ApiModelProperty(value = "订单状态:0=待支付 1=待接单；2=已接单；3=进行中；4=已完成；5=已确认金额；99=已取消；", example = "1")
    @ExcelColumn(name = "订单状态",index = 11,width = 10,valueMapping = "0=待支付;1=待接单;2=已接单;3=进行中;4=已完成;5=待支付;99=已取消;")
    private Integer status;

    @ApiModelProperty(value = "支付状态:0=待支付 1=已支付", example = "1")
@@ -236,6 +236,9 @@
    @ApiModelProperty(value = "三方支付订单号", example = "1")
    private String outTradeNo;

    @ApiModelProperty(value = "接单方确认金额时间")
    private Date confirmFeeTime;

    @ApiModelProperty(value = "图片")
    @TableField(exist = false)
    private List<Multifile> multifileList;
@@ -269,6 +272,12 @@
    @Schema(description ="修改确认倒计时")
    @TableField(exist = false)
    private Long confirmCountdown;


    @Schema(description ="自动取消倒计时")
    @TableField(exist = false)
    private Long cancelCountdown;


    @ApiModelProperty(value = "需求类型")
    @TableField(exist = false)
@@ -384,5 +393,10 @@
    @TableField(exist = false)
    private Integer cancelStatus;


    @ApiModelProperty(value = "是否可开始：0=不可以；1=可以", example = "1")
    @TableField(exist = false)
    private Integer canStart;

}


 server/services/src/main/java/com/doumee/service/business/OrdersService.java

@@ -152,4 +152,6 @@
    OrderReleaseVO reusePay(ReusePayDTO reusePayDTO);

    void confirmFee(ConfirmFeeOrderDTO orders);

    void autoCancelWaitPay();
}

 server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java

@@ -37,6 +37,7 @@
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;
@@ -135,11 +136,11 @@
        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.setPayAccount(orders.getEstimatedAccount());
            Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue());
            orders.setReceiveAccount(orders.getPayAccount() - tcje);
            orders.setStatus(Constants.ordersStatus.waitPay.getKey());
            orders.setOutTradeNo(UUID.randomUUID().toString().replace("-",""));
            //唤起支付业务
@@ -150,7 +151,7 @@
        }
        orders.setOriginPriceNum1(orders.getPriceNum1());
        orders.setOriginPriceNum2(orders.getPriceNum2());
        orders.setOriginEstimatedAccount(orders.getOriginEstimatedAccount());
        orders.setOriginEstimatedAccount(orders.getEstimatedAccount());
        orders.setConfirmOtherFee(0l);
        ordersMapper.insert(orders);

@@ -175,7 +176,7 @@

        //创建操作日志
        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{
@@ -184,7 +185,7 @@
            }else{
                orderTypeInfo = orderTypeInfo + (Constants.equalsInteger(orders.getWorkType(),Constants.ONE)?"-分拣工":"-包装工");
            }
        }
        }*/
        String logInfo = ordersLog.getInfo()
                .replace("{param}",orderTypeInfo);
        this.saveOrderLog(orders,ordersLog,
@@ -261,6 +262,7 @@
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Integer priceNum2 = orders.getPriceNum2();
        if( (Constants.equalsInteger(orders.getType(),Constants.ZERO)
                && Constants.equalsInteger(orders.getWorkType(),Constants.TWO) &&
            ( Constants.equalsInteger(orders.getCarType(),Constants.ZERO)
@@ -277,7 +279,7 @@
        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)){
@@ -318,6 +320,7 @@
                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())
@@ -340,15 +343,19 @@
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"用餐标准数据错误，请刷新重试");
                }
                sumPrice = sumPrice + (cateringDTO.getPrice() * cateringDTO.getNum()) ;

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


@@ -401,9 +408,6 @@
        }else{
            throw new BusinessException(ResponseStatus.NOT_ALLOWED);
        }



    }


@@ -451,7 +455,7 @@
        orders.setOriginPriceNum1(orders.getPriceNum1());
        orders.setOriginPriceNum2(orders.getPriceNum2());
        orders.setOriginEstimatedAccount(orders.getOriginEstimatedAccount());
        orders.setConfirmOtherFee(0l);
        orders.setConfirmOtherFee(0L);
        ordersMapper.updateById(orders);
    }

@@ -644,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()+"份");
                        }
                    }
                }
@@ -685,15 +689,15 @@
        //查询用户是否有对应身份
        if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            if(!Constants.equalsInteger(member.getWorkerIdentity(),Constants.TWO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"您还未注册该服务，请前往个人信息中提交申请。");
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"您还未注册该服务，请前往\"我的\"页面提交申请");
            }
        }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
            if(!Constants.equalsInteger(member.getDriverIdentity(),Constants.TWO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"您还未注册该服务，请前往个人信息中提交申请。");
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"您还未注册该服务，请前往\"我的\"页面提交申请");
            }
        }else{
            if(!Constants.equalsInteger(member.getChefIdentity(),Constants.TWO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"您还未注册该服务，请前往个人信息中提交申请。");
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"您还未注册该服务，请前往\"我的\"页面提交申请");
            }
        }

@@ -759,6 +763,9 @@
        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());
        orders.setWorkStartTime(new Date());
@@ -799,6 +806,8 @@
            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,model.getStartDate())
                .set(Orders::getEndDate,model.getEndDate())
@@ -808,6 +817,7 @@
                .set(Orders::getUpdateTime,new Date())
                .set(Orders::getEstimatedAccount,total)
                .set(Orders::getOriginEstimatedAccount,total)
                .set(Orders::getReceiveAccount,reciveTotal)
                .eq(Orders::getId,orders.getId())
        );
        //创建操作日志
@@ -844,24 +854,28 @@
    public Long getTotal(Orders orders){
        if(Objects.isNull(orders)
                ||Objects.isNull(orders.getPrice())
                ||Objects.isNull(orders.getPriceNum1())){
                ||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) && 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)
        ){
            orders.setPriceNum2(Constants.ONE);
            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()));
        }
        BigDecimal 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();
    }

@@ -911,9 +925,12 @@
        }
        orders.setPriceNum1(confirmUpdOrderDTO.getPriceNum1());
        orders.setPriceNum2(confirmUpdOrderDTO.getPriceNum2());
        orders.setConfirmOtherFee(confirmUpdOrderDTO.getConfirmOtherFee());
        Long totalFee = this.getTotal(orders);//重新计算费用
        Long payFee = totalFee+Constants.formatLongNum(confirmUpdOrderDTO.getConfirmOtherFee());//重新计算费用
        BigDecimal recFee = new BigDecimal(payFee).multiply((new BigDecimal(1).subtract(Constants.formatBigDecimal(orders.getPlatformRata())))).setScale(0, RoundingMode.HALF_UP) ;
        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())
@@ -922,14 +939,21 @@
                .set(Orders::getEstimatedAccount,totalFee)
                .set(Orders::getStatus,Constants.ordersStatus.feeconfirm.getKey())
                .set(Orders::getPayAccount,payFee)
                .set(Orders::getReceiveAccount,recFee.longValue())
                .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);
        }

    }

@@ -1086,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)){
@@ -1132,6 +1156,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.ONE);
        }

@@ -1169,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,new Date())
                .set(Orders::getCancelTime,new Date())
                .set(Orders::getStatus,Constants.ordersStatus.wait.getKey())
                .set(Orders::getAcceptMemberId,null)
                .set(Orders::getAcceptType,null)
@@ -1199,6 +1225,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.TWO);
        }
        //短信通知
@@ -1224,9 +1251,16 @@
        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())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
@@ -1242,7 +1276,8 @@
        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 =  (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);
@@ -1316,21 +1351,28 @@
        }

        if(!((( Constants.equalsInteger(orders.getType(),Constants.TWO) && Constants.equalsInteger(orders.getStatus(),Constants.ZERO) )
                || ( !Constants.equalsInteger(orders.getType(),Constants.TWO) && Constants.equalsInteger(orders.getStatus(),Constants.THREE) ))
                || ( !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,orders.getMember().getOpenid());
        Object object = this.getWxPayResponse(orders,payMember.getOpenid());
        orderReleaseVO.setObject(object);
        orderReleaseVO.setId(orders.getId());
        return orderReleaseVO;
@@ -1394,6 +1436,7 @@
            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);
        }
        //短信通知发单方
@@ -1493,7 +1536,7 @@
            }
        }else{
            //非用餐类订单
            if(!Constants.equalsInteger(orders.getStatus(),Constants.THREE)){
            if(!Constants.equalsInteger(orders.getStatus(),Constants.FIVE)){
                return  ("处理成功!");
            }else{
                //处理支付完成逻辑
@@ -1573,9 +1616,7 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        Orders model = pageWrap.getModel();
        if(Objects.isNull(model)
            || Objects.isNull(model.getQueryLat())
            || Objects.isNull(model.getQueryLgt())
                || Objects.isNull(model.getQueryMyOrderType())
            || Objects.isNull(model.getQueryMyOrderType())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
@@ -1620,24 +1661,29 @@
                .select("c2.name",Orders::getTransportTypeName)
                .leftJoin(" category c1 on t.category_id = c1.id  ")
                .leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id  ")
                .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)
                .eq(Objects.nonNull(model.getType()),Orders::getType,model.getType());
                .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()),Orders::getStatus,model.getStatus());
                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{
                //查询用户的接单权重
                //查询用户的接单权重 æŽ¥å•å¤§åŽ…
                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() ");
@@ -1658,38 +1704,13 @@
        IPage<Orders> iPage = ordersMapper.selectJoinPage(page,Orders.class,queryWrapper);
        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())
                );
            }
        }
//        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")
//                        )
//                );
//                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);
    }

@@ -1789,12 +1810,25 @@
        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());
            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()
@@ -1893,7 +1927,7 @@
            BigDecimal lat = orders.getLat();
            BigDecimal lgt = orders.getLgt();
            //查询范围内的会员
            List<Member> memberList = memberMapper.getList(lgt,lat,orders.getType());
            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)
@@ -1915,7 +1949,7 @@
            Member releaseMember = memberMapper.selectById(orders.getReleaseMemberId());
            //自动派单
            Orders model = ordersMapper.selectById(orders.getId());
            if(!Constants.equalsInteger(model.getStatus(),Constants.ONE) || Constants.equalsInteger(model.getId(),model.getReleaseMemberId())){
            if(!Constants.equalsInteger(model.getStatus(),Constants.ONE) || Constants.equalsInteger(releaseMember.getId(),model.getReleaseMemberId())){
               //如果订单已删除 å¹¶ä¸”非发布方
                continue;
            }
@@ -1999,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")
        );
@@ -2013,6 +2048,34 @@
                //记录同意修改的日志
                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);
            }
        }

 server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java

@@ -268,11 +268,25 @@
                        .set(WithdrawalOrders::getUpdateTime, DateUtil.getCurrDateTime())
                        .eq(WithdrawalOrders::getOutBillNo,outBillNo)
                );
                //修改流水记录状态
                memberRevenueMapper.update(new UpdateWrapper<MemberRevenue>().lambda()
                        .set(MemberRevenue::getStatus,Constants.ZERO)
                        .set(MemberRevenue::getUpdateTime, DateUtil.getCurrDateTime())
                        .eq(MemberRevenue::getObjId,withdrawalOrders.getId())
                        .eq(MemberRevenue::getObjType,Constants.ONE)
                );
                withdrawalOrders.setUpdateTime(new Date());
                sendWxMessage.withdrawalMessage(member.getOpenid(),withdrawalOrders);
            }else {
                //更新用户余额
                memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" AMOUNT = AMOUNT +  " + withdrawalOrders.getAmount() ).eq(Member::getId,withdrawalOrders.getMemberId()));
                //修改流水记录状态
                memberRevenueMapper.update(new UpdateWrapper<MemberRevenue>().lambda()
                        .set(MemberRevenue::getStatus,Constants.ONE)
                        .set(MemberRevenue::getUpdateTime, DateUtil.getCurrDateTime())
                        .eq(MemberRevenue::getObjId,withdrawalOrders.getId())
                        .eq(MemberRevenue::getObjType,Constants.ONE)
                );
                //存储流水记录
                MemberRevenue memberRevenue = new MemberRevenue();
                memberRevenue.setCreateTime(new Date());

 server/web/src/main/java/com/doumee/api/web/OrdersApi.java

@@ -65,6 +65,7 @@
        ordersService.update(orders);
        return  ApiResponse.success("操作成功");
    }

    @LoginRequired
    @ApiOperation(value = "接单方确认订单费用 - æŽ¥å•æ–¹", notes = "小程序端")
    @PostMapping("/confirmFee")