调整小程序问题，修改车队、司机存储表问题以及查询接口更换问题

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetCarManageController.java

@@ -41,7 +41,7 @@ public class FleetCarManageController extends BaseController
     /**
      * 查询【车辆】列表
      */
-    @PreAuthorize("@ss.hasPermi('basicdata:corps:query')")
+    @PreAuthorize("@ss.hasPermi('fleet:carManage:list')")
     @GetMapping("/query")
     public TableDataInfo query(FleetCarManage fleetCarManage)
     {
@@ -115,6 +115,6 @@ public class FleetCarManageController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(fleetCarManageService.deleteFleetCarManageByIds(ids));
+        return fleetCarManageService.deleteFleetCarManageByIds(ids);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetCompanyMsgController.java

@@ -58,10 +58,11 @@ public class FleetCompanyMsgController extends BaseController
      * 下拉框查询【车队】id、name列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(FleetCompanyMsg fleetCompanyMsg)
+    public TableDataInfo list(TCorps tCorps)
     {
-        startPage();
-        List<FleetCompanyMsg> list = fleetCompanyMsgService.selectFleetCompanyMsgIdNameList(fleetCompanyMsg);
+        String typeValue = "[\"4\"]";
+        tCorps.setfTypeid(typeValue);
+        List<TCorps> list = tCorpsService.selectTCorpsList(tCorps);
         return getDataTable(list);
     }
 
@@ -82,7 +83,7 @@ public class FleetCompanyMsgController extends BaseController
     /**
      * 导出【车队】列表
      */
-    @PreAuthorize("@ss.hasPermi('fleet:companyMsg:export')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:export')")
     @Log(title = "【车队】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(FleetCompanyMsg fleetCompanyMsg)
@@ -95,7 +96,7 @@ public class FleetCompanyMsgController extends BaseController
     /**
      * 获取【车队】详细信息
      */
-    @PreAuthorize("@ss.hasPermi('fleet:companyMsg:query')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -105,7 +106,7 @@ public class FleetCompanyMsgController extends BaseController
     /**
      * 导入【车队】Excel
      */
-    @PreAuthorize("@ss.hasPermi('fleet:companyMsg:query')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:query')")
     @PostMapping(value = "/importCreate")
     public AjaxResult importCreateCompanyMsg(@RequestParam("file") MultipartFile file)
     {
@@ -130,14 +131,6 @@ public class FleetCompanyMsgController extends BaseController
         } else if (UserConstants.NOT_UNIQUE.equals(tCorpsService.checkULoginAccountUnique(tCorps))) {
             return AjaxResult.error("新增信息'" + tCorps.getfCname() + "'失败，登录账号已存在");
         }
-        SysUser user = new SysUser();
-        user.setPhonenumber(tCorps.getfTel());
-        user.setUserName(tCorps.getLoginAccount());
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        } else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
         return fleetCompanyMsgService.insertFleetCompanyMsg(tCorps);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetDriverMsgController.java

@@ -46,25 +46,22 @@ public class FleetDriverMsgController extends BaseController
     @Autowired
     private IFleetDriverMsgService fleetDriverMsgService;
 
-    @Autowired
-    private ISysUserService userService;
-
     /**
      * 下拉框查询【司机】id、name列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(FleetDriverMsg fleetDriverMsg)
+    public List<TCorps> list(TCorps tCorps)
     {
-        startPage();
-        List<FleetDriverMsg> list = fleetDriverMsgService.selectFleetDriverMsgIdNameList(fleetDriverMsg);
-        return getDataTable(list);
+        String typeValue = "[\"6\"]";
+        tCorps.setfTypeid(typeValue);
+        return tCorpsService.selectTCorpsList(tCorps);
     }
 
     /**
      * 查询【车队】列表
      */
     @PreAuthorize("@ss.hasPermi('basicdata:corps:query')")
-    @GetMapping("/query")
+    @GetMapping(value = "/query")
     public TableDataInfo query(TCorps tCorps)
     {
         String typeValue = "[\"6\"]";
@@ -90,7 +87,7 @@ public class FleetDriverMsgController extends BaseController
     /**
      * 获取【司机】详细信息
      */
-    @PreAuthorize("@ss.hasPermi('fleet:driverMsg:query')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -100,9 +97,9 @@ public class FleetDriverMsgController extends BaseController
     /**
      * 新增【司机】
      */
-    @PreAuthorize("@ss.hasPermi('fleet:driverMsg:add')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:add')")
     @Log(title = "【司机】", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping(value = "/add")
     public AjaxResult add(@RequestBody TCorps tCorps)
     {
         if (StringUtils.isEmpty(tCorps.getfTel())) {
@@ -116,21 +113,13 @@ public class FleetDriverMsgController extends BaseController
         } else if (UserConstants.NOT_UNIQUE.equals(tCorpsService.checkUFCnameUnique(tCorps))) {
             return AjaxResult.error("新增信息'" + tCorps.getfCname() + "'失败，简称已存在");
         }
-        SysUser user = new SysUser();
-        user.setPhonenumber(tCorps.getfTel());
-        user.setUserName(tCorps.getLoginAccount());
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        } else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
         return fleetDriverMsgService.insertFleetDriverMsg(tCorps);
     }
 
     /**
      * 修改【司机】
      */
-    @PreAuthorize("@ss.hasPermi('fleet:driverMsg:edit')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:edit')")
     @Log(title = "【司机】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody FleetDriverMsg fleetDriverMsg)
@@ -142,7 +131,6 @@ public class FleetDriverMsgController extends BaseController
     /**
      * 删除【司机】
      */
-    @PreAuthorize("@ss.hasPermi('fleet:driverMsg:remove')")
     @Log(title = "【司机】", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -1,5 +1,6 @@
 package com.ruoyi.common.core.domain.entity;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.Email;
@@ -71,6 +72,9 @@ public class SysUser extends BaseEntity
     /** 微信唯一Id */
     private String openId;
 
+    /** 微信唯一状态码 */
+    private String unionId;
+
     /** 微信头像地址 */
     private String imgSrc;
 
@@ -251,6 +255,18 @@ public class SysUser extends BaseEntity
 
 	@JsonIgnore
     @JsonProperty
+    public String getUnionId()
+    {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId)
+    {
+        this.unionId = unionId;
+    }
+
+	@JsonIgnore
+    @JsonProperty
     public String getSessionKey()
     {
         return sessionKey;
@@ -383,28 +399,32 @@ public class SysUser extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("deptId", getDeptId())
-            .append("userName", getUserName())
-            .append("nickName", getNickName())
-            .append("email", getEmail())
-            .append("phonenumber", getPhonenumber())
-            .append("sex", getSex())
-            .append("avatar", getAvatar())
-            .append("password", getPassword())
-            .append("salt", getSalt())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("loginIp", getLoginIp())
-            .append("relatedNo", getRelatedNo())
-            .append("loginDate", getLoginDate())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("dept", getDept())
-            .toString();
+        return "SysUser{" +
+                "userId=" + userId +
+                ", deptId=" + deptId +
+                ", userName='" + userName + '\'' +
+                ", nickName='" + nickName + '\'' +
+                ", email='" + email + '\'' +
+                ", phonenumber='" + phonenumber + '\'' +
+                ", sex='" + sex + '\'' +
+                ", avatar='" + avatar + '\'' +
+                ", password='" + password + '\'' +
+                ", salt='" + salt + '\'' +
+                ", userType='" + userType + '\'' +
+                ", userSystem='" + userSystem + '\'' +
+                ", openId='" + openId + '\'' +
+                ", unionId='" + unionId + '\'' +
+                ", imgSrc='" + imgSrc + '\'' +
+                ", sessionKey='" + sessionKey + '\'' +
+                ", relatedNo='" + relatedNo + '\'' +
+                ", status='" + status + '\'' +
+                ", delFlag='" + delFlag + '\'' +
+                ", loginIp='" + loginIp + '\'' +
+                ", loginDate=" + loginDate +
+                ", dept=" + dept +
+                ", roles=" + roles +
+                ", roleIds=" + Arrays.toString(roleIds) +
+                ", postIds=" + Arrays.toString(postIds) +
+                '}';
     }
 }

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/IFleetCarManageService.java

@@ -56,7 +56,7 @@ public interface IFleetCarManageService
      * @param ids 需要删除的【车辆】ID
      * @return 结果
      */
-    public int deleteFleetCarManageByIds(Long[] ids);
+    public AjaxResult deleteFleetCarManageByIds(Long[] ids);
 
     /**
      * 删除【车辆】信息

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/IFleetCompanyMsgService.java

@@ -23,7 +23,7 @@ public interface IFleetCompanyMsgService
      * @param id 【车队】ID
      * @return 【车队】
      */
-    public FleetCompanyMsg selectFleetCompanyMsgById(Long id);
+    public TCorps selectFleetCompanyMsgById(Long id);
 
     /**
      * 查询【车队】列表

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/IFleetDriverMsgService.java

@@ -21,7 +21,7 @@ public interface IFleetDriverMsgService
      * @param id 【司机】ID
      * @return 【司机】
      */
-    public FleetDriverMsg selectFleetDriverMsgById(Long id);
+    public TCorps selectFleetDriverMsgById(Long id);
 
     /**
      * 查询【司机】列表
@@ -65,8 +65,8 @@ public interface IFleetDriverMsgService
 
     /**
      *  下拉框查询【司机】id、name列表
-     * @param fleetDriverMsg    条件
+     * @param tCorps    条件
      * @return  结果
      */
-    public List<FleetDriverMsg> selectFleetDriverMsgIdNameList(FleetDriverMsg fleetDriverMsg);
+    public List<TCorps> selectFleetDriverMsgIdNameList(TCorps tCorps);
 }

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetCarManageServiceImpl.java

@@ -12,7 +12,9 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillsattachs;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
 import com.ruoyi.orderPlan.mapper.FtmsorderbillsattachsMapper;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillscarsMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -32,11 +34,13 @@ public class FleetCarManageServiceImpl implements IFleetCarManageService
     @Autowired
     private FleetCarManageMapper fleetCarManageMapper;
 
-
     @Autowired
     private FtmsorderbillsattachsMapper ftmsorderbillsattachsMapper;
 
     @Autowired
+    private FtmsorderbillscarsMapper ftmsorderbillscarsMapper;
+
+    @Autowired
     private FleetCompanyMsgMapper fleetCompanyMsgMapper;
 
     /**
@@ -189,9 +193,17 @@ public class FleetCarManageServiceImpl implements IFleetCarManageService
      * @return 结果
      */
     @Override
-    public int deleteFleetCarManageByIds(Long[] ids)
+    public AjaxResult deleteFleetCarManageByIds(Long[] ids)
     {
-        return fleetCarManageMapper.deleteFleetCarManageByIds(ids);
+        for (Long id : ids) {
+            Ftmsorderbillscars ftmsorderbillscars = new Ftmsorderbillscars();
+            ftmsorderbillscars.setCarcorPid(id);
+            if (ftmsorderbillscarsMapper.selectftmsorderbillscarsCount(ftmsorderbillscars) > 0) {
+                return AjaxResult.error("该车辆已存在状态跟踪中，无法删除");
+            }
+        }
+        fleetCarManageMapper.deleteFleetCarManageByIds(ids);
+        return AjaxResult.success();
     }
 
     /**

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetCompanyMsgServiceImpl.java

@@ -72,8 +72,8 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
      * @return 【车队】
      */
     @Override
-    public FleetCompanyMsg selectFleetCompanyMsgById(Long id) {
-        return fleetCompanyMsgMapper.selectFleetCompanyMsgById(id);
+    public TCorps selectFleetCompanyMsgById(Long id) {
+        return tCorpsMapper.selectTCorpsById(id);
     }
 
     /**

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetDriverMsgServiceImpl.java

@@ -65,8 +65,8 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
      * @return 【司机】
      */
     @Override
-    public FleetDriverMsg selectFleetDriverMsgById(Long id) {
-        return fleetDriverMsgMapper.selectFleetDriverMsgById(id);
+    public TCorps selectFleetDriverMsgById(Long id) {
+        return corpsMapper.selectTCorpsById(id);
     }
 
     /**
@@ -96,11 +96,12 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
     public AjaxResult insertFleetDriverMsg(TCorps tCorps) {
         // 检验必填
         if (StringUtils.isNull(tCorps.getfPid()) ||
-                StringUtils.isNull(tCorps.getfName()) ||
-                StringUtils.isNull(tCorps.getfScale())) {
+                StringUtils.isNull(tCorps.getfName())) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("请填写必输项");
         }
+        String typeValue = "[\"6\"]";
+        tCorps.setfTypeid(typeValue);
         tCorps.setfStatus("1");
         if (null != tCorps.getfId()) {
             updateDriverPhone(tCorps);
@@ -109,29 +110,34 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
             corpsMapper.updateTCorps(tCorps);
             return AjaxResult.success();
         } else {
-            // 添加用户表
             SysUser sysUser = new SysUser();
-            sysUser.setUserName(tCorps.getfTel());
-            sysUser.setNickName(tCorps.getfName());
             sysUser.setPhonenumber(tCorps.getfTel());
+            sysUser.setUserName(tCorps.getLoginAccount());
+            if (userMapper.checkUserNameUnique(sysUser.getUserName()) > 1) {
+                return AjaxResult.error("新增用户'" + sysUser.getUserName() + "'失败，登录账号已存在");
+            } else if (StringUtils.isNotNull(userMapper.checkPhoneUnique(sysUser.getPhonenumber()))) {
+                return AjaxResult.error("新增用户'" + sysUser.getUserName() + "'失败，手机号码已存在");
+            }
+            // 添加用户表
+            SysUser use = new SysUser();
+            use.setUserName(tCorps.getfTel());
+            use.setNickName(tCorps.getfName());
+            use.setPhonenumber(tCorps.getfTel());
             //sysUser.setEmail(fleetDriverMsg.get);
-            sysUser.setUserType("11");
-            sysUser.setPassword(SecurityUtils.encryptPassword(tCorps.getfTel()));
-            sysUser.setDeptId(120L); // 当前给定、后期修改
-            Long[] rolr = {110L}; // 当前给定、后期修改
-            sysUser.setRoleIds(rolr);
+            use.setUserType("11");
+            use.setPassword(SecurityUtils.encryptPassword(tCorps.getfTel()));
             // 查询是否有用户提前关注小程序
             SysUser user = userMapper.selectUserByTel(tCorps.getfTel());
             if (StringUtils.isNotNull(user)) {
                 // 该用户提前关注小程序了
-                sysUser.setOpenId(user.getOpenId());
+                use.setOpenId(user.getOpenId());
                 if (StringUtils.isNotNull(user.getSessionKey())) {
-                    sysUser.setSessionKey(user.getSessionKey());
+                    use.setSessionKey(user.getSessionKey());
                 }
                 userMapper.deleteUserById(user.getUserId());
             }
             // 新增用户信息
-            userMapper.insertUser(sysUser);
+            userMapper.insertUser(use);
             // 新增用户与角色管理
             // 查询是否存在车队 角色
             SysRole role = roleMapper.selectRoleByName("司机");
@@ -143,7 +149,7 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
             List<SysUserRole> list = new ArrayList<SysUserRole>();
             SysUserRole sysUserRole = new SysUserRole();
             sysUserRole.setRoleId(role.getRoleId());
-            sysUserRole.setUserId(sysUser.getUserId());
+            sysUserRole.setUserId(use.getUserId());
             list.add(sysUserRole);
             userRoleMapper.batchUserRole(list);
             tCorps.setCreateTime(new Date());
@@ -210,7 +216,7 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
             if (ftmsorderbillscarsMapper.selectftmsorderbillscarsCount(ftmsorderbillscars) > 0) {
                 return AjaxResult.error("第" + line + "行数据已被使用无法删除");
             }
-            fleetDriverMsgMapper.deleteFleetDriverMsgById(id);
+            corpsMapper.deleteTCorpsById(id);
         }
         return AjaxResult.success();
     }
@@ -230,12 +236,12 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
     /**
      * 下拉框查询【司机】id、name列表
      *
-     * @param fleetDriverMsg 条件
+     * @param tCorps 条件
      * @return 结果
      */
     @Override
-    public List<FleetDriverMsg> selectFleetDriverMsgIdNameList(FleetDriverMsg fleetDriverMsg) {
-        return fleetDriverMsgMapper.selectFleetDriverMsgIdNameList(fleetDriverMsg);
+    public List<TCorps> selectFleetDriverMsgIdNameList(TCorps tCorps) {
+        return corpsMapper.selectTCorpsList(tCorps);
     }
 
 }

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

@@ -679,7 +679,10 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             String openId = sysUser.getOpenId();
             String nickName = sysUser.getNickName();
             String mblno = ftmsorderbillscars.getMblno();
-            String loadDate = DateUtils.dateTime(tmsorderbills.getLoadDate());
+            String loadDate = null;
+            if (StringUtils.isNotNull(tmsorderbills.getLoadDate())) {
+                loadDate = DateUtils.dateTime(tmsorderbills.getLoadDate());
+            }
             // 获得客户名
             TCorps corps = tCorpsMapper.selectTCorpsById(tmsorderbills.getCorpId());
             wechatService.newsPush(openId, nickName, mblno, amtDr + "", corps.getfName(), loadDate, "其他消息暂定", "备注暂定");

ruoyi-fleet/src/main/resources/mapper/basicData/FleetCarManageMapper.xml

@@ -348,7 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFleetCarManageListMap" parameterType="FleetCarManage" resultType="Map">
         SELECT
             car.id AS Id,
-            com.company_name AS fleetCompanyName,
+            com.f_name AS fleetCompanyName,
             car.car_num AS carNum,
             car.driver_name AS driverName,
             car.hang_num AS hangNum,
@@ -390,10 +390,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             car.remarks AS remarks
         FROM
             fleet_car_manage AS car
-            LEFT JOIN
-                fleet_company_msg AS com
-            ON
-                car.fleet_company_id = com.id
+            LEFT JOIN t_corps AS com ON com.f_id = car.fleet_company_id
         <where>
             <if test="fleetCompanyId != null "> and fleet_company_id = #{fleetCompanyId}</if>
             <if test="carNum != null  and carNum != ''"> and car_num = #{carNum}</if>

ruoyi-fleet/src/main/resources/mapper/basicData/FleetDriverMsgMapper.xml

@@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFleetDriverMsgIdNameList" resultType="FleetDriverMsg" resultMap="FleetDriverMsgResult">
         select id, fleet_company_id, name, tel from fleet_driver_msg
         <where>
+            <if test="fPid != null "> and f_pid = #{fPid}</if>
             <if test="fleetCompanyId != null "> and fleet_company_id = #{fleetCompanyId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="sex != null "> and sex = #{sex}</if>

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

@@ -413,7 +413,7 @@
             c.order_no orderNo,
             c.mblno,
             c.carreg_no carregNo,
-            driver.name driverName,
+            driver.f_name driverName,
             c.driver_tel driverTel,
             CASE
             c.order_status
@@ -513,7 +513,7 @@
             AND pod.f_types = 1
             LEFT JOIN sys_dict_data dic ON dic.dict_value = c.cntr_id
             AND dic.dict_type = 'data_cntrId'
-            LEFT JOIN fleet_driver_msg driver ON driver.id = c.driver_user_id
+            LEFT JOIN t_corps driver ON driver.f_id = c.driver_user_id
         <where>
             c.bill_status = 6
             <if test="corpId != null">and t.corp_id = #{corpId}</if>

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

@@ -77,7 +77,7 @@
             f.contract_no AS contractNo,
             f.accstl_type AS accstlType,
             f.accdays,
-            m.company_name AS carcorPid,
+            m.f_name AS carcorPid,
             f.load_addr AS loadAddr,
             f.md_load_addr AS mdLoadAddr,
             f.un_load_addr AS unLoadAddr,
@@ -101,7 +101,8 @@
             AND trans.dict_value = f.trans_type
             LEFT JOIN sys_dict_data prop ON prop.dict_type = 'data_transProp'
             AND prop.dict_value = f.trans_prop
-            LEFT JOIN fleet_company_msg m ON m.id = plan.carcor_pid
+            LEFT JOIN t_corps m ON m.f_id = plan.carcor_pid
+            AND m.f_typeid = '["4"]'
             LEFT JOIN t_corps c ON c.f_id = f.corp_id
             LEFT JOIN sys_user p ON p.user_id = f.plan_user_id
             LEFT JOIN sys_user a ON a.user_id = f.trans_user_id

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/WechatService.java

@@ -48,7 +48,7 @@ public class WechatService {
     @Value("${wechat.templateMsgUrl}")
     private String templateMsgUrl;
     // 模板id
-//    @Value("${wechat.templateId}")
+    @Value("${wechat.templateId}")
     private String templateId;
 
 
@@ -136,7 +136,7 @@ public class WechatService {
             if (StringUtils.isNull(user)) {
                 return AjaxResult.error("获取OpenId失败");
             }
-            // 解密获取手机号
+            // 解密获加密信息
             try {
                 String dataType = "phoneNumber";
                 AjaxResult ajaxResult = decodeUserInfo(loginBody.getPhonenumber(), loginBody.getIv(), user.getSessionKey(), dataType);
@@ -145,6 +145,13 @@ public class WechatService {
                     return ajaxResult;
                 }
                 user.setPhonenumber(ajaxResult.get("data").toString());
+                dataType = "unionId";
+                AjaxResult result = decodeUserInfo(loginBody.getEncryptedData(), loginBody.getEncryptedIv(), user.getSessionKey(), dataType);
+                String code1 = result.get("code").toString();
+                if ("500".equals(code1)) {
+                    return ajaxResult;
+                }
+                user.setUnionId(ajaxResult.get("data").toString());
             } catch (UnsupportedEncodingException e) {
                 log.info("解析手机号UnsupportedEncodingException异常：" + e);
                 e.printStackTrace();
@@ -213,10 +220,11 @@ public class WechatService {
      * @return 结果
      */
     public Objects newsPush(String fromUser, String name, String mblno, String amt, String corpName, String loadDate, String otherNews, String remark) {
-        System.out.println("开始创建模板");
         String jsonBody = "{\n" +
                 "  \"touser\": \"" + fromUser + "\",\n" +
-                "  \"template_id\": \"" + templateId + "\",\n" +
+                "  \"template_id\": \"PkeerRaAwBYrwvvrbKrXiGzYok0tehLa9huVxQ6vkco\",\n" +
+//                "  \"template_id\": \"" + templateId + "\",\n" +
+                "  \"url\": \"\",\n" +
                 "  \"data\": {\n" +
                 "    \"first\": {\n" +
                 "      \"value\": \"" + name + "\",\n" +

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

@@ -155,4 +155,11 @@ public interface SysUserMapper {
      * 凯和获取航线管理员
      */
     List<Map<String, Object>>selectUserNameFO();
+
+    /**
+     *  微信小程序根据手机号查询手机号是否存在
+     * @param unionId   唯一号码
+     * @return  结果
+     */
+    public SysUser selectUserByUnionId(String unionId);
 }

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

@@ -516,7 +516,7 @@ public class SysUserServiceImpl implements ISysUserService {
     public void attention(SysUser sysUser) {
         sysUser.setUserType("11");
         // 判断是否已经存在
-        SysUser user = userMapper.selectUserByopenId(sysUser.getOpenId());
+        SysUser user = userMapper.selectUserByUnionId(sysUser.getUnionId());
         if (StringUtils.isNotNull(user)) {
             if (StringUtils.isEmpty(user.getPhonenumber())) {
                 // 没有授权小程序,创建临时用户数据
@@ -538,7 +538,7 @@ public class SysUserServiceImpl implements ISysUserService {
     // 用户取关公众号
     @Transactional
     public boolean unsubscribe(SysUser sysUser) {
-        SysUser user = userMapper.selectUserByopenId(sysUser.getOpenId());
+        SysUser user = userMapper.selectUserByUnionId(sysUser.getUnionId());
         if (StringUtils.isNotNull(user)) {
             if ("1".equals(user.getStatus()) && "2".equals(user.getDelFlag())) {
                 // 没有授权小程序的  暂时性公众号
@@ -559,7 +559,7 @@ public class SysUserServiceImpl implements ISysUserService {
         boolean related = false;
         LoginUser loginUser = new LoginUser();
         // 判断是否提前存储过
-        SysUser sysUser = userMapper.selectUserByopenId(user.getOpenId());
+        SysUser sysUser = userMapper.selectUserByUnionId(user.getUnionId());
         if (StringUtils.isNotNull(sysUser)) {
             if ("1".equals(user.getStatus()) && "2".equals(user.getDelFlag())) {
                 // 提前关注公众号的信息

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

@@ -62,6 +62,7 @@ public class UserQueue {
                                 //声明系统用户
                                 SysUser sysUser = new SysUser();
                                 sysUser.setOpenId(object.getString("openid"));
+                                sysUser.setUnionId(object.getString("unionid"));
                                 sysUser.setImgSrc(object.getString("headimgurl"));
                                 //信息入库
                                 sysUserService.attention(sysUser);
@@ -99,7 +100,7 @@ public class UserQueue {
                                 JSONObject object = JSON.parseObject(body);
                                 //声明系统用户
                                 SysUser user = new SysUser();
-                                user.setOpenId(object.getString("openid"));
+                                user.setUnionId(object.getString("unionid"));
                                 //信息入库
                                 sysUserService.unsubscribe(user);
                             }

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

@@ -17,6 +17,7 @@
 		<result property="password"     column="password"     />
 		<result property="userType"     column="user_type"    />
 		<result property="openId"     	column="open_id"      />
+		<result property="unionId"     	column="union_id"     />
 		<result property="imgSrc"     	column="img_src"      />
 		<result property="sessionKey" 	column="session_key"  />
 		<result property="relatedNo" 	column="related_no"   />
@@ -52,7 +53,7 @@
 	</resultMap>
 
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.user_type, u.user_system, u.open_id, u.img_src, u.session_key,
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.user_type, u.user_system, u.open_id, u.union_id, u.img_src, u.session_key,
          u.related_no, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
@@ -63,7 +64,7 @@
     </sql>
 
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.user_type, u.user_system, u.open_id, u.img_src, u.session_key, u.related_no, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.user_type, u.user_system, u.open_id, u.union_id, u.img_src, u.session_key, u.related_no, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userName != null and userName != ''">
@@ -81,6 +82,9 @@
 		<if test="openId != null and openId != ''">
 			AND u.open_id = #{openId}
 		</if>
+		<if test="unionId != null and unionId != ''">
+			AND u.union_id = #{unionId}
+		</if>
 		<if test="sessionKey != null and sessionKey != ''">
 			AND u.session_key = #{sessionKey}
 		</if>
@@ -114,11 +118,15 @@
 	</select>
 
 	<select id="selectUserByopenId" parameterType="String" resultMap="SysUserResult">
-		SELECT user_id, user_name, nick_name, user_type, user_system, open_id, open_id, del_flag FROM sys_user WHERE open_id = #{openId}
+		SELECT user_id, user_name, nick_name, user_type, user_system, open_id, union_id, del_flag FROM sys_user WHERE open_id = #{openId}
+	</select>
+
+	<select id="selectUserByUnionId" parameterType="String" resultMap="SysUserResult">
+		SELECT user_id, user_name, nick_name, user_type, user_system, open_id, union_id, del_flag FROM sys_user WHERE union_id = #{unionId}
 	</select>
 
 	<select id="selectUserByTel" parameterType="String" resultMap="SysUserResult">
-		SELECT user_id, user_name, nick_name, user_type, user_system, phonenumber, open_id, session_key, del_flag FROM sys_user WHERE phonenumber = #{phonenumber} and user_type = '11'
+		SELECT user_id, user_name, nick_name, user_type, user_system, phonenumber, open_id, union_id, session_key, del_flag FROM sys_user WHERE phonenumber = #{phonenumber} and user_type = '11'
 	</select>
 
 	<select id="checkUserNameUnique" parameterType="String" resultType="int">
@@ -133,7 +141,7 @@
 		select user_id, email from sys_user where email = #{email} limit 1
 	</select>
 	<select id="warehouseSelectUserByTel" resultType="com.ruoyi.common.core.domain.entity.SysUser">
-		SELECT user_id, user_name, nick_name, user_type, user_system, phonenumber, open_id, session_key, del_flag FROM sys_user WHERE phonenumber = #{phonenumber} and user_type = '00'
+		SELECT user_id, user_name, nick_name, user_type, user_system, phonenumber, open_id, union_id, session_key, del_flag FROM sys_user WHERE phonenumber = #{phonenumber} and user_type = '00'
 	</select>
 
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
@@ -150,6 +158,7 @@
 		<if test="userType != null and userType != ''">user_type,</if>
 		<if test="userSystem != null and userSystem != ''">user_system,</if>
 		<if test="openId != null and openId != ''">open_id,</if>
+		<if test="unionId != null and unionId != ''">union_id,</if>
 		<if test="imgSrc != null and imgSrc != ''">img_src,</if>
 		<if test="sessionKey != null and sessionKey != ''">session_key,</if>
 		<if test="relatedNo != null and relatedNo != ''">related_no,</if>
@@ -170,6 +179,7 @@
 		<if test="userType != null and userType != ''">#{userType},</if>
 		<if test="userSystem != null and userSystem != ''">#{userSystem},</if>
 		<if test="openId != null and openId != ''">#{openId},</if>
+		<if test="unionId != null and unionId != ''">#{unionId},</if>
 		<if test="imgSrc != null and imgSrc != ''">#{imgSrc},</if>
 		<if test="sessionKey != null and sessionKey != ''">#{sessionKey},</if>
 		<if test="status != null and status != ''">#{status},</if>
@@ -193,6 +203,7 @@
 			<if test="userType != null and userType != ''">user_type = #{userType},</if>
 			<if test="userSystem != null and userSystem != ''">user_system = #{userSystem},</if>
 			<if test="openId != null and openId != ''">open_id = #{openId},</if>
+			<if test="unionId != null and unionId != ''">union_id = #{unionId},</if>
 			<if test="imgSrc != null and imgSrc != ''">img_src = #{imgSrc},</if>
 			<if test="sessionKey != null and sessionKey != ''">session_key = #{sessionKey},</if>
 			<if test="relatedNo != null and relatedNo != ''">related_no = #{relatedNo},</if>

ruoyi-warehouse/src/main/resources/mapper/basicData/TCorpsMapper.xml

@@ -129,30 +129,48 @@
 
     <select id="selectFleetDriverMsgListMap" parameterType="TCorps" resultType="Map">
         SELECT
-            dri.id AS id,
-            com.company_name AS companyName,
-            dri.`name` AS `name`,
-            dri.sex AS sex,
-            dri.birthday AS birthday,
-            dri.allow_driver_car AS allowDriverCar,
-            dri.first_certificate_date AS firstCertificateDate,
-            dri.idcar_num AS idcarNum,
-            dri.tel AS tel,
-            dri.address AS address,
-            dri.resume_pic AS resumePic,
-            dri.driving_pic AS drivingPic,
-            dri.creat_time AS creatTime,
-            dri.modification_time AS modificationTime,
-            dri.bill_status AS billStatus,
-            dri.del_flag,
-            dri.create_by,
-            dri.update_by,
-            dri.update_time,
-            dri.remarks AS remarks
+            c.f_id AS id,
+            t.f_name AS companyName,
+            c.f_name AS name,
+            c.f_fax AS fFax,
+            c.f_contractb AS fContractb,
+            c.f_eaddr AS fEaddr,
+            c.f_contracte AS fContracte,
+            c.f_scale AS fScale,
+            c.f_tel AS fTel,
+            c.f_addr AS fAddr,
+            c.registerd_address AS registerdAddress,
+            c.manage_scope AS manageScope,
+            c.create_time AS creatTime,
+            c.update_time AS updateTime,
+            c.f_status AS fStatus,
+            c.del_flag AS delFlag,
+            c.create_by AS createBy,
+            c.update_by AS updateBy,
+            c.update_time AS updateTime,
+            c.remark AS remark
         FROM
-            fleet_driver_msg dri
-        LEFT JOIN fleet_company_msg AS com ON dri.fleet_company_id = com.id
-
+            t_corps c
+            LEFT JOIN t_corps t ON t.f_id = c.f_pid
+        <where>
+            <if test="fTypeid != null  and fTypeid != ''"> and c.f_typeid = #{fTypeid}</if>
+            <if test="fPid != null  and fPid != ''"> and c.f_pid = #{fPid}</if>
+            <if test="fNo != null  and fNo != ''"> and c.f_no = #{fNo}</if>
+            <if test="fName != null  and fName != ''"> and c.f_name like concat('%', #{fName}, '%')</if>
+            <if test="fCname != null  and fCname != ''"> and c.f_cname like concat('%', #{fCname}, '%')</if>
+            <if test="fEname != null  and fEname != ''"> and c.f_ename like concat('%', #{fEname}, '%')</if>
+            <if test="fTel != null  and fTel != ''"> and c.f_tel = #{fTel}</if>
+            <if test="fFax != null  and fFax != ''"> and c.f_fax = #{fFax}</if>
+            <if test="fEmail != null  and fEmail != ''"> and c.f_email = #{fEmail}</if>
+            <if test="fManage != null  and fManage != ''"> and c.f_manage = #{fManage}</if>
+            <if test="fAddr != null  and fAddr != ''"> and c.f_addr = #{fAddr}</if>
+            <if test="fEaddr != null  and fEaddr != ''"> and c.f_eaddr = #{fEaddr}</if>
+            <if test="fScale != null  and fScale != ''"> and c.f_scale = #{fScale}</if>
+            <if test="fProvince != null  and fProvince != ''"> and c.f_province = #{fProvince}</if>
+            <if test="fCity != null  and fCity != ''"> and c.f_city = #{fCity}</if>
+            <if test="registerdAddress != null  and registerdAddress != ''"> and c.registerd_address = #{registerdAddress}</if>
+            <if test="manageScope != null  and manageScope != ''"> and c.manage_scope = #{manageScope}</if>
+        </where>
     </select>
 
     <insert id="insertTCorps" parameterType="TCorps" useGeneratedKeys="true" keyProperty="fId">

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsitemsMapper.xml

@@ -501,8 +501,7 @@
           <if test="timeStartBsdate != null">AND items.f_bsdate &gt;= #{timeStartBsdate}</if>
           <if test="timeEndBsdate != null">AND items.f_bsdate &lt;= #{timeEndBsdate}</if>
           <if test="fBillstatus != null">AND items.f_billstatus = #{fBillstatus}</if>
-          <if test="fMblno != null and fMblno != '' ">AND items.f_mblno like concat('%',
-              #{fMblno},'%') </if>
+          <if test="fMblno != null and fMblno != '' ">AND items.f_mblno like concat('%',#{fMblno},'%') </if>
     </select>
     <select id="selectWarehouseBusinesOutList" resultType="java.util.Map">
         SELECT
@@ -539,7 +538,8 @@
         <if test="timeStartBsdate != null">AND items.f_bsdate &gt;= #{timeStartBsdate}</if>
         <if test="timeEndBsdate != null">AND items.f_bsdate &lt;= #{timeEndBsdate}</if>
         <if test="fBillstatus != null">AND items.f_billstatus = #{fBillstatus}</if>
-        <if test="fMblno != null">AND items.f_mblno = #{fMblno}</if>
+        <if test="fMblno != null and fMblno != '' ">AND items.f_mblno like concat('%',#{fMblno},'%') </if>
+        order by items.f_bsdate desc
     </select>