fix:支付后电话通知技师{你在【变量】有一条新的预约服务订单待确认，请尽快前往确认接单}

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

@@ -302,6 +302,15 @@ public class TJs implements Serializable {
     private String ticket;
 
 
+    public String getcVideo() {
+        return cVideo;
+    }
+
+    public void setcVideo(String cVideo) {
+        this.cVideo = cVideo;
+    }
+
+
     public String getcOpenId() {
         return cOpenId;
     }

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

@@ -157,7 +157,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         if (order.getDistance() != null && order.getDistance().compareTo(BigDecimal.ZERO) > 0) {
             //判断是否可以免车费
             if (!this.isFree(js, order.getDistance())) {
-                BigDecimal bigDecimal = massageUtil.calculateTaxiFare(order.getDistance(), order.getDeptId());
+                BigDecimal bigDecimal = massageUtil.calculateTaxiFare(order.getDistance(), js.getDeptId());
                 order.setFare(bigDecimal.setScale(MassageConstants.INTEGER_TWO, RoundingMode.HALF_UP));
             }
         }
@@ -383,8 +383,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         if (!orderNew.getnStatus().equals(OrderStatusEnum.WAIT_PAY.getCode())) {
             throw new ServiceException("该订单已经支付或者超时被取消");
         }
+        TJs js = jsService.getById(orderNew.getcJsId());
         if (StringUtils.isBlank(orderNew.getParentNo())) {
-            TJs js = jsService.getById(orderNew.getcJsId());
+
             if (null == js || js.getnStatus().equals(JsStatusEnum.JS_SERVICE.getCode())) {
                 throw new ServiceException("该技师已在服务中请重新下单");
             }
@@ -404,6 +405,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         if (order.getPayType().equals(MassageConstants.INTEGER_ONE)) {
             //微信支付
             R resp = rechargeService.getPay(orderNew.getOrderNo(), orderNew.getTotalPrice(), orderNew.getcOpenId(), BillTypeEnum.WX_PAY.getInfo(), BillTypeEnum.WX_PAY.getCode().toString());
+            //电话通知
+            Sendvoice.sendPhone(js.getcPhone());
             return resp;
         }
 
@@ -416,7 +419,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             throw new ServiceException("账户金额不够请充值");
         } else {
             orderPayManage(user, orderNew);
-
+            //电话通知
+            Sendvoice.sendPhone(js.getcPhone());
             return R.ok();
         }
     }

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

@@ -4,6 +4,7 @@ package com.ylx.massage.utils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ylx.massage.domain.TFareSetting;
 import com.ylx.massage.service.TFareSettingService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -15,7 +16,7 @@ import java.math.RoundingMode;
  * @author jianlong
  * @date 2024-04-15 14:38
  */
-
+@Slf4j
 @Component
 public class MassageUtil {
 
@@ -42,13 +43,16 @@ public class MassageUtil {
         BigDecimal ADDITIONAL_FARE_PER_KM = additionalFarePerKm; // 超出起步价后每公里费用
         BigDecimal BASE_DISTANCE_KM = baseDistanceKm; // 起步距离（公里）
         LambdaQueryWrapper<TFareSetting> tFareSettingLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        log.info("部门{}", deptId);
         tFareSettingLambdaQueryWrapper.eq(TFareSetting::getDeptId, deptId).eq(TFareSetting::getEnable, 1);
         TFareSetting fareSetting = fareSettingService.getOne(tFareSettingLambdaQueryWrapper);
+        log.info("配置{}", fareSetting);
         if (null != fareSetting) {
             BASE_FARE = fareSetting.getBaseFare();
             ADDITIONAL_FARE_PER_KM = fareSetting.getAdditionalFarePer();
             BASE_DISTANCE_KM = fareSetting.getBaseDistance();
         }
+        log.info("起步价:{},超出起步价后每公里费用:{},起步距离{}", BASE_FARE, ADDITIONAL_FARE_PER_KM, BASE_DISTANCE_KM);
 
         // 计算超出起步价的公里数，注意应该向上取整，因为不足1公里也要按1公里计费
         BigDecimal extraKms = distance.subtract(BASE_DISTANCE_KM).setScale(0, RoundingMode.UP);

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

@@ -23,20 +23,18 @@ public class Sendvoice {
 
     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("13141345053")
-                .append("&content=").append("您的订单号是：0648。已由顺风快递发出，请注意查收。")
+                .append("&content=").append("你在【大菠萝平台】有一条新的预约服务订单待确认，请尽快前往确认接单")
                 .append("&format=").append("json");
         String rs = HttpUtil.get(url.toString());
         Map<?, ?> map = JSONObject.parseObject(rs, Map.class);
-        map.toString();
-        log.info("map====t{}",map.toString());
-
+        log.info("电话通知返回参数{}",map.toString());
 //        HttpClient client = new HttpClient();
 //        PostMethod method = new PostMethod(Url);
 //
@@ -88,6 +86,19 @@ public class Sendvoice {
 
     }
 
+    public static void sendPhone(String phone) {
+        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(phone)
+                .append("&content=").append("你在【大菠萝平台】有一条新的预约服务订单待确认，请尽快前往确认接单")
+                .append("&format=").append("json");
+        String rs = HttpUtil.get(url.toString());
+        Map<?, ?> map = JSONObject.parseObject(rs, Map.class);
+        log.info("电话通知返回参数{}",map.toString());
+    }
+
 }