From d6811336d546e4963a9af3bd7cd8654d14193bce Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 31 八月 2023 11:58:57 +0800
Subject: [PATCH] broker 卡车公司端 49码头
---
src/main/java/com/stylefeng/guns/modular/system/controller/RatesController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/stylefeng/guns/modular/system/controller/RatesController.java b/src/main/java/com/stylefeng/guns/modular/system/controller/RatesController.java
index 576591a..9b49fd9 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/controller/RatesController.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/controller/RatesController.java
@@ -3,7 +3,9 @@
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.TPortMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
@@ -18,6 +20,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -240,26 +243,26 @@
@ApiImplicitParam(name = "id", value = "港区id/特殊码头id", required = true, dataType = "int",paramType = "query"),
@ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int",paramType = "query"),
@ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"),
+ @ApiImplicitParam(name = "code", value = "code", required = false, dataType = "String",paramType = "query"),
})
@GetMapping(value = "/getWarehouseFromId")
@ResponseBody
- public Object getWarehouseFromId(int id,int pageNumber,int pageSize) {
+ public Object getWarehouseFromId(int id,int pageNumber,int pageSize,String code) {
Page<TWarehouse> tWarehousePage = new Page<>(pageNumber, pageSize);
- Page<TWarehouse> tWarehouses = warehouseService.selectPage(tWarehousePage,new EntityWrapper<TWarehouse>().eq("port_id", id));
- return new SuccessTip(tWarehouses);
+ List<TWarehouse> tWarehouses = warehouseService.getWarehouseFromId(tWarehousePage,id,code);
+ tWarehousePage.setRecords(tWarehouses);
+ return new SuccessTip(tWarehousePage);
}
@ApiOperation(value = "卡车公司- 根据id统一设置亚马逊价格",notes="卡车公司-根据id统一设置亚马逊价格")
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(name = "id", value = "港区id/特殊码头id", required = true, dataType = "int",paramType = "query"),
- @ApiImplicitParam(name = "money", value = "money", required = true, dataType = "double",paramType = "query"),
})
- @GetMapping(value = "/setWarehousePrice")
+ @PostMapping(value = "/setWarehousePrice")
@ResponseBody
- public Object setWarehousePrice(int id,double money) {
- List<TWarehouse> tWarehouses = warehouseService.selectList(new EntityWrapper<TWarehouse>().eq("port_id", id));
- tWarehouses.stream().forEach(e->e.setWarePrice(new BigDecimal(money)));
+ public Object setWarehousePrice(@RequestBody SetWarehouseDto dto) {
+ List<TWarehouse> tWarehouses = warehouseService.selectList(new EntityWrapper<TWarehouse>().in("id", dto.getId()));
+ tWarehouses.stream().forEach(e->e.setWarePrice(new BigDecimal(dto.getMoney())));
warehouseService.updateBatchById(tWarehouses);
return new SuccessTip(tWarehouses);
}
@@ -283,7 +286,37 @@
}
+ @ApiOperation(value = "卡车公司- 点对点/范围/距离详情",notes="卡车公司-点对点/范围/距离详情")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "int",paramType = "query"),
+ })
+ @PostMapping(value = "/laneInfo")
+ @ResponseBody
+ public Object laneInfo( int id) {
+ TCompanyBasic tCompanyBasic = basicService.selectById(id);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("data",tCompanyBasic);
+
+ if(tCompanyBasic.getType()==2){
+ String lonLat = tCompanyBasic.getLonLat();
+ String[] split = lonLat.split("_");
+ ArrayList<LonLat> lonLats = new ArrayList<>();
+ for (String s : split) {
+ String[] split1 = s.split(",");
+ LonLat lonLat1 = new LonLat();
+ lonLat1.setLat(split1[0]);
+ lonLat1.setLng(split1[1]);
+ lonLats.add(lonLat1);
+ }
+ map.put("lonlat",lonLats);
+ }else {
+ map.put("lonlat",new ArrayList<>());
+ }
+ return new SuccessTip(tCompanyBasic);
+ }
@ApiOperation(value = "卡车公司- 添加点对点/范围/距离",notes="卡车公司-添加点对点/范围/距离")
+
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
@@ -340,7 +373,11 @@
@PostMapping(value = "/addFee")
@ResponseBody
public Object addFee(@RequestBody List<TCompanyFeeSetting> feeSettings) {
- tCompanyFeeSettingMapper.insertBatch(feeSettings);
+ if(feeSettings.get(0).getId()==null){
+ tCompanyFeeSettingMapper.insertBatch(feeSettings);
+ }else {
+ tCompanyFeeSettingMapper.updateBatchById(feeSettings);
+ }
return new SuccessTip();
}
--
Gitblit v1.7.1