Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 53562814add61acfdc02d6b25dae6324f6fd5f92

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java

@@ -9,7 +9,6 @@
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.TServerCarmodel;
import com.stylefeng.guns.modular.system.service.ITServerCarmodelService;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
@@ -44,12 +43,6 @@

    @Autowired
    private ITServerCarmodelService tServerCarmodelService;

    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;

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



@@ -88,7 +81,8 @@
    @RequestMapping("/tSystemPrice_add")
    public String tSystemPriceAdd(Model model) {
        //查询所有专车车型
        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).ne("state", 3));
        Integer objectId = ShiroKit.getUser().getObjectId();
        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).eq("companyId", objectId).ne("state", 3));
        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
        List<TServerCarmodel> serverCarmodels = new ArrayList<>();
        for(TServerCarmodel tsc : modelList){
@@ -121,21 +115,23 @@

        //查询所有专车车型
        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).ne("state", 3));
        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
//        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
        List<TServerCarmodel> serverCarmodels = new ArrayList<>();
        for(TServerCarmodel tsc : modelList){
            boolean b = true;
            for(TSystemPrice tsp : tSystemPrices){
                if(tsc.getId() == tsp.getServerCarModelId() && tsc.getId() != tSystemPriceId){
                    b = false;
                    break;
                }
            }
            if(b){
                serverCarmodels.add(tsc);
            }
        }
        model.addAttribute("modelList",serverCarmodels);
//        for(TServerCarmodel tsc : modelList){
//            boolean b = true;
//            for(TSystemPrice tsp : tSystemPrices){
//                if(tsc.getId() == tsp.getServerCarModelId() && tsc.getId() != tSystemPriceId){
//                    b = false;
//                    break;
//                }
//            }
//            if(b){
//                serverCarmodels.add(tsc);
//            }
//        }
        TServerCarmodel tSystemPrice1 = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
        serverCarmodels.add(tSystemPrice1);
        model.addAttribute("modelList", serverCarmodels);

        return PREFIX + "tSystemPrice_edit.html";
    }
@@ -171,14 +167,6 @@
        tSystemPrice.setType(1);
        tSystemPrice.setState(1);
        tSystemPriceService.insert(tSystemPrice);
        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport){//上传数据
                    pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
                }
            }
        }).start();
        return SUCCESS_TIP;
    }

@@ -202,14 +190,6 @@
            }
        }
        tSystemPriceService.updateById(tSystemPrice);
        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport) {//上传数据
                    pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
                }
            }
        }).start();
        return SUCCESS_TIP;
    }

@@ -238,18 +218,18 @@
    @ResponseBody
    public Object smallSubmit(String json1,String json2) {
        //跨城小件物流
        TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 5).eq("companyId", ShiroKit.getUser().getObjectId()));
        if (SinataUtil.isNotEmpty(one)){
            one.setContent(json1);
            tSystemPriceService.updateById(one);
        }else{
            one = new TSystemPrice();
            one.setState(1);
            one.setType(5);
            one.setCompanyId(ShiroKit.getUser().getObjectId());
            one.setContent(json1);
            tSystemPriceService.insert(one);
        }
//        TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 5).eq("companyId", ShiroKit.getUser().getObjectId()));
//        if (SinataUtil.isNotEmpty(one)){
//            one.setContent(json1);
//            tSystemPriceService.updateById(one);
//        }else{
//            one = new TSystemPrice();
//            one.setState(1);
//            one.setType(5);
//            one.setCompanyId(ShiroKit.getUser().getObjectId());
//            one.setContent(json1);
//            tSystemPriceService.insert(one);
//        }
        //同城小件物流
        TSystemPrice two = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", ShiroKit.getUser().getObjectId()));
        if (SinataUtil.isNotEmpty(two)){