用户端代码

liujie

2023-10-15 871efa21e6c95520e9825ae1f2338c9a919fdd5d

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

@@ -448,7 +448,7 @@
        TUser tUser = itUserService.selectById(userId);
        List<TPrice> prices = priceService.selectList(new EntityWrapper<TPrice>().eq("order_id", tOrder.getId()));
        ArrayList<PriceInfo> priceInfos = new ArrayList<>();
        if(tUser.getGroupId()!=null){
        if(false){
            TGroup tGroup = groupService.selectById(tUser.getGroupId());
            User user = service.selectById(tGroup.getSalesId());

@@ -738,7 +738,7 @@
            record.setType(type);
        }
        TOrder tOrder = orderService.selectById(orderId);
        if("9".equals(tOrder.getStatus()) || "18".equals(tOrder.getStatus())){
        if(true){
            ArrayList<TOrderFile> tOrderFiles = new ArrayList<>();
            TOrderFile tOrderFile = new TOrderFile();
            tOrderFile.setName("Bill of lading.pdf");
@@ -789,6 +789,8 @@
        try {
            OrderLading orderLading = new OrderLading();
            TOrder tOrder = orderService.selectById(orderId);

            orderLading.setOrderId(tOrder.getId());
            // 找出用户
            TUser tUser = itUserService.selectById(tOrder.getUserId());
            orderLading.setCustomerName(tUser.getCompanyName());
@@ -817,6 +819,48 @@
            orderLading.setPo(tGoods.getPo());
            orderLading.setCustRef(tGoods.getCustRef());
            orderLading.setEntry(tGoods.getEntry());
            orderLading.setLbNo(tGoods.getBillNumber());
            String time ="";
            if(ToolUtil.isNotEmpty(tGoods.getShipmentId()) && !"0".equals(tGoods.getShipmentId())){
                time= FortyNineUtil.getContainerNoOne(tGoods.getShipmentId(), tGoods.getContainerNumber());
            }else {
                String shippingLine = tGoods.getShippingLine();
                SCACEnum scacEnum = SCACEnum.fromCode(shippingLine);
                String s;
                if(ToolUtil.isEmpty(tGoods.getTrackingId()) || "0".equals(tGoods.getTrackingId())){
                    s = FortyNineUtil.trackingRequest(tGoods.getBillNumber(), scacEnum.getDesc());
                    if(ToolUtil.isEmpty(s)){
                        s = FortyNineUtil.trackingList(tGoods.getBillNumber());
                    }
                    tGoods.setTrackingId(s);
                    goodsService.updateById(tGoods);
                }else {
                    s = tGoods.getTrackingId();
                }
                String shipmentId = FortyNineUtil.getShipmentId(s);
                if(ToolUtil.isNotEmpty(shipmentId)){
                    tGoods.setShipmentId(shipmentId);
                    goodsService.updateById(tGoods);
                }else {
                    tGoods.setShipmentId("0");
                    tGoods.setTrackingId("0");
                    goodsService.updateById(tGoods);
                }
                time = FortyNineUtil.getContainerNoOne(shipmentId, tGoods.getContainerNumber());
            }

            orderLading.setEta(time);
            String billNumber = tGoods.getBillNumber();
            List<TGoods> goods = goodsService.selectList(new EntityWrapper<TGoods>().eq("bill_number", billNumber));
            ArrayList<Map<String, String>> maps = new ArrayList<>();
            for (TGoods good : goods) {
                HashMap<String, String> map = new HashMap<>();
                map.put("containerNo",good.getContainerNumber());
                map.put("size",good.getSize());
                map.put("weight",good.getKg());
                maps.add(map);
            }
            orderLading.setGoodsInfo(maps);
            // 获取收货信息
            orderLading.setEndCompanyName(tOrder.geteCompanyName());
            orderLading.setEndCompanyAddress(tOrder.geteAddress());