202506171818

ruoyi-system/src/main/java/com/ruoyi/system/controller/AppletController.java

@@ -4652,16 +4652,32 @@ public class AppletController extends BaseController {
             order.setReceiveTime(new Date());
             order.setIsAccept(1); // 1:已接单
             order.setJsonStatus(2); // 服务进度：2=接单
+            order.setStatus(2l);
             order.setLogStatus(9);
             JSONObject json=new JSONObject();
             json.put("type",1);
             order.setLogJson(json.toJSONString());
-
+            orderService.updateOrder(order);
-            //绑定号码
 
             // 5. 写入日志
-            OrderUtil orderUtil = new OrderUtil();
+            OrderLog orderLog=new OrderLog();
-            orderUtil.SaveOrderLog(order);
+            orderLog.setOid(order.getId());
+            orderLog.setOrderId(order.getOrderId());
+            orderLog.setTitle("师傅接单");
+            orderLog.setType(new BigDecimal(2.0));
+            JSONObject js=new JSONObject();
+            js.put("type",  1);
+            orderLog.setContent(js.toJSONString());
+            orderLog.setWorkerId(order.getWorkerId());
+            orderLog.setWorkerLogId(order.getWorkerId());
+            orderLogService.insertOrderLog(orderLog);
+//            OrderUtil orderUtil = new OrderUtil();
+//            orderUtil.SaveOrderLog(order);
+            //绑定号码
+            Map<String, Object>  bindmap= OrderBindWorkerUtil.getOrderBindWorker(order.getId());
+            //发送微信推送通知客户师傅已接单
+
+
             // 6. 返回成功
             return AjaxResult.success("接单成功");
         } catch (Exception e) {

ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/GaoDeMapUtil.java

@@ -14,7 +14,7 @@ import java.nio.charset.StandardCharsets;
 public class GaoDeMapUtil {
 
     // 请替换为你自己的高德Web服务Key
-    private static final String GAODE_KEY = "YOUR_GAODE_WEB_KEY";
+    private static final String GAODE_KEY = "308ad08f306d74daddffba44f5537767";
 
     /**
      * 根据经纬度获取所在城市名称

ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/OrderBindWorkerUtil.java

@@ -0,0 +1,125 @@
+package com.ruoyi.system.ControllerUtil;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.domain.Area;
+import com.ruoyi.system.domain.MobileMiddle;
+import com.ruoyi.system.domain.Order;
+import com.ruoyi.system.domain.UserAddress;
+import com.ruoyi.system.domain.Users;
+import com.ruoyi.system.service.IAreaService;
+import com.ruoyi.system.service.IMobileMiddleService;
+import com.ruoyi.system.service.IOrderService;
+import com.ruoyi.system.service.IUserAddressService;
+import com.ruoyi.system.service.IUsersService;
+import com.winnerlook.model.VoiceResponseResult;
+
+/**
+ * 师傅绑定订单的电话号码操作
+ *
+ *
+ * @author Mr. Zhang Pan
+ * @date 2025-01-03
+ * @version 1.0
+ */
+public class OrderBindWorkerUtil {
+
+    private static final IUsersService usersService= SpringUtils.getBean(IUsersService.class);
+    private static final IUserAddressService userAddressService= SpringUtils.getBean(IUserAddressService.class);
+    private static final IMobileMiddleService  mobileMiddleService= SpringUtils.getBean(IMobileMiddleService.class);
+    private static final IOrderService orderService= SpringUtils.getBean(IOrderService.class);
+    private static final IAreaService areaService= SpringUtils.getBean(IAreaService.class);
+    
+
+    /**
+     * 订单绑定师傅电话号码操作
+     * @param orderId 订单ID
+     * @return 绑定结果Map，包含code和msg
+     */
+    public static Map<String, Object> getOrderBindWorker(long orderId) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            // 1. 查询订单
+            Order order = orderService.selectOrderById(orderId);
+            if (order == null) {
+                result.put("code", 404);
+                result.put("msg", "订单不存在");
+                return result;
+            }
+            // 2. 查询师傅信息
+            Users workerUser = usersService.selectUsersById(order.getWorkerId());
+            if (workerUser == null) {
+                result.put("code", 404);
+                result.put("msg", "师傅信息不存在");
+                return result;
+            }
+            // 3. 查询订单地址
+            UserAddress userAddress = userAddressService.selectUserAddressById(order.getAddressId());
+            if (userAddress == null) {
+                result.put("code", 404);
+                result.put("msg", "订单地址不存在");
+                return result;
+            }
+            // 4. 经纬度转城市
+            double lng = Double.parseDouble(userAddress.getLongitude());
+            double lat = Double.parseDouble(userAddress.getLatitude());
+            String city = GaoDeMapUtil.getCityByLocation(lng, lat);
+            if (city == null || city.isEmpty()) {
+                result.put("code", 500);
+                result.put("msg", "无法根据经纬度获取城市信息");
+                return result;
+            }
+            // 5. 查询城市编码
+            Area area = new Area();
+            area.setTitle(city);
+            List<Area> areaList = areaService.selectAreaList(area);
+            if (areaList == null || areaList.isEmpty()) {
+                result.put("code", 404);
+                result.put("msg", "未找到城市编码");
+                return result;
+            }
+            Long cityCode = areaList.get(0).getId();
+            // 6. 查询可用中间号
+            MobileMiddle mobileMiddleQuery = new MobileMiddle();
+            mobileMiddleQuery.setCityId(cityCode);
+            List<MobileMiddle> mobileMiddleList = mobileMiddleService.selectMobileMiddleList(mobileMiddleQuery);
+            if (mobileMiddleList == null || mobileMiddleList.isEmpty()) {
+                result.put("code", 404);
+                result.put("msg", "该城市暂无可用中间号");
+                return result;
+            }
+            // 7. 获取用户和师傅手机号
+            String userPhone = userAddress.getPhone();
+            String workerPhone = workerUser.getPhone();
+            if (userPhone == null || workerPhone == null) {
+                result.put("code", 400);
+                result.put("msg", "用户或师傅手机号为空");
+                return result;
+            }
+            // 8. 绑定中间号，直到成功
+            for (MobileMiddle middle : mobileMiddleList) {
+                VoiceResponseResult bindResult = YunXinPhoneUtilAPI.httpsPrivacyBindAxb(middle.getPhone(), userPhone, workerPhone);
+                if ("000000".equals(bindResult.getResult())) {
+                    // 绑定成功，更新订单
+                    order.setMiddlePhone(middle.getPhone());
+                    order.setUserPhone(userPhone);
+                    order.setWorkerPhone(workerPhone);
+                    orderService.updateOrder(order);
+                    result.put("code", 200);
+                    result.put("msg", "绑定成功");
+                    return result;
+                }
+            }
+            // 9. 所有中间号都绑定失败
+            result.put("code", 500);
+            result.put("msg", "所有中间号均绑定失败");
+        } catch (Exception e) {
+            result.put("code", 500);
+            result.put("msg", "绑定异常: " + e.getMessage());
+        }
+        return result;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/OrderLogMapper.java

@@ -19,7 +19,13 @@ public interface OrderLogMapper
      */
     public OrderLog selectOrderLogById(Long id);
 
-
+    /**
+     * 查询最新一条日志记录
+     *
+     * @param oid 订单服务记录主键
+     * @return 订单服务记录
+     */
+    public OrderLog selectDataTheFirstNew(Long oid);
      public int selectCountOrderLogByOrderId(String orderId);
 
      public List<OrderLog> selectOrderLogByOrderId(String orderId);

ruoyi-system/src/main/java/com/ruoyi/system/service/IOrderLogService.java

@@ -21,6 +21,15 @@ public interface IOrderLogService
 
 
 
+    /**
+     * 查询最新一条日志记录
+     *
+     * @param oid 订单服务记录主键
+     * @return 订单服务记录
+     */
+    public OrderLog selectDataTheFirstNew(Long oid);
+
+
     /**
      * 查询订单服务记录数量
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderLogServiceImpl.java

@@ -32,6 +32,18 @@ public class OrderLogServiceImpl implements IOrderLogService
     }
 
 
+
+    /**
+     * 查询最新一条日志记录
+     *
+     * @param oid 订单服务记录主键
+     * @return 订单服务记录
+     */
+    public OrderLog selectDataTheFirstNew(Long oid) {
+        return  orderLogMapper.selectDataTheFirstNew(oid);
+
+    }
+
 /**
      * 查询订单服务记录数量
      * 

ruoyi-system/src/main/resources/mapper/system/OrderLogMapper.xml

@@ -81,7 +81,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="selectDataTheFirstNew" parameterType="Long" resultMap="OrderLogResult">
+        <include refid="selectOrderLogVo"/>
+        where oid = #{oid}
+        ORDER BY created_at DESC  LIMIT 1;
 
+    </select>
 
     <select id="selectOrderLogByOrderId" parameterType="String" resultMap="OrderLogResult">
         select * from order_log where order_id = #{orderId} order by id  DESC

ruoyi-ui/src/views/login.vue

@@ -7,6 +7,7 @@
           v-model="loginForm.username"
           type="text"
           auto-complete="off"
+            size="medium"
           placeholder="账号"
         >
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -18,6 +19,7 @@
           type="password"
           auto-complete="off"
           placeholder="密码"
+          size="medium"
           @keyup.enter.native="handleLogin"
         >
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
@@ -44,6 +46,7 @@
           size="medium"
           type="primary"
           style="width:100%;"
+          class="submit"
           @click.native.prevent="handleLogin"
         >
           <span v-if="!loading">登 录</span>
@@ -56,7 +59,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>
+      
     </div>
   </div>
 </template>
@@ -156,7 +159,7 @@ export default {
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style lang="scss" scoped>
 .login {
   display: flex;
   justify-content: center;
@@ -177,16 +180,19 @@ export default {
   width: 400px;
   padding: 25px 25px 5px 25px;
   z-index: 1;
-  .el-input {
+  
-    height: 38px;
-    input {
-      height: 38px;
-    }
-  }
   .input-icon {
-    height: 39px;
+    height: 46px;
     width: 14px;
-    margin-left: 2px;
+    margin-left: 10px;
+  }
+  .submit{
+    padding: 15px;
+  }
+  ::v-deep .el-input__inner {
+    line-height: 46px !important;
+    height: 46px !important;
+    padding-left: 40px;
   }
 }
 .login-tip {
@@ -196,7 +202,7 @@ export default {
 }
 .login-code {
   width: 33%;
-  height: 38px;
+  height: 46px;
   float: right;
   img {
     cursor: pointer;
@@ -216,6 +222,6 @@ export default {
   letter-spacing: 1px;
 }
 .login-code-img {
-  height: 38px;
+  height: 46px;
 }
 </style>