yfd
/
cpxt-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改查询车辆实时状态接口

master
luojian 2024-12-27 11:17:04 +08:00
parent f405093869
commit 45a402437f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCarStateController.java
View File

@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cpxt.biz.domain.BizCarState; import com.cpxt.biz.domain.BizCarState;
import com.cpxt.biz.service.IBizCarStateService; import com.cpxt.biz.service.IBizCarStateService;
import com.cpxt.common.annotation.Anonymous;
import com.cpxt.common.constant.HttpStatus; import com.cpxt.common.constant.HttpStatus;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -49,7 +50,8 @@ public class BizCarStateController extends BaseController {
/** /**
* 查询车辆实时状态列表 * 查询车辆实时状态列表
*/ */
@PreAuthorize("@ss.hasPermi('system:state:list')") // @PreAuthorize("@ss.hasPermi('system:state:list')")
@Anonymous
@GetMapping("/list2") @GetMapping("/list2")
public AjaxResult list2(BizCarState bizCarState) { public AjaxResult list2(BizCarState bizCarState) {
return AjaxResult.success(bizCarStateService.selectBizCarStateList(bizCarState)); return AjaxResult.success(bizCarStateService.selectBizCarStateList(bizCarState));

12
cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java
View File

@ -357,16 +357,16 @@ public class BizOrderServiceImpl implements IBizOrderService {
BizOrderSub bizOrderSub = new BizOrderSub(); BizOrderSub bizOrderSub = new BizOrderSub();
bizOrderSub.setOrderSn(orderSn); bizOrderSub.setOrderSn(orderSn);
bizOrderSub.setSubOrderSn((String) map1.get("subOrderSn")); bizOrderSub.setSubOrderSn((String) map1.get("subOrderSn"));
bizOrderSub.setWeight((BigDecimal) map1.get("weight")); if (ObjectUtil.isNotEmpty(map1.get("weight"))) bizOrderSub.setWeight(BigDecimal.valueOf((Integer) map1.get("weight")));
bizOrderSub.setLength((BigDecimal) map1.get("length")); if (ObjectUtil.isNotEmpty(map1.get("length"))) bizOrderSub.setLength(BigDecimal.valueOf((Integer) map1.get("length")));
bizOrderSub.setWidth((BigDecimal) map1.get("width")); if (ObjectUtil.isNotEmpty(map1.get("width"))) bizOrderSub.setWidth(BigDecimal.valueOf((Integer) map1.get("width")));
bizOrderSub.setHeight((BigDecimal) map1.get("height")); if (ObjectUtil.isNotEmpty(map1.get("height"))) bizOrderSub.setHeight(BigDecimal.valueOf((Integer) map1.get("height")));
if (ObjectUtil.isNotEmpty(map1.get("length")) && ObjectUtil.isNotEmpty(map1.get("width")) && ObjectUtil.isNotEmpty(map1.get("height"))){ if (ObjectUtil.isNotEmpty(map1.get("length")) && ObjectUtil.isNotEmpty(map1.get("width")) && ObjectUtil.isNotEmpty(map1.get("height"))){
bizOrderSub.setVolume(((BigDecimal) map1.get("length")).multiply((BigDecimal) map1.get("width")).multiply((BigDecimal) map1.get("height"))); bizOrderSub.setVolume(BigDecimal.valueOf((Integer) map1.get("length")).multiply(BigDecimal.valueOf((Integer) map1.get("width"))).multiply(BigDecimal.valueOf((Integer) map1.get("height"))));
} }
bizOrderSub.setGoodsType((String) map1.get("goodsType")); bizOrderSub.setGoodsType((String) map1.get("goodsType"));
bizOrderSub.setGoodsName((String) map1.get("goodsName")); bizOrderSub.setGoodsName((String) map1.get("goodsName"));
bizOrderSub.setOrderFee((BigDecimal) map1.get("orderFee")); if (ObjectUtil.isNotEmpty(map1.get("orderFee"))) bizOrderSub.setOrderFee(BigDecimal.valueOf((Integer) map1.get("orderFee")));
bizOrderSub.setRemark((String) map1.get("remark")); bizOrderSub.setRemark((String) map1.get("remark"));
bizOrderSubMapper.insert(bizOrderSub); bizOrderSubMapper.insert(bizOrderSub);
// 同步更新订单表的运单状态 // 同步更新订单表的运单状态