提交代码

puzhibing

2024-02-19 5816ff2b23bbfe96291bb4cb3cc61d99d37fe986

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java

@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.system.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -79,12 +80,6 @@

    @Autowired
    private RedisUtil redisUtil;

    @Autowired
    private ALiSendSms aLiSendSms;

    @Autowired
    private SMSUtil smsUtil;

    @Autowired
    private ICompanyCityService companyCityService;
@@ -174,15 +169,17 @@
                templateCode = "SMS_207770039";//修改密码
                break;
        }
        Map<String, Object> map = new HashMap<>();
        map.put("code", authCode);
        smsUtil.sendSmsTp(phone, 96596L, Arrays.asList(map));
//        String sData = aLiSendSms.sendSms(phone, templateCode, "{\"code\":\"" + authCode + "\"}");
//        JSONObject jsonObject = JSON.parseObject(sData);
//        String message = jsonObject.getString("Message");
//        if(!"OK".equals(message)){
//            return ResultUtil.error("");
//        }
        //发送记录集合
        JSONArray records = new JSONArray();
        JSONObject record = new JSONObject();
        //手机号
        record.put("mobile", phone);
        //替换变量
        JSONObject param = new JSONObject();
        param.put("code", authCode);
        record.put("tpContent", param);
        records.add(record);
        SMSUtil.sendSmsTp(96596L, records);
        System.out.println(sms);
        return ResultUtil.success();
    }
@@ -218,7 +215,7 @@
    public ResultUtil registeredDriver(String phone, String code, String password, Integer uid, Integer type, Integer userType) throws Exception {
        ResultUtil<LoginWarpper> result = this.registeredDriver(phone, code, password,uid,type);
        if(result.getCode() == 200 && null != uid){
            /*if(type == 2){
            if(type == 2){
                Driver driver = driverMapper.selectById(uid);
                List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
                BigDecimal bigDecimal = new BigDecimal("0");
@@ -226,6 +223,18 @@
                    if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
                        bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
                        incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));

                        DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
                        driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
                        driverActivityHistory.setCarryOut(2);
                        driverActivityHistory.setDay(new Date());
                        driverActivityHistory.setDriverId(driver.getId());
                        driverActivityHistory.setInsertTime(new Date());
                        driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
                        driverActivityHistory.setType(1);
                        driverActivityHistoryMapper.insert(driverActivityHistory);


                    }
                }
                driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -258,7 +267,7 @@
                        userCouponRecordMapper.insert(userCouponRecord);
                    }
                }
            }*/
            }
        }
        return result;
    }
@@ -469,9 +478,9 @@
        if(null == driver){
            return ResultUtil.error("账号未注册");
        }
        /*if(driver.getAuthState() == 1){
        if(driver.getAuthState() == 1){
            return ResultUtil.error("账号正在审核中，请耐心等待");
        }*/
        }
        if(driver.getAuthState() == 3){
            return ResultUtil.error("账号已被冻结，请联系管理员");
        }
@@ -494,9 +503,9 @@
        loginWarpper.setAppid(UUIDUtil.getRandomCode());

        //创建高德猎鹰的终端数据
        String tid = gdFalconUtil.createTerminal(phone);
        loginWarpper.setServerId(gdFalconUtil.getServerId());
        loginWarpper.setTerminalId(tid);
//        String tid = gdFalconUtil.createTerminal(phone);
//        loginWarpper.setServerId(gdFalconUtil.getServerId());
//        loginWarpper.setTerminalId(tid);
        if(driver.getCompanyId()==null){
            loginWarpper.setJumpCode("100000");
        }else{
@@ -558,6 +567,10 @@
    public ResultUtil work(Integer uid, String type) throws Exception {
        DriverWork driverWork = driverWorkMapper.queryNewWork(uid, null, 1);
        Driver driver = this.selectById(uid);
        if(null == driver.getCarId()){
            return ResultUtil.error("暂未绑定车辆");
        }

        if(null != driverWork){//作下班操作
            //检测是否有未完成的订单
            List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid);