feat:1技师超时未接单2.车费设置

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TConsumptionLog.java

@@ -30,6 +30,8 @@ public class TConsumptionLog extends Model<TConsumptionLog> {
     private String billNo;
     //openId
     private String openId;
+    //是否可提0否1是
+    private Integer isGet;
     //备注
     private String note;
     //系统创建时间

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TOrder.java

@@ -123,6 +123,9 @@ public class TOrder implements Serializable {
     @ApiModelProperty("出发时间")
     private Date departTime;
 
+    @ApiModelProperty("支付时间")
+    private Date payTime;
+
     //详细地址
     @ApiModelProperty("详细地址")
     private String address;

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TFareSettingServiceImpl.java

@@ -47,7 +47,9 @@ public class TFareSettingServiceImpl extends ServiceImpl<TFareSettingMapper, TFa
             //该部门已启用的
             List<TFareSetting> fareSettings = this.list(tFareSettingLambdaQueryWrapper);
             if (!Collections.isEmpty(fareSettings)) {
-                throw new ServiceException("该部门已有启用的设置");
+                if(!fareSettings.get(MassageConstants.INTEGER_ZERO).getId().equals(tFareSetting.getId())){
+                    throw new ServiceException("该部门已有启用的设置");
+                }
             }
         }
         this.updateById(tFareSetting);

nightFragrance-massage/src/main/java/com/ylx/massage/task/massageTask.java

@@ -86,6 +86,40 @@ public class massageTask {
             });
         }
         return resPage.getTotal();
+    }
+
+    public void timeoutNotOrder() {
+
+        Date nowDate = new Date();
+        log.info("开始执行取消订单任务当前时间,{}", nowDate);
+
+        Date date = DateTimeUtils.addMinute(nowDate, -10);
+        log.info("开始执行取消订单任务当前时间减5分钟,{}", date);
+        long total = 1L;
+        while (total > 0L) {
+            total = timeoutNotOrder(date);
+        }
+    }
+    private Long timeoutNotOrder(Date nowDate) {
+        log.info("extracted 开始执行取消订单任务时间,{}", nowDate);
+        LambdaQueryWrapper<TOrder> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        objectLambdaQueryWrapper.eq(TOrder::getnStatus, OrderStatusEnum.WAIT_JD.getCode()).
+                le(TOrder::getPayTime, nowDate).
+                orderByAsc(TOrder::getPayTime);
+
+        Page<TOrder> page = new Page<>();
+        page.setSize(MassageConstants.TWO_HUNDRED);
+
+        Page<TOrder> resPage = orderService.page(page, objectLambdaQueryWrapper);
+        if (CollectionUtil.isNotEmpty(resPage.getRecords())) {
+            resPage.getRecords().forEach(order -> {
+                //调用拒绝接单
+                //todo 订单锁
+                order.setReasonRefusal("超时未接单");
+                orderService.jujue(order);
+            });
+        }
+        return resPage.getTotal();
 
     }
 

nightFragrance-massage/src/main/java/com/ylx/massage/utils/Sendvoice.java

