修改bug

Pu Zhibing

2 天以前 5dacdee9b54c78372b68140e2b068d03a620eab9

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

@@ -6,27 +6,25 @@
import com.stylefeng.guns.core.base.tips.ErrorTip;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.TServerCarmodel;
import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.model.TSystemPrice;
import com.stylefeng.guns.modular.system.service.ITServerCarmodelService;
import com.stylefeng.guns.modular.system.service.ITSystemPriceService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
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.model.TSystemPrice;
import com.stylefeng.guns.modular.system.service.ITSystemPriceService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -46,22 +44,22 @@

    @Autowired
    private ITSystemPriceService tSystemPriceService;

    
    @Autowired
    private ITServerCarmodelService tServerCarmodelService;

    
    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;

    
    @Autowired
    private IUserService userService;

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




    
    
    /**
     * 跳转到快车价格设置首页
     */
@@ -76,13 +74,13 @@
    @RequestMapping("/small")
    public String small(Model model) {
        //跨城小件物流
        TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 5).eq("companyId", ShiroExtUtil.getUser().getObjectId()).eq("state", 1));
        TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 5).eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("state", 1));
        if (SinataUtil.isNotEmpty(one)){
            JSONObject json1 = JSONObject.fromObject(one.getContent());
            model.addAttribute("json1",json1);
        }
        //同城小件物流
        TSystemPrice two = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", ShiroExtUtil.getUser().getObjectId()).eq("state", 1));
        TSystemPrice two = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("state", 1));
        if (SinataUtil.isNotEmpty(two)){
            JSONObject json2 = JSONObject.fromObject(two.getContent());
            model.addAttribute("json2",json2);
@@ -94,32 +92,32 @@

     @RequestMapping("/taxi")
    public String taxi(Model model) {
         Integer id = ShiroExtUtil.getUser().getId();
         Integer id = shiroExtUtil.getUser().getId();
         TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 2).eq("companyId", id));
         if (SinataUtil.isNotEmpty(one)){
         if (SinataUtil.isNotEmpty(one)) {
             JSONObject json1 = JSONObject.fromObject(one.getContent());
             model.addAttribute("json",json1);
             model.addAttribute("json", json1);
         }
        return PREFIX + "taxiSet.html";
    }
         return PREFIX + "taxiSet.html";
     }
    /**
     * 跳转到添加快车价格设置
     */
    @RequestMapping("/tSystemPrice_add")
    public String tSystemPriceAdd(Model model) {
        //查询所有快车车型
        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).eq("companyId", ShiroExtUtil.getUser().getObjectId()).ne("state", 3));
        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).eq("companyId", shiroExtUtil.getUser().getObjectId()).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){
        for (TServerCarmodel tsc : modelList) {
            boolean b = true;
            for(TSystemPrice tsp : tSystemPrices){
                if(tsc.getId() == tsp.getServerCarModelId()){
            for (TSystemPrice tsp : tSystemPrices) {
                if (tsc.getId() == tsp.getServerCarModelId()) {
                    b = false;
                    break;
                }
            }
            if(b){
            if (b) {
                serverCarmodels.add(tsc);
            }
        }
@@ -138,22 +136,22 @@

        JSONObject json = JSONObject.fromObject(tSystemPrice.getContent());
        model.addAttribute("content",json);

        model.addAttribute("contentPutOne",JSONObject.fromObject(tSystemPrice.getContentPutOne()));
        model.addAttribute("contentNotOne",JSONObject.fromObject(tSystemPrice.getContentNotOne()));
        model.addAttribute("contentPutTwo",JSONObject.fromObject(tSystemPrice.getContentPutTwo()));
        model.addAttribute("contentNotTwo",JSONObject.fromObject(tSystemPrice.getContentNotTwo()));
        model.addAttribute("contentPutThree",JSONObject.fromObject(tSystemPrice.getContentPutThree()));
        model.addAttribute("contentNotThree",JSONObject.fromObject(tSystemPrice.getContentNotThree()));
        model.addAttribute("contentExclusive",JSONObject.fromObject(tSystemPrice.getContentExclusive()));
        model.addAttribute("contentPrice",JSONObject.fromObject(tSystemPrice.getContentPrice()));

    
        model.addAttribute("contentPutOne", JSONObject.fromObject(tSystemPrice.getContentPutOne()));
        model.addAttribute("contentNotOne", JSONObject.fromObject(tSystemPrice.getContentNotOne()));
        model.addAttribute("contentPutTwo", JSONObject.fromObject(tSystemPrice.getContentPutTwo()));
        model.addAttribute("contentNotTwo", JSONObject.fromObject(tSystemPrice.getContentNotTwo()));
        model.addAttribute("contentPutThree", JSONObject.fromObject(tSystemPrice.getContentPutThree()));
        model.addAttribute("contentNotThree", JSONObject.fromObject(tSystemPrice.getContentNotThree()));
        model.addAttribute("contentExclusive", JSONObject.fromObject(tSystemPrice.getContentExclusive()));
        model.addAttribute("contentPrice", JSONObject.fromObject(tSystemPrice.getContentPrice()));
    
        //查询所有快车车型
        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).eq("companyId", ShiroExtUtil.getUser().getObjectId()).ne("state", 3));
        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).eq("companyId", shiroExtUtil.getUser().getObjectId()).ne("state", 3));
        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1)
                .notIn("id", tSystemPrices.stream().map(TSystemPrice::getServerCarModelId).collect(Collectors.toList())));
        List<TServerCarmodel> serverCarmodels = new ArrayList<>();

    
        modelList.add(tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId()));
