解决禅道

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillscntrsController.java

@@ -1,8 +1,12 @@
 package com.ruoyi.web.controller.fleet.orderPlan;
 
 import java.util.List;
+import java.util.Map;
 
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscntrs;
+import com.ruoyi.orderPlan.service.IftmsorderbillsService;
 import com.ruoyi.orderPlan.service.IftmsorderbillscntrsService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,22 +35,38 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/fleet/ftmsorderbillscntrs")
 public class ftmsorderbillscntrsController extends BaseController {
     @Autowired
+    private IftmsorderbillsService ftmsorderbillsService;
+
+    @Autowired
     private IftmsorderbillscntrsService ftmsorderbillscntrsService;
 
     /**
      * 查询箱型箱量列表
      */
-    @GetMapping("/list")
+    /*@GetMapping("/list")
     public TableDataInfo list(Ftmsorderbillscntrs ftmsorderbillscntrs) {
         startPage();
         List<Ftmsorderbillscntrs> list = ftmsorderbillscntrsService.selectftmsorderbillscntrsList(ftmsorderbillscntrs);
         return getDataTable(list);
+    }*/
+
+    /**
+     * 查询订单列表显示字段
+     */
+    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillsplans:query')")
+    @DataScope(deptAlias = "d", userAlias = "u")
+    @GetMapping("/list")
+    public TableDataInfo list(Ftmsorderbills ftmsorderbills) {
+        ftmsorderbills.setInvoiceType("scheduling");
+        startPage();
+        List<Map<String, Object>> mapList = ftmsorderbillsService.selectftmsorderbillsMapList(ftmsorderbills);
+        return getDataTable(mapList);
     }
 
     /**
      * 导出箱型箱量列表
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscntrs:export')")
+    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillsplans:export')")
     @Log(title = "箱型箱量", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(Ftmsorderbillscntrs ftmsorderbillscntrs) {
@@ -58,7 +78,7 @@ public class ftmsorderbillscntrsController extends BaseController {
     /**
      * 获取箱型箱量详细信息
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscntrs:query')")
+    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillsplans:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(ftmsorderbillscntrsService.selectftmsorderbillscntrsById(id));
@@ -67,7 +87,7 @@ public class ftmsorderbillscntrsController extends BaseController {
     /**
      * 新增箱型箱量
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscntrs:add')")
+    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillsplans:add')")
     @Log(title = "箱型箱量", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Ftmsorderbillscntrs ftmsorderbillscntrs) {
@@ -77,7 +97,7 @@ public class ftmsorderbillscntrsController extends BaseController {
     /**
      * 修改箱型箱量
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscntrs:edit')")
+    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillsplans:edit')")
     @Log(title = "箱型箱量", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Ftmsorderbillscntrs ftmsorderbillscntrs) {
@@ -87,7 +107,7 @@ public class ftmsorderbillscntrsController extends BaseController {
     /**
      * 删除箱型箱量
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscntrs:remove')")
+    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillsplans:remove')")
     @Log(title = "箱型箱量", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

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

@@ -125,12 +125,13 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
     public AjaxResult createUser(FleetCompanyMsg fleetCompanyMsg) {
         // 创建用户
         SysUser user = new SysUser();
-        user.setCreateBy(fleetCompanyMsg.getLoginAccount());
-        user.setPassword(SecurityUtils.encryptPassword(fleetCompanyMsg.getLinkPhone()));
         user.setUserType("00");
-        user.setPhonenumber(fleetCompanyMsg.getLinkPhone());
         user.setCreateTime(new Date());
         user.setCreateBy(SecurityUtils.getUsername());
+        user.setNickName(fleetCompanyMsg.getLinkPhone());
+        user.setUserName(fleetCompanyMsg.getLoginAccount());
+        user.setPhonenumber(fleetCompanyMsg.getLinkPhone());
+        user.setPassword(SecurityUtils.encryptPassword(fleetCompanyMsg.getLinkPhone()));
         sysUserMapper.insertUser(user);
         // 查询是否存在车队 角色
         SysRole role = sysRoleMapper.selectRoleByName("车队");

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

@@ -4,6 +4,7 @@ import com.ruoyi.basicData.domain.FleetDriverMsg;
 import com.ruoyi.basicData.mapper.FleetDriverMsgMapper;
 import com.ruoyi.basicData.service.IFleetDriverMsgService;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -12,6 +13,7 @@ import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
 import com.ruoyi.orderPlan.mapper.FtmsorderbillscarsMapper;
 import com.ruoyi.system.domain.SysUserPost;
 import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.mapper.SysUserPostMapper;
 import com.ruoyi.system.mapper.SysUserRoleMapper;
@@ -38,6 +40,9 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
     private FleetDriverMsgMapper fleetDriverMsgMapper;
 
     @Autowired
+    private SysRoleMapper roleMapper;
+
+    @Autowired
     private FtmsorderbillscarsMapper ftmsorderbillscarsMapper;
 
     @Autowired
@@ -111,10 +116,10 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
             sysUser.setDeptId(120L); // 当前给定、后期修改
             Long[] rolr = {110L}; // 当前给定、后期修改
             sysUser.setRoleIds(rolr);
-            // 查询是否有用户提前关注公众号
+            // 查询是否有用户提前关注小程序
             SysUser user = userMapper.selectUserByTel(fleetDriverMsg.getTel());
             if (StringUtils.isNotNull(user)) {
-                // 该用户提前关注公众号了
+                // 该用户提前关注小程序了
                 sysUser.setOpenId(user.getOpenId());
                 if (StringUtils.isNotNull(user.getSessionKey())) {
                     sysUser.setSessionKey(user.getSessionKey());
@@ -122,15 +127,21 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
                 userMapper.deleteUserById(user.getUserId());
             }
             // 新增用户信息
-            int rows = userMapper.insertUser(sysUser);
-            if (rows <= 0) {
+            userMapper.insertUser(sysUser);
+            // 新增用户与角色管理
+            // 查询是否存在车队 角色
+            SysRole role = roleMapper.selectRoleByName("司机");
+            if (StringUtils.isNull(role)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("请填写必填项");
+                return AjaxResult.error("未找到司机角色，请创建司机角色后提交");
             }
-            // 新增用户岗位关联
-            insertUserPost(sysUser);
-            // 新增用户与角色管理
-            insertUserRole(sysUser);
+            // 创建用户与角色关联
+            List<SysUserRole> list = new ArrayList<SysUserRole>();
+            SysUserRole sysUserRole = new SysUserRole();
+            sysUserRole.setRoleId(role.getRoleId());
+            sysUserRole.setUserId(sysUser.getUserId());
+            list.add(sysUserRole);
+            userRoleMapper.batchUserRole(list);
             fleetDriverMsg.setCreateBy(SecurityUtils.getUsername());
             fleetDriverMsg.setCreatTime(new Date());
             fleetDriverMsgMapper.insertFleetDriverMsg(fleetDriverMsg);
@@ -222,49 +233,4 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
         return fleetDriverMsgMapper.selectFleetDriverMsgIdNameList(fleetDriverMsg);
     }
 
-    /**
-     * 新增用户岗位信息
-     *
-     * @param user 用户对象
-     */
-    public void insertUserPost(SysUser user) {
-        Long[] posts = user.getPostIds();
-        if (StringUtils.isNotNull(posts)) {
-            // 新增用户与岗位管理
-            List<SysUserPost> list = new ArrayList<SysUserPost>();
-            for (Long postId : posts) {
-                SysUserPost up = new SysUserPost();
-                up.setUserId(user.getUserId());
-                up.setPostId(postId);
-                list.add(up);
-            }
-            if (list.size() > 0) {
-                userPostMapper.batchUserPost(list);
-            }
-        }
-    }
-
-    /**
-     * 新增用户角色信息
-     *
-     * @param user 用户对象
-     */
-    public void insertUserRole(SysUser user) {
-        Long[] roles = user.getRoleIds();
-        if (StringUtils.isNotNull(roles)) {
-            // 新增用户与角色管理
-            List<SysUserRole> list = new ArrayList<SysUserRole>();
-            for (Long roleId : roles) {
-                SysUserRole ur = new SysUserRole();
-                ur.setUserId(user.getUserId());
-                ur.setRoleId(roleId);
-                list.add(ur);
-            }
-            if (list.size() > 0) {
-                userRoleMapper.batchUserRole(list);
-            }
-        }
-    }
-
-
 }

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/Ftmsorderbills.java