@@ -0,0 +1,87 @@
+package com.ylx.massage.utils;
+
+import java.util.Map;
+
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson2.JSONObject;
+
+
+//接口类型：互亿无线语音通知接口。
+//账户注册：请通过该地址开通账户https://user.ihuyi.com/new/register.html
+//注意事项：
+//（1）调试期间，请仔细阅读接口文档；
+//（2）请使用APIID（查看APIID请登录用户中心->语音通知->帐户及签名设置->APIID）及 APIkey来调用接口；
+//（3）该代码仅供接入互亿无线语音通知接口参考使用，客户可根据实际需要自行编写；
+
+public class Sendvoice {
+
+//    private static String Url = "http://api.vm.ihuyi.com/webservice/voice.php?method=Submit";
+
+    public static void main(String [] args) {
+
+
+        //todo
+        StringBuffer url = new StringBuffer();
+        url.append("http://api.vm.ihuyi.com/webservice/voice.php?method=Submit")
+                .append("&account=").append("VM08088034")
+                .append("&password=").append("59558b5efbc5513a2593ac48d1705006")
+                .append("&mobile=").append("18360233903")
+                .append("&content=").append("您的订单号是：0648。已由顺风快递发出，请注意查收。")
+                .append("&format=").append("json");
+        String rs = HttpUtil.get(url.toString());
+        Map<?, ?> map = JSONObject.parseObject(rs, Map.class);
+
+//        HttpClient client = new HttpClient();
+//        PostMethod method = new PostMethod(Url);
+//
+//        //client.getParams().setContentCharset("GBK");
+//        client.getParams().setContentCharset("UTF-8");
+//        method.setRequestHeader("ContentType","application/x-www-form-urlencoded;charset=UTF-8");
+//
+//        NameValuePair[] data = {//提交短信
+//                new NameValuePair("account", "VM08088034"),//用户名是登录用户中心->语音通知->帐户参数设置->APIID
+//                new NameValuePair("password", "59558b5efbc5513a2593ac48d1705006"),//查看密码请登录用户中心->语音通知->帐户参数设置->APIKEY
+//                new NameValuePair("mobile", "139xxxxxxxx"),//手机号码
+//                new NameValuePair("content", "您的订单号是：0648。已由顺风快递发出，请注意查收。"),
+//        };
+//
+//        method.setRequestBody(data);
+//
+//        try {
+//            client.executeMethod(method);
+//
+//            String SubmitResult = method.getResponseBodyAsString();
+//
+//            //System.out.println(SubmitResult);
+//
+//            Document doc = DocumentHelper.parseText(SubmitResult);
+//            Element root = doc.getRootElement();
+//
+//            String code = root.elementText("code");
+//            String msg = root.elementText("msg");
+//            String voiceid = root.elementText("voiceid");
+//
+//            System.out.println(code);
+//            System.out.println(msg);
+//            System.out.println(voiceid);
+//
+//            if("2".equals(code)){
+//                System.out.println("短信提交成功");
+//            }
+//
+//        } catch (HttpException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        } catch (IOException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        } catch (DocumentException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+
+    }
+
+}
+
+

nightFragrance-massage/src/main/java/com/ylx/massage/utils/yuan.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+<div class="circle"></div>
+</body>
+<style>
+    .circle {
+        width: 100px;  /* 设置宽度 */
+        height: 100px; /* 设置高度 */
+        background-color: #48a232; /* 设置背景颜色 */
+        border: black 20px solid;
+        border-radius: 50%; /* 设置圆角，50%可以使得矩形变为圆形 */
+        display: inline-block; /* 可以让div并排显示 */
+    }
+</style>
+<script>
+
+</script>
+</html>

nightFragrance-massage/src/main/resources/mapper/massage/TConsumptionLogMapper.xml

@@ -16,7 +16,7 @@
 
     <!-- 批量插入 -->
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into ry-vue.t_consumption_log(amountbill_typebill_noopen_idnotecreate_timeupdate_timeis_delete)
+        insert into t_consumption_log(amount,bill_type,bill_no,open_id,note,create_time,update_time,is_delete)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.amount}#{entity.billType}#{entity.billNo}#{entity.openId}#{entity.note}#{entity.createTime}#{entity.updateTime}#{entity.isDelete})
@@ -24,7 +24,7 @@
     </insert>
     <!-- 批量插入或按主键更新 -->
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into ry-vue.t_consumption_log(amountbill_typebill_noopen_idnotecreate_timeupdate_timeis_delete)
+        insert into t_consumption_log(amountbill_typebill_noopen_idnotecreate_timeupdate_timeis_delete)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.amount}#{entity.billType}#{entity.billNo}#{entity.openId}#{entity.note}#{entity.createTime}#{entity.updateTime}#{entity.isDelete})

nightFragrance-massage/src/main/resources/mapper/massage/TOrderMapper.xml

@@ -44,6 +44,7 @@
         <result column="acceptance_time" property="acceptanceTime"/>
         <result column="reach_time" property="reachTime"/>
         <result column="start_time" property="startTime"/>
+        <result column="pay_time" property="payTime"/>
         <result column="end_time" property="endTime"/>
         <result column="reason_refusal" property="reasonRefusal"/>
 
@@ -96,6 +97,7 @@
         t_order.c_phone,
         t_order.c_note,
         t_order.c_time,
+        t_order.pay_time,
         t_order.timeout_cause,
         t_order.name,
         t_order.dept_id,