//            boolean b = true;
//            for(TSystemPrice tsp : tSystemPrices){
@@ -177,7 +175,7 @@
    @ResponseBody
    public Object list(String name,Integer state) {
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tSystemPriceService.getSpecialPriceList(page, ShiroExtUtil.getUser().getObjectId(), name, state));
        page.setRecords(tSystemPriceService.getSpecialPriceList(page, shiroExtUtil.getUser().getObjectId(), name, state));
        return super.packForBT(page);
    }

@@ -191,20 +189,20 @@
        int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
                .eq("type", 1)
                .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
                .eq("companyId", ShiroExtUtil.getUser().getObjectId())
                .eq("companyId", shiroExtUtil.getUser().getObjectId())
                .last(" and not FIND_IN_SET(state,'3')"));
        if (count > 0){
        if (count > 0) {
            TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
            return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
            return new ErrorTip(500, "【" + one.getName() + "】已存在,请重新选择");
        }
        tSystemPrice.setCompanyId(ShiroExtUtil.getUser().getObjectId());
        tSystemPrice.setCompanyId(shiroExtUtil.getUser().getObjectId());
        tSystemPrice.setType(1);
        tSystemPrice.setState(1);
        tSystemPriceService.insert(tSystemPrice);
        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport){//上传数据
                if (pushMinistryOfTransport) {//上传数据
                    pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
                }
            }
@@ -215,15 +213,15 @@
    @RequestMapping(value = "/taxiSet")
    @ResponseBody
    public Object taxiSet(String content) {
        Integer id = ShiroExtUtil.getUser().getId();
        Integer id = shiroExtUtil.getUser().getId();
        TSystemPrice tSystemPrice1 = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 2).eq("companyId", id));
        if (tSystemPrice1==null) {
        if (tSystemPrice1 == null) {
            TSystemPrice tSystemPrice = new TSystemPrice();
            tSystemPrice.setContent(content);
            tSystemPrice.setType(2);
            tSystemPrice.setCompanyId(id);
            tSystemPriceService.insert(tSystemPrice);
        }else {
        } else {
            tSystemPrice1.setContent(content);
            tSystemPriceService.updateById(tSystemPrice1);
        }
@@ -243,7 +241,7 @@
            int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
                    .eq("type", 1)
                    .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
                    .eq("companyId", ShiroExtUtil.getUser().getObjectId())
                    .eq("companyId", shiroExtUtil.getUser().getObjectId())
                    .last(" and not FIND_IN_SET(state,'3')"));
            if (count > 0){
                TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
@@ -287,28 +285,28 @@
    @ResponseBody
    public Object smallSubmit(String json1,String json2) {
        //跨城小件物流
        TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 5).eq("companyId", ShiroExtUtil.getUser().getObjectId()));
        TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 5).eq("companyId", shiroExtUtil.getUser().getObjectId()));
        if (SinataUtil.isNotEmpty(one)){
            one.setContent(json1);
            tSystemPriceService.updateById(one);
        }else{
        }else {
            one = new TSystemPrice();
            one.setState(1);
            one.setType(5);
            one.setCompanyId(ShiroExtUtil.getUser().getObjectId());
            one.setCompanyId(shiroExtUtil.getUser().getObjectId());
            one.setContent(json1);
            tSystemPriceService.insert(one);
        }
        //同城小件物流
        TSystemPrice two = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", ShiroExtUtil.getUser().getObjectId()));
        TSystemPrice two = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", shiroExtUtil.getUser().getObjectId()));
        if (SinataUtil.isNotEmpty(two)){
            two.setContent(json2);
            tSystemPriceService.updateById(two);
        }else{
        }else {
            two = new TSystemPrice();
            two.setState(1);
            two.setType(4);
            two.setCompanyId(ShiroExtUtil.getUser().getObjectId());
            two.setCompanyId(shiroExtUtil.getUser().getObjectId());
            two.setContent(json2);
            tSystemPriceService.insert(two);
        }