diff --git a/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCarStateController.java b/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCarStateController.java index 84c6d1a..3d4bad0 100644 --- a/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCarStateController.java +++ b/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCarStateController.java @@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cpxt.biz.domain.BizCarState; import com.cpxt.biz.service.IBizCarStateService; +import com.cpxt.common.annotation.Anonymous; import com.cpxt.common.constant.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; 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") public AjaxResult list2(BizCarState bizCarState) { return AjaxResult.success(bizCarStateService.selectBizCarStateList(bizCarState)); diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java index 174874a..7749108 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java @@ -357,16 +357,16 @@ public class BizOrderServiceImpl implements IBizOrderService { BizOrderSub bizOrderSub = new BizOrderSub(); bizOrderSub.setOrderSn(orderSn); bizOrderSub.setSubOrderSn((String) map1.get("subOrderSn")); - bizOrderSub.setWeight((BigDecimal) map1.get("weight")); - bizOrderSub.setLength((BigDecimal) map1.get("length")); - bizOrderSub.setWidth((BigDecimal) map1.get("width")); - bizOrderSub.setHeight((BigDecimal) map1.get("height")); + if (ObjectUtil.isNotEmpty(map1.get("weight"))) bizOrderSub.setWeight(BigDecimal.valueOf((Integer) map1.get("weight"))); + if (ObjectUtil.isNotEmpty(map1.get("length"))) bizOrderSub.setLength(BigDecimal.valueOf((Integer) map1.get("length"))); + if (ObjectUtil.isNotEmpty(map1.get("width"))) bizOrderSub.setWidth(BigDecimal.valueOf((Integer) map1.get("width"))); + 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"))){ - 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.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")); bizOrderSubMapper.insert(bizOrderSub); // 同步更新订单表的运单状态