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

Compare commits

base: yfd:45a402437f91af5f6b1192aa5519795421c3782b
Branches Tags
yfd:master
..
compare: yfd:10ef3e096b55bc2e9f6d36a89f87be57b89112a7
Branches Tags
yfd:master

No commits in common. "45a402437f91af5f6b1192aa5519795421c3782b" and "10ef3e096b55bc2e9f6d36a89f87be57b89112a7" have entirely different histories.
45a402437f ... 10ef3e096b

2 changed files with 13 additions and 15 deletions
Show Stats Expand all files Collapse all files

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

@ -6,7 +6,6 @@ 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;
@ -50,8 +49,7 @@ public class BizCarStateController extends BaseController {
/**
* 查询车辆实时状态列表
*/
// @PreAuthorize("@ss.hasPermi('system:state:list')")
@Anonymous
@PreAuthorize("@ss.hasPermi('system:state:list')")
@GetMapping("/list2")
public AjaxResult list2(BizCarState bizCarState) {
return AjaxResult.success(bizCarStateService.selectBizCarStateList(bizCarState));

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

@ -351,23 +351,23 @@ public class BizOrderServiceImpl implements IBizOrderService {
@Transactional
public void insertBizOrderSub(Map map) {
String orderSn = (String) map.get("orderSn");
List<Map> subList = (List<Map>) map.get("sublist");
List<Map> subList = (List<Map>) map.get("subList");
for (Map map1 : subList) {
if (map1.get("orderSn").equals(orderSn)){
BizOrderSub bizOrderSub = new BizOrderSub();
bizOrderSub.setOrderSn(orderSn);
bizOrderSub.setSubOrderSn((String) map1.get("subOrderSn"));
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.valueOf((Integer) map1.get("length")).multiply(BigDecimal.valueOf((Integer) map1.get("width"))).multiply(BigDecimal.valueOf((Integer) map1.get("height"))));
bizOrderSub.setSubOrderSn((String) map.get("subOrderSn"));
bizOrderSub.setWeight((BigDecimal) map.get("weight"));
bizOrderSub.setLength((BigDecimal) map.get("length"));
bizOrderSub.setWidth((BigDecimal) map.get("width"));
bizOrderSub.setHeight((BigDecimal) map.get("height"));
if (ObjectUtil.isNotEmpty(map.get("length")) && ObjectUtil.isNotEmpty(map.get("width")) && ObjectUtil.isNotEmpty(map.get("height"))){
bizOrderSub.setVolume(((BigDecimal) map.get("length")).multiply((BigDecimal) map.get("width")).multiply((BigDecimal) map.get("height")));
}
bizOrderSub.setGoodsType((String) map1.get("goodsType"));
bizOrderSub.setGoodsName((String) map1.get("goodsName"));
if (ObjectUtil.isNotEmpty(map1.get("orderFee"))) bizOrderSub.setOrderFee(BigDecimal.valueOf((Integer) map1.get("orderFee")));
bizOrderSub.setRemark((String) map1.get("remark"));
bizOrderSub.setGoodsType((String) map.get("goodsType"));
bizOrderSub.setGoodsName((String) map.get("goodsName"));
bizOrderSub.setOrderFee((BigDecimal) map.get("orderFee"));
bizOrderSub.setRemark((String) map.get("remark"));
bizOrderSubMapper.insert(bizOrderSub);
// 同步更新订单表的运单状态
BizOrder bizOrder = bizOrderMapper.selectByOrderSn(orderSn);