broker 卡车公司端

liujie

2023-05-26 26fa723daeccb1e731ed24034ac66aa5c56c4269

broker 卡车公司端

 src/main/java/com/stylefeng/guns/modular/system/controller/DemandController.java

@@ -228,7 +228,12 @@
                        tOrder.setInvoiceNumber(s2);
                        tOrder.setCompanyId(company.getId());
                        tOrder.setCreateTime(new Date());
                        if("0".equals(demandDto.getWarehouse())){
                        tOrder.seteAddress(demandDto.getEAddress());
                        }else {
                            TWarehouse tWarehouse = warehouseService.selectOne(new EntityWrapper<TWarehouse>().eq("company_id", company.getId()).eq("code", demandDto.getWarehouse()).eq("port_id",ratesId));
                            tOrder.seteAddress(tWarehouse.getAddress());
                        }
                        tOrder.setOrderType(1);
                        orderService.insert(tOrder);
                        tOrders.add(tOrder);
@@ -564,6 +569,7 @@

    }


    @ApiOperation(value = "需求列表",notes="需求列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@@ -715,14 +721,35 @@
            @ApiImplicitParam(name = "address", value = "address", required = false, dataType = "String"),
            @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "String"),
            @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "String"),
            @ApiImplicitParam(name = "portId", value = "portId", required = true, dataType = "int"),
            @ApiImplicitParam(name = "companyId", value = "companyId", required = true, dataType = "int"),
    })
    @GetMapping(value = "/getWarehouse")
    @ResponseBody
    public Object getWarehouse( String address,int pageNumber,int pageSize) {
    public Object getWarehouse( String address,int pageNumber,int pageSize,int portId,int companyId) {
        TRates tRates1 = ratesService.selectOne(new EntityWrapper<TRates>().eq("metro_id", portId).eq("type", 2).eq("company_id", companyId));
        int ratesId=0;
        if(tRates1!=null){
            ratesId=tRates1.getId();
        }else {
            // 找出city
            TPort tPort = portService.selectById(portId);
            TCountry tCountry = countryService.selectById(tPort.getCity());
            // 是否是符合的港区
            tRates1 = ratesService.selectOne(new EntityWrapper<TRates>().eq("metro_id", tCountry.getId()).eq("type", 1).eq("company_id", companyId));
            if(tRates1!=null){
                ratesId=tRates1.getId();
            }else {
                ratesId=-1;
            }
//                    ratesId=tCountry.getId();
        }

        Page<TWarehouse> tWarehousePage = new Page<>(pageNumber, pageSize);

        EntityWrapper<TWarehouse> tWarehouseEntityWrapper = new EntityWrapper<>();
        tWarehouseEntityWrapper.eq("company_id",0);
        tWarehouseEntityWrapper.eq("company_id",companyId);
        tWarehouseEntityWrapper.eq("port_id",ratesId);
        if(Objects.nonNull(address)){
            tWarehouseEntityWrapper.like("address",address);
        }

 src/main/java/com/stylefeng/guns/modular/system/controller/DriverController.java

@@ -65,7 +65,6 @@
        EntityWrapper<TDriver> wrapper = new EntityWrapper<>();
        Page<TDriver> tDriverPage = new Page<>(pageNumber, pageSize);
        wrapper.eq("remove", 0);
        wrapper.eq("is_carriers",1);
        wrapper.eq("company_id",id);
        if (ToolUtil.isNotEmpty(name)) {
            wrapper.like("driver_name", name).or().like("account", name);

 src/main/java/com/stylefeng/guns/modular/system/controller/FinanceController.java

@@ -107,8 +107,25 @@
    @GetMapping(value = "/exportQuickBook")
    @ResponseBody
    public Object exportQuickBooks(){
        List<Map<String,Object>> orders = orderService.queryAllOrderDatas();
        redisUtil.setStrValue(INVOICE_DATA,orders.toString());
        redisUtil.setStrValue("quick","3");
        try {
            View view = InvoicesDataUploadUtil.connectToQuickBooks();
            log.info("view:{}",view);
        } catch (InvalidRequestException e) {
            e.printStackTrace();
        }
        return new com.stylefeng.guns.core.base.tips.SuccessTip();
    }


    @ApiOperation(value = "应付款票据quickBooks--bill",notes="应付款票据quickBooks--bill")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    @GetMapping(value = "/exportQuickBookBill")
    @ResponseBody
    public Object exportQuickBookBill(){
        redisUtil.setStrValue("quick","4");
        try {
            View view = InvoicesDataUploadUtil.connectToQuickBooks();
            log.info("view:{}",view);

 src/main/java/com/stylefeng/guns/modular/system/controller/TCompanyController.java

@@ -5,9 +5,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ITCompanyFeeSettingService;
import com.stylefeng.guns.modular.system.service.ITCompanyService;
import com.stylefeng.guns.modular.system.service.ITCompanyServiceService;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.utils.tips.ErrorTip;
import com.stylefeng.guns.modular.system.utils.tips.SuccessTip;
import io.swagger.annotations.Api;
@@ -44,6 +42,12 @@

    @Autowired
    private ITCompanyServiceService itCompanyServiceService;

    @Autowired
    private TPowerUnitsService powerUnitsService;

    @Autowired
    private ITDriverService driverService;



@@ -225,6 +229,12 @@
        BeanUtil.copyProperties(company,tCompanyDto);
        List<TCompanyService> companyServiceList = itCompanyServiceService.selectList(new EntityWrapper<TCompanyService>().eq("company_id", tCompanyId).eq("type",0));
        tCompanyDto.setList(companyServiceList);
        int i = powerUnitsService.selectCount(new EntityWrapper<TPowerUnits>().eq("company_id", tCompanyId).eq("type", 1));
        tCompanyDto.setPowerUnits(i);
        int e = powerUnitsService.selectCount(new EntityWrapper<TPowerUnits>().eq("company_id", tCompanyId).eq("type", 2));
        tCompanyDto.setChassises(e);
        int d = driverService.selectCount(new EntityWrapper<TDriver>().eq("company_id", tCompanyId));
        tCompanyDto.setDrivers(d);
        return new SuccessTip(tCompanyDto);
    }


 src/main/java/com/stylefeng/guns/modular/system/model/TCompanyDto.java

@@ -70,4 +70,10 @@

    private Integer work;
    private List<TCompanyService> list;


    private Integer drivers;

    private Integer chassises;
    private Integer powerUnits;
}

 src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java

@@ -242,6 +242,48 @@

    private String note;

    @TableField("admin_invoice")
    private Integer adminInvoice;

    public Integer getAdminInvoice() {
        return adminInvoice;
    }

    public void setAdminInvoice(Integer adminInvoice) {
        this.adminInvoice = adminInvoice;
    }

    public Integer getAdminBill() {
        return adminBill;
    }

    public void setAdminBill(Integer adminBill) {
        this.adminBill = adminBill;
    }

    public Integer getCompanyInvoice() {
        return companyInvoice;
    }

    public void setCompanyInvoice(Integer companyInvoice) {
        this.companyInvoice = companyInvoice;
    }

    public Integer getCompanyBill() {
        return companyBill;
    }

    public void setCompanyBill(Integer companyBill) {
        this.companyBill = companyBill;
    }

    @TableField("admin_bill")
    private Integer adminBill;
    @TableField("company_invoice")
    private Integer companyInvoice;
    @TableField("company_bill")
    private Integer companyBill;

    public Date getOrderOkTime() {
        return orderOkTime;
    }

 src/main/java/com/stylefeng/guns/modular/system/model/TPowerUnits.java

@@ -83,7 +83,7 @@
    @TableField("purchase_amount")
    private String purchaseAmount;
    @TableField("purchase_dae")
    private String purchaseDae;
    private Date purchaseDae;
    @TableField("sola_date")
    private Date solaDate;
    @TableField("factory_price")

 src/main/java/com/stylefeng/guns/modular/system/model/TUser.java

@@ -142,7 +142,15 @@
    private Integer edit;


    public String getHeadImg() {
        return headImg;
    }

    public void setHeadImg(String headImg) {
        this.headImg = headImg;
    }

    private String headImg;

    public Integer getId() {
        return id;

 src/main/java/com/stylefeng/guns/modular/system/model/TransportInfo.java

@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.model;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

 src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java

@@ -469,11 +469,13 @@
            Integer groupId = tUser.getGroupId();
            if(groupId!=null) {
                TGroup tGroup = tGroupMapper.selectById(groupId);
                if(tGroup!=null) {
                orderInfo.setSalesGroup(tGroup.getName());
                Integer salesId = tGroup.getSalesId();
                User user = userMapper.selectById(salesId);
                orderInfo.setSales(user.getName());
            }
            }
            // 获取码头id  获取码头地址  pickup信息
            Integer portId = tOrder.getPort();
            TPort tPort = portMapper.selectById(portId);

 src/main/java/com/stylefeng/guns/modular/system/utils/InvoicesDataUploadUtil.java

@@ -34,7 +34,7 @@
public class InvoicesDataUploadUtil {

    // private static final String redirectUrl = "http://cca19.com:8010/gunsApi/oauth2redirect";
    private static final String redirectUrl = "http://cca19.com:8010/gunsApi/oauth2redirectOfCar";
    private static final String redirectUrl = "http://cca19.com:8010/gunsApi/oauth2redirect";

    private static final String createInvoiceUrl = "https://sandbox-quickbooks.api.intuit.com";


 src/main/resources/application.yml