解决小程序与公众号先后注册问题

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/FtmsorderbillscarsMapper.java

@@ -1,6 +1,5 @@
 package com.ruoyi.orderPlan.mapper;
 
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscntrs;
@@ -170,6 +169,14 @@ public interface FtmsorderbillscarsMapper {
     /**
      *  根据查询条件查询 状态跟踪列表页 按钮数据
      * @return  结果
+     * @param ftmsorderbills
      */
-    public Map<String, Object> getButtonValue();
+    public Map<String, Object> getButtonValue(Ftmsorderbills ftmsorderbills);
+
+    /**
+     *  根据手机号查询司机 新订单、本月订单、本月历程、本月运费
+     * @param phoneNumber   手机号
+     * @return  结果
+     */
+    public int selectMissedOrdersCount(String phoneNumber);
 }

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillscarsServiceImpl.java

@@ -167,6 +167,33 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
     }
 
     /**
+     *  根据查询条件查询 状态跟踪列表页 按钮数据
+     * @return  结果
+     */
+    @Override
+    public Map<String, Object> getButtonValue() {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        String phonenumber = user.getPhonenumber();
+        Ftmsorderbills ftmsorderbills = new Ftmsorderbills();
+        if ("11".equals(user.getUserType())) {
+            if (StringUtils.isNotEmpty(phonenumber)) {
+                ftmsorderbills.setDriverTel(phonenumber);
+            } else {
+                return null;
+            }
+        }
+        String roleType = "车队";
+        // 判断是不是车队
+        SysUser sysUser = sysUserRoleMapper.selectRoleUserByUserId(user.getUserId(), roleType);
+        if (StringUtils.isNotNull(sysUser)) {
+            ftmsorderbills.setIsFleet("1");
+            TCorps corps = tCorpsMapper.selectTCorpsByFTel(sysUser.getPhonenumber());
+            ftmsorderbills.setFleetId(corps.getfId());
+        }
+        return ftmsorderbillscarsMapper.getButtonValue(ftmsorderbills);
+    }
+
+    /**
      * 根据手机号查询司机的
      * 新订单、本月订单、本月历程、本月运费
      * @param phoneNumber   手机号
@@ -179,11 +206,10 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             return AjaxResult.error("未找到司机信息，请确认手机号");
         }
         // 查询未接单数量
+        int count = ftmsorderbillscarsMapper.selectMissedOrdersCount(phoneNumber);
+        // 月份
         Ftmsorderbillscars ftmsorderbillscars = new Ftmsorderbillscars();
-        ftmsorderbillscars.setOrderStatus(10L);
         ftmsorderbillscars.setDriverTel(phoneNumber);
-        int count = ftmsorderbillscarsMapper.selectftmsorderbillscarsCount(ftmsorderbillscars);
-        // 月份
         ftmsorderbillscars.setMonthList(DateUtils.getMonth());
         Map<String, Object> map = ftmsorderbillscarsMapper.selectMonthlyOrder(ftmsorderbillscars);
         map.put("count", count);
@@ -191,15 +217,6 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
     }
 
     /**
-     *  根据查询条件查询 状态跟踪列表页 按钮数据
-     * @return  结果
-     */
-    @Override
-    public Map<String, Object> getButtonValue() {
-        return ftmsorderbillscarsMapper.getButtonValue();
-    }
-
-    /**
      * 根据司机id查询详细信息
      *
      * @param ftmsorderbillscars 用户id
@@ -646,6 +663,9 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
     public AjaxResult vehicleChangeAdd(Ftmsorderbillscars ftmsorderbillscars, LoginUser loginUser) {
         Map<String, Object> map = new HashMap<>();
         Ftmsorderbillsplans ftmsorderbillsplans = ftmsorderbillsplansMapper.selectftmsorderbillsplansById(ftmsorderbillscars.getPId());
+        if (StringUtils.isNull(ftmsorderbillscars.getCntrQty())) {
+            return AjaxResult.error("未找到派车数量，请确认");
+        }
         long carQty = ftmsorderbillsplans.getCarQty() + ftmsorderbillscars.getCntrQty();
         if (ftmsorderbillsplans.getCntrQty() < carQty) {
             return AjaxResult.error("派车货量超出调度安排数量，请确认");

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml

@@ -703,17 +703,24 @@
             and create_time <= #{currentDay[1]}
     </select>
 
-    <select id="getButtonValue" resultType="Map">
+    <select id="getButtonValue" parameterType="ftmsorderbills" resultType="Map">
         SELECT
-            COUNT( CASE WHEN accept_date IS NULL THEN 1 END ) AS acceptDate,
-            COUNT( CASE WHEN load_date IS NULL THEN 1 END ) AS loadDate,
-            COUNT( CASE WHEN md_load_date IS NULL THEN 1 END ) AS mdLoadDate,
-            COUNT( CASE WHEN un_load_date IS NULL THEN 1 END ) AS unLoadDate,
-            COUNT( CASE WHEN waybill_date IS NULL THEN 1 END ) AS waybillDate
+            COUNT( CASE WHEN c.accept_date IS NULL THEN 1 END ) AS acceptDate,
+            COUNT( CASE WHEN c.load_date IS NULL THEN 1 END ) AS loadDate,
+            COUNT( CASE WHEN c.md_load_date IS NULL THEN 1 END ) AS mdLoadDate,
+            COUNT( CASE WHEN c.un_load_date IS NULL THEN 1 END ) AS unLoadDate,
+            COUNT( CASE WHEN c.waybill_date IS NULL THEN 1 END ) AS waybillDate
         FROM
-            F_TMSORDERBILLSCARS
+            F_TMSORDERBILLSCARS c
+            LEFT JOIN t_corps fleet ON fleet.f_id = c.carcor_pid
         WHERE
-            bill_status = 6
+            c.bill_status = 6
+        <if test="driverTel != null">and c.driver_tel = #{driverTel}</if>
+        <if test="isFleet != null and isFleet == 1">AND fleet.f_id = #{fleetId}</if>
+    </select>
+
+    <select id="selectMissedOrdersCount" parameterType="string" resultType="Integer">
+        select count(id) from F_TMSORDERBILLSCARS where driver_tel = #{phoneNumber} and bill_status = 6
     </select>
 
     <insert id="insertftmsorderbillscars" parameterType="ftmsorderbillscars" useGeneratedKeys="true" keyProperty="id">

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

@@ -534,6 +534,7 @@ public class SysUserServiceImpl implements ISysUserService {
             sysUser.setUserName("暂存");
             sysUser.setNickName("暂存");
             sysUser.setStatus("1");
+            System.out.println("啥都没做需要新增：" + sysUser.toString());
             userMapper.insertUser(sysUser);
         }
     }
@@ -581,11 +582,10 @@ public class SysUserServiceImpl implements ISysUserService {
             // 创建过
             if (related) {
                 pUser.setRelatedNo("T");
-            } else {
-//                pUser.setOpenId(user.getOpenId());
-                pUser.setSessionKey(user.getSessionKey());
             }
+            pUser.setOpenId(user.getOpenId());
             pUser.setUnionId(user.getUnionId());
+            pUser.setSessionKey(user.getSessionKey());
             userMapper.updateUser(pUser);
             loginUser.setUser(pUser);
             return loginUser;

ruoyi-system/src/main/java/com/ruoyi/system/wechatUtils/UserQueue.java

@@ -59,6 +59,7 @@ public class UserQueue {
                                 String body = response.body().string();
                                 //得到一个JSON对象
                                 JSONObject object = JSON.parseObject(body);
+                                System.out.println("获取公众号唯数据：" + object.toString());
                                 //声明系统用户
                                 SysUser sysUser = new SysUser();
                                 sysUser.setOpenId(object.getString("openid"));