@@ -242,6 +242,11 @@ public class Ftmsorderbills extends BaseEntity {
     private String driverTel;
 
     /**
+     * 司机电话
+     */
+    private String invoiceType;
+
+    /**
      * 查询下单时间区间
      */
     private List<String> planDate;

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

@@ -197,7 +197,9 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
             for (Ftmsorderbillsplans p : tmsorderbillsplansList) {
                 line++;
                 p.setOrgId(pId);
-                p.setBillStatus(itemstatus);
+                if (StringUtils.isNull(p.getBillStatus())) {
+                    p.setBillStatus(itemstatus);
+                }
                 p.setCreateTime(new Date());
                 p.setCreateBy(loginUser.getUsername());
                 if (ftmsorderbillsplansMapper.insertftmsorderbillsplans(p) <= 0) {
@@ -281,6 +283,8 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
         ftmsorderbillscntrsMapper.deleteftmsorderbillscntrsByPId(pId);
         ftmsorderbillsplansMapper.deleteftmsorderbillsplansByOrgId(pId);
         ftmsorderbillsattachsMapper.deleteftmsorderbillsattachsByPId(pId);
+
+
         AjaxResult ajaxResult = updateItem(pId, tmsorderbills.getBillStatus(), scntrs, attachs, fees, plans, loginUser);
         String code = ajaxResult.get("code").toString();
         if ("500".equals(code)) {
@@ -604,7 +608,7 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
             if (StringUtils.isNull(c.getCntrId())) {
                 return "派车未找到箱型数据，若多次失败请联系管理员";
             } else if (StringUtils.isNull(c.getCarcorPid())) {
-                return "派车未找到箱型数据，若多次失败请联系管理员";
+                return "派车未找到车队数据，若多次失败请联系管理员";
             } else if (StringUtils.isNull(c.getCntrQty())) {
                 return "派车未找到货量数据，若多次失败请联系管理员";
             } else if (StringUtils.isNull(c.getCarregNo())) {

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

@@ -266,6 +266,12 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
                 return AjaxResult.error("调度安排货量不得低于已派车数量");
             }
         }
+        // 箱型箱量数据
+        Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(tmsorderbillsplans.getPId());
+        if (ftmsorderbillscntrs.getCntrBlcQty() < tmsorderbillsplans.getCntrQty()) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("调度数量超出计划箱量不可提交");
+        }
         tmsorderbillsplans.setOrgId(pId);
         tmsorderbillsplans.setBillStatus(6L);
         tmsorderbillsplans.setCreateTime(new Date());
@@ -280,13 +286,6 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新调度数据失败，若多次失败请联系管理员");
         }
-        // 箱型箱量数据
-        Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(tmsorderbillsplans.getPId());
-        long qty = ftmsorderbillscntrs.getCntrPlanQty() + tmsorderbillsplans.getCntrQty();
-        if (ftmsorderbillscntrs.getCntrBlcQty() < tmsorderbillsplans.getCntrQty()) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return AjaxResult.error("调度数量超出计划箱量不可提交");
-        }
         // 计划下达数据
        /* Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
         bills.setPlanUserId(loginUser.getUser().getUserId());

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

@@ -188,6 +188,9 @@
         <if test="goodsId != null and goodsId != 0">
             AND f.goods_id = #{goodsId}
         </if>
+        <if test="invoiceType != null and invoiceType == 'scheduling'">
+            AND f.bill_status >= 6
+        </if>
         <if test="mblno != null and mblno != ''">
             AND f.mblno LIKE "%${mblno}%"
         </if>

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

@@ -107,7 +107,8 @@
             LEFT JOIN sys_user a ON a.user_id = f.trans_user_id
             LEFT JOIN t_goods g ON g.f_id = f.goods_id
         WHERE
-            plan.bill_status != 3
+            f.bill_status = 60
+            AND plan.bill_status >= 6
             <if test="corpId != null and corpId != ''">
                 AND f.corp_id = #{corpId}
             </if>

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

@@ -166,7 +166,6 @@ public class WechatService {
         }
     }
 
-
     /**
      * 解密小程序用户敏感数据（暂时用于解密手机号）
      * https://blog.csdn.net/weixin_42771651/article/details/107359620

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

@@ -52,6 +52,9 @@ public class SysUserServiceImpl implements ISysUserService {
     private SysPostMapper postMapper;
 
     @Autowired
+    private SysUserRoleMapper sysUserRoleMapper;
+
+    @Autowired
     private ISysConfigService configService;
 
     @Autowired
@@ -510,19 +513,26 @@ public class SysUserServiceImpl implements ISysUserService {
 
     // 用户关注公众号
     @Transactional
-    public boolean attention(SysUser sysUser) {
+    public void attention(SysUser sysUser) {
         sysUser.setUserType("11");
+        // 判断是否已经存在
         SysUser user = userMapper.selectUserByopenId(sysUser.getOpenId());
         if (StringUtils.isNotNull(user)) {
-            sysUser.setRelatedNo("T");
+            if (StringUtils.isEmpty(user.getPhonenumber())) {
+                // 没有授权小程序,创建临时用户数据
+                user.setStatus("1");
+                user.setDelFlag("2");
+                userMapper.insertUser(sysUser);
+            }
+            user.setRelatedNo("T");
             // 存在并且已经授权小程序了
-            userMapper.updateUserRelatedNo(sysUser);
-            return true;
+            userMapper.updateUserRelatedNo(user);
         }
+        sysUser.setUserName("");
+        sysUser.setNickName("");
         sysUser.setStatus("1");
         sysUser.setDelFlag("2");
         userMapper.insertUser(sysUser);
-        return false;
     }
 
     // 用户取关公众号
@@ -546,15 +556,18 @@ public class SysUserServiceImpl implements ISysUserService {
     // 获取用户手机号更新对应信息
     @Transactional
     public LoginUser createOrUpdateUser(SysUser user) {
+        boolean related = false;
         LoginUser loginUser = new LoginUser();
         // 判断是否提前存储过
         SysUser sysUser = userMapper.selectUserByopenId(user.getOpenId());
-        boolean related = false;
         if (StringUtils.isNotNull(sysUser)) {
             if ("1".equals(user.getStatus()) && "2".equals(user.getDelFlag())) {
                 // 提前关注公众号的信息
                 userMapper.deleteUserById(user.getUserId());
                 related = true;
+            } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && "0".equals(user.getStatus()) && "0".equals(user.getDelFlag())){
+                loginUser.setUser(user);
+                return loginUser;
             }
         }
         // 判断是否创建了驾驶员
@@ -568,6 +581,7 @@ public class SysUserServiceImpl implements ISysUserService {
             pUser.setSessionKey(user.getSessionKey());
             userMapper.updateUser(pUser);
             loginUser.setUser(pUser);
+            return loginUser;
         } else {
             // 没有创建 则创建临时性用户数据
             user.setNickName(" ");
@@ -579,8 +593,8 @@ public class SysUserServiceImpl implements ISysUserService {
             user.setCreateTime(new Date());
             userMapper.insertUser(user);
             loginUser.setUser(user);
+            return loginUser;
         }
-        return loginUser;
     }
 
     /**

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/domain/TFees.java

@@ -68,6 +68,11 @@ public class TFees extends BaseEntity {
     @Excel(name = "收付方向")
     private String fDc;
 
+    /** 是否允许修改(T允许，F不允许) */
+    @Excel(name = "是否允许修改(T允许，F不允许)")
+    private String isModify;
+
+
     public void setfId(Long fId) {
         this.fId = fId;
     }
@@ -132,6 +137,14 @@ public class TFees extends BaseEntity {
         return delFlag;
     }
 
+    public void setIsModify(String isModify) {
+        this.isModify = isModify;
+    }
+
+    public String getIsModify() {
+        return isModify;
+    }
+
     public String getfDc() {
         return fDc;
     }
@@ -151,6 +164,7 @@ public class TFees extends BaseEntity {
                 .append("fCurrency", getfCurrency())
                 .append("fStatus", getfStatus())
                 .append("delFlag", getDelFlag())
+                .append("isModify", getIsModify())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())

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

@@ -19,10 +19,11 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
         <result property="fDc" column="f_dc"/>
+        <result property="isModify" column="is_modify"/>
     </resultMap>
 
     <sql id="selectTFeesVo">
-        select f_id, f_no, f_name, f_feetype, f_feeunitid, f_currency, f_status, del_flag, create_by, create_time, update_by, update_time, remark,f_dc from t_fees
+        select f_id, f_no, f_name, f_feetype, f_feeunitid, f_currency, f_status, del_flag, create_by, create_time, update_by, update_time, remark, f_dc, is_modify from t_fees
     </sql>
 
     <select id="selectTFeesList" parameterType="TFees" resultMap="TFeesResult">
@@ -32,6 +33,7 @@
             <if test="fName != null  and fName != ''">and f_name like concat('%', #{fName}, '%')</if>
             <if test="fFeetype != null  and fFeetype != ''">and f_feetype = #{fFeetype}</if>
             <if test="fFeeunitid != null ">and f_feeunitid = #{fFeeunitid}</if>
+            <if test="isModify != null  and isModify != ''"> and is_modify = #{isModify}</if>
             <if test="fCurrency != null  and fCurrency != ''">and f_currency like concat('%', #{fCurrency}, '%')</if>
             <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
             <if test="fDc != null  and fDc != ''">and f_dc like concat('%', #{fDc}, '%') </if>
@@ -59,7 +61,8 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-            <if test="fDc != null and fDc != ''">f_dc,</if>
+            <if test="fDc != null">f_dc,</if>
+            <if test="isModify != null">is_modify,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fNo != null and fNo != ''">#{fNo},</if>
@@ -74,7 +77,8 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="fDc != null ">#{fDc},</if>
+            <if test="fDc != null">#{fDc},</if>
+            <if test="isModify != null">#{isModify},</if>
         </trim>
     </insert>
 
@@ -93,7 +97,8 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="fDc != null and fDc != ''">f_dc = #{fDc},</if>
+            <if test="fDc != null">f_dc = #{fDc},</if>
+            <if test="isModify != null">is_modify = #{isModify},</if>
         </trim>
         where f_id = #{fId}
     </update>