Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 53562814add61acfdc02d6b25dae6324f6fd5f92

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java

@@ -11,10 +11,7 @@
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ITCompanyCityService;
import com.stylefeng.guns.modular.system.service.ITRegionService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import com.stylefeng.guns.modular.system.service.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,7 +21,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
import com.stylefeng.guns.modular.system.service.ITCompanyService;

import java.util.ArrayList;
import java.util.Date;
@@ -56,10 +52,7 @@
    private ITCompanyCityService tCompanyCityService;

    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;

    @Value("${pushMinistryOfTransport}")
    private boolean pushMinistryOfTransport;
    private ICityService cityService;

    /**
     * 跳转到修改平台信息
@@ -71,8 +64,9 @@
        LogObjectHolder.me().set(tCompany);

        //省
        List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
        model.addAttribute("provinceList",provinceList);
        List<City> cities = cityService.selectList(null);
//        List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
        model.addAttribute("city",cities);

        //系统用户对象
        User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 1).eq("objectId", tCompany.getId()));
@@ -105,8 +99,8 @@
     */
    @RequestMapping("/tCompany_add")
    public String tCompanyAdd(Model model) {
        List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
        model.addAttribute("provinceList",provinceList);
        List<City> cities = cityService.selectList(null);
        model.addAttribute("city",cities);
        return PREFIX + "tCompany_add.html";
    }

@@ -138,8 +132,8 @@
        LogObjectHolder.me().set(tCompany);

        //省
        List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
        model.addAttribute("provinceList",provinceList);
        List<City> cities = cityService.selectList(null);
        model.addAttribute("city",cities);

        //系统用户对象
        User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 2).eq("objectId", tCompanyId));
@@ -162,8 +156,8 @@
        LogObjectHolder.me().set(tCompany);

        //省
        List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
        model.addAttribute("provinceList",provinceList);
        List<City> cities = cityService.selectList(null);
        model.addAttribute("city",cities);

        //系统用户对象
        User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 2).eq("objectId", tCompanyId));
@@ -336,9 +330,7 @@
            TCompanyCity tCompanyCity = tCompanyCityService.selectOne(new EntityWrapper<TCompanyCity>().eq("id", jsonObject.getInteger("recordId")).eq("companyId", id));
            if (SinataUtil.isEmpty(tCompanyCity)){
                tCompanyCity = new TCompanyCity();
                tCompanyCity.setProvinceCode(jsonObject.getInteger("provinceCode"));
                tCompanyCity.setCityCode(jsonObject.getInteger("cityCode"));
                tCompanyCity.setAreaCode(jsonObject.getInteger("areaCode"));
                tCompanyCity.setCityId(jsonObject.getInteger("cityId"));
                tCompanyCity.setCompanyId(id);
                tCompanyCity.setState(1);
                tCompanyCityService.insert(tCompanyCity);
@@ -424,19 +416,6 @@
        addSocpe(subArr,tCompany.getId());

        TCompany tCompany1 = tCompanyService.selectById(tCompany.getId());
        if(tCompany1.getType() == 1){
            new Thread(new Runnable() {
                @Override
                public void run() {
                    if(pushMinistryOfTransport){//上传平台数据
                        pushMinistryOfTransportUtil.baseInfoCompanyPay();//上传网约车平台公司支付信息
                        pushMinistryOfTransportUtil.baseInfoCompany(tCompany.getId());
                        pushMinistryOfTransportUtil.baseInfoCompanyService();
                        pushMinistryOfTransportUtil.baseInfoCompanyPermit(tCompany.getId());
                    }
                }
            }).start();
        }
        return SUCCESS_TIP;
    }