解决禅道

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

@@ -66,7 +66,7 @@ public class ftmsorderbillscarsController extends BaseController {
      * 根据手机号查询司机的
      * 新订单、本月订单、本月历程、本月运费
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:query')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:query')")
     @GetMapping(value = "/selectDriverPerformance")
     public AjaxResult selectDriverPerformance(SysUser user) {
         if (StringUtils.isNull(user.getPhonenumber()) || "".equals(user.getPhonenumber())) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysTableSetController.java

@@ -45,7 +45,6 @@ public class SysTableSetController extends BaseController {
     /**
      * 重置当前用户、当前模块的信息
      */
-    @PreAuthorize("@ss.hasPermi('system:set:remove')")
     @PostMapping("/resetModule")
     public AjaxResult resetModule(@RequestBody SysTableSet sysTableSet) {
         if (StringUtils.isEmpty(sysTableSet.getUserId())) {

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

@@ -283,8 +283,6 @@ 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)) {

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

@@ -137,11 +137,15 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
      */
     @Override
     public List<Map<String, Object>> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills) {
-        String phonenumber = SecurityUtils.getLoginUser().getUser().getPhonenumber();
-        if (StringUtils.isEmpty(phonenumber)) {
-            return null;
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        String phonenumber = user.getPhonenumber();
+        if ("11".equals(user.getUserType())) {
+            if (StringUtils.isNotEmpty(phonenumber)) {
+                ftmsorderbills.setDriverTel(phonenumber);
+            } else {
+                return null;
+            }
         }
-//        ftmsorderbills.setDriverTel(phonenumber);
         return ftmsorderbillscarsMapper.selectftmsorderbillscarsMapList(ftmsorderbills);
     }
 
@@ -189,14 +193,10 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         Map<String, Object> map = new HashMap<>();
         Long id = ftmsorderbillscars.getId();
         map.put("cars", ftmsorderbillscarsMapper.selectTmsorderbillsCarsByDriver(id));
-        Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        ftmsorderbillsfees.setfPid(id);
-        ftmsorderbillsfees.setActId(ftmsorderbillscars.getBillStatus());
-        map.put("fees", ftmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(ftmsorderbillsfees));
         Ftmsorderbillsattachs ftmsorderbillsattachs = new Ftmsorderbillsattachs();
         ftmsorderbillsattachs.setPId(id);
-        ftmsorderbillsattachs.setActId(ftmsorderbillscars.getBillStatus());
-        map.put("attach", ftmsorderbillsattachsMapper.selectftmsorderbillsattachsList(ftmsorderbillsattachs));
+        ftmsorderbillsattachs.setActId(1030L);
+        map.put("attachs", ftmsorderbillsattachsMapper.selectftmsorderbillsattachsList(ftmsorderbillsattachs));
         return map;
     }
 
@@ -649,9 +649,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新调度数据失败，若多次失败请联系管理员");
         }
-        map.put("plan", ftmsorderbillsplans);
         Ftmsorderbills ftmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbillsplans.getOrgId());
-
         Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(ftmsorderbillsplans.getPId());
         // 应收运价
         ftmsorderbillscars.setFreightPriceDr(ftmsorderbillscntrs.getPriceDr());
@@ -675,6 +673,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             ftmsorderbillscarsMapper.updateftmsorderbillscars(ftmsorderbillscars);
         }
         map.put("cars", ftmsorderbillscars);
+        map.put("plan", ftmsorderbillsplansMapper.selectftmsorderbillsplansById(ftmsorderbillsplans.getId()));
         SysUser sysUser = sysUserMapper.selectUserByTel(ftmsorderbillscars.getDriverTel());
         if (StringUtils.isNotNull(sysUser)) {
             String openId = sysUser.getOpenId();

ruoyi-fleet/src/main/java/com/ruoyi/statusTracking/mapper/FtmsorderbillsfeesMapper.java

@@ -68,8 +68,6 @@ public interface FtmsorderbillsfeesMapper {
      */
     public int deleteFTmsorderbillsfeesByPId(long pId);
 
-    public int deleteFTmsorderbillsfeesByPIdAndActId(long pId);
-
     /**
      *  根据上级id查询对应信息
      * @param pId   上级id

ruoyi-fleet/src/main/java/com/ruoyi/statusTracking/service/impl/FtmsorderbillsfeesServiceImpl.java

@@ -95,25 +95,21 @@ public class FtmsorderbillsfeesServiceImpl implements IftmsorderbillsfeesService
         if (StringUtils.isNotNull(fees) && !"[]".equals(fees)) {
             JSONArray jsonDrArray = JSONArray.parseArray(fees);
             List<Ftmsorderbillsfees> ftmsorderbillsfeesList = JSONObject.parseArray(jsonDrArray.toJSONString(), Ftmsorderbillsfees.class);
-            // 删除1080数据 统一添加
-            fTmsorderbillsfeesMapper.deleteFTmsorderbillsfeesByPIdAndActId(pId);
+            fTmsorderbillsfeesMapper.deleteFTmsorderbillsfeesByPId(pId);
             for (Ftmsorderbillsfees ftmsorderbillsfees : ftmsorderbillsfeesList) {
-                // 只处理新追加的数据
-                if(null!=ftmsorderbillsfees.getActId() &&  ftmsorderbillsfees.getActId()==1090 ){
-                    ftmsorderbillsfees.setfPid(pId);
-                    ftmsorderbillsfees.setOrgId(orgId);
-                    ftmsorderbillsfees.setfBillstatus(status);
-                    ftmsorderbillsfees.setCreateTime(new Date());
-                    ftmsorderbillsfees.setCreateBy(SecurityUtils.getUsername());
-                    fTmsorderbillsfeesMapper.insertFTmsorderbillsfees(ftmsorderbillsfees);
-                }
+                ftmsorderbillsfees.setfPid(pId);
+                ftmsorderbillsfees.setOrgId(orgId);
+                ftmsorderbillsfees.setActId(1090L);
+                ftmsorderbillsfees.setfBillstatus(status);
+                ftmsorderbillsfees.setCreateTime(new Date());
+                ftmsorderbillsfees.setCreateBy(SecurityUtils.getUsername());
+                fTmsorderbillsfeesMapper.insertFTmsorderbillsfees(ftmsorderbillsfees);
             }
         }
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
         ftmsorderbillsfees.setfPid(pId);
-        List<Ftmsorderbillsfees> ftmsorderbillsfeesListNew = fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(ftmsorderbillsfees);
-        map.put("ftmsorderbillsfeesList",ftmsorderbillsfeesListNew);
-        return AjaxResult.success("成功", map);
+        map.put("ftmsorderbillsfeesList",fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(ftmsorderbillsfees));
+        return AjaxResult.success(map);
     }
 
     /**

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

@@ -515,9 +515,7 @@
             AND dic.dict_type = 'data_cntrId'
             LEFT JOIN fleet_driver_msg driver ON driver.id = c.driver_user_id
         <where>
-            t.bill_status != 3
-            AND t.bill_status != 30
-            AND c.bill_status != 3
+            c.bill_status = 6
             <if test="corpId != null">and t.corp_id = #{corpId}</if>
             <if test="billType != null">and t.bill_type = #{billType}</if>
             <if test="transType != null">and t.trans_type = #{transType}</if>

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

@@ -107,8 +107,7 @@
             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
-            f.bill_status = 60
-            AND plan.bill_status >= 6
+            plan.bill_status >= 6
             <if test="corpId != null and corpId != ''">
                 AND f.corp_id = #{corpId}
             </if>

ruoyi-fleet/src/main/resources/mapper/statusTracking/ftmsorderbillsfeesMapper.xml

@@ -357,9 +357,7 @@
             #{fId}
         </foreach>
     </delete>
-    <delete id="deleteFTmsorderbillsfeesByPIdAndActId" parameterType="Long">
-        delete from F_TMSORDERBILLSFEES where f_pid = #{fId} and act_id = 1090
-    </delete>
+
     <update id="updateFTmsorderbillsfee" parameterType="Map">
         update F_TMSORDERBILLSFEES
         <trim prefix="SET" suffixOverrides=",">

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

@@ -85,7 +85,8 @@ public class WechatService {
             }
             // 解密获取手机号
             try {
-                AjaxResult ajaxResult = decodeUserInfo(loginBody.getPhonenumber(), loginBody.getIv(), user.getSessionKey());
+                String dataType = "phoneNumber";
+                AjaxResult ajaxResult = decodeUserInfo(loginBody.getPhonenumber(), loginBody.getIv(), user.getSessionKey(), dataType);
                 String code = ajaxResult.get("code").toString();
                 if ("500".equals(code)) {
                     return ajaxResult;
@@ -137,7 +138,8 @@ public class WechatService {
             }
             // 解密获取手机号
             try {
-                AjaxResult ajaxResult = decodeUserInfo(loginBody.getPhonenumber(), loginBody.getIv(), user.getSessionKey());
+                String dataType = "phoneNumber";
+                AjaxResult ajaxResult = decodeUserInfo(loginBody.getPhonenumber(), loginBody.getIv(), user.getSessionKey(), dataType);
                 String code = ajaxResult.get("code").toString();
                 if ("500".equals(code)) {
                     return ajaxResult;
@@ -175,7 +177,7 @@ public class WechatService {
      * @param sessionKey    用户秘钥
      * @return 结果
      */
-    public AjaxResult decodeUserInfo(String encryptedData, String iv, String sessionKey
+    public AjaxResult decodeUserInfo(String encryptedData, String iv, String sessionKey, String dataType
     ) throws UnsupportedEncodingException, InvalidAlgorithmParameterException, JSONException {
         //AESUtils微信获取手机号解密工具类
         AESUtils aes = new AESUtils();
@@ -185,11 +187,12 @@ public class WechatService {
         if (null != resultByte && resultByte.length > 0) {
             String jsons = new String(resultByte, "UTF-8");
             JSONObject json = JSONObject.parseObject(jsons);
+            System.out.println("跟手机号同级别数据：" + json.toString());
             //json解析phoneNumber值
-            String phoneNumber = json.getString("phoneNumber");
+            String phoneNumber = json.getString(dataType);
             if (StringUtils.isEmpty(phoneNumber)) {
-                log.info("解析手机号异常：" + json.toJSONString());
-                return AjaxResult.error("解析手机号异常");
+                log.info("解析加密异常：" + json.toJSONString());
+                return AjaxResult.error("解析加密异常");
             }
             return AjaxResult.success("操作成功", phoneNumber);
         }

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

@@ -528,8 +528,8 @@ public class SysUserServiceImpl implements ISysUserService {
             // 存在并且已经授权小程序了
             userMapper.updateUserRelatedNo(user);
         }
-        sysUser.setUserName("");
-        sysUser.setNickName("");
+        sysUser.setUserName(" ");
+        sysUser.setNickName(" ");
         sysUser.setStatus("1");
         sysUser.setDelFlag("2");
         userMapper.insertUser(sysUser);

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TFeesMapper.java

@@ -73,4 +73,11 @@ public interface TFeesMapper {
      * @return
      */
     public TFees checkUFNnameUnique(String fNname);
+
+    /**
+     *  查询 是否允许修改
+     * @param tFees    条件
+     * @return  结果
+     */
+    String selectTFeesModify(TFees tFees);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TFeesServiceImpl.java

@@ -73,6 +73,11 @@ public class TFeesServiceImpl implements ITFeesService {
      */
     @Override
     public AjaxResult updateTFees(TFees tFees) {
+        String modify = tFeesMapper.selectTFeesModify(tFees);
+        if ("F".equals(modify)) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("该费用不允许修改数据");
+        }
         tFees.setUpdateTime(DateUtils.getNowDate());
         tFeesMapper.updateTFees(tFees);
         return AjaxResult.success();
@@ -90,6 +95,13 @@ public class TFeesServiceImpl implements ITFeesService {
         // return tFeesMapper.deleteTFeesByIds(fIds);
         int i = 1;
         for(Long id:fIds){
+            TFees tFees = new TFees();
+            tFees.setfId(id);
+            String modify = tFeesMapper.selectTFeesModify(tFees);
+            if ("F".equals(modify)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return AjaxResult.error("费用第" + i + "行为不允许修改数据");
+            }
             TWarehousebillsfees tWarehousebillsfees =new TWarehousebillsfees();
             tWarehousebillsfees.setfFeeid(id);
             List<TWarehousebillsfees> TWarehousebillsfeesList =tWarehousebillsfeesMapper.selectTWarehousebillsfeesList(tWarehousebillsfees);

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

@@ -46,6 +46,10 @@
         where f_id = #{fId}
     </select>
 
+    <select id="selectTFeesModify" parameterType="TFees" resultType="String">
+        select is_modify from t_fees where f_id = #{fId}
+    </select>
+
     <insert id="insertTFees" parameterType="TFees" useGeneratedKeys="true" keyProperty="fId">
         insert into t_fees
         <trim prefix="(" suffix=")" suffixOverrides=",">