无关风月
2025-01-14 07d470e55405cbfab1a7d38eeeb8907e741401df
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -213,7 +213,7 @@
        }
        // 生成核销码BASE64
        try {
            String base64 = QRCodeGenerator.generateQRCodeBase64(order.getOrderNumber(), 124, 124);
            String base64 = QRCodeGenerator.generateQRCodeBase64(String.valueOf(order.getId()), 124, 124);
            orderDetailVO.setWriteOffCode(base64);
        } catch (Exception e) {
            e.printStackTrace();
@@ -328,8 +328,21 @@
                orderPageListVo.setUserName(appUser.getName());
                orderPageListVo.setPhone(appUser.getPhone());
            }
            RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderPageListVo.getId()).eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0, 1"));
//            RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderPageListVo.getId()).eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
            RefundPass one = refundPassService.lambdaQuery().eq(RefundPass::getOrderId, orderPageListVo.getId()).one();
            orderPageListVo.setRefundPassId(null != one ? one.getId().toString() : null);
            List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>()
                    .eq(OrderGood::getOrderId, orderPageListVo.getId()));
            BigDecimal servuceShopCharges = BigDecimal.ZERO;
            BigDecimal boundShopCharges = BigDecimal.ZERO;
            for (OrderGood orderGood : orderGoods) {
                if(orderPageListVo.getShopId().equals(orderPageList.getShopId())){
                    servuceShopCharges = servuceShopCharges.add(orderGood.getServuceShopCharges());
                }
                boundShopCharges = boundShopCharges.add(orderGood.getBoundShopCharges());
            }
            orderPageListVo.setGetCommission(servuceShopCharges.add(boundShopCharges));
        }
        return pageInfo.setRecords(list);
    }
@@ -366,8 +379,6 @@
    /**
     * 确认发货操作
     * @param orderId
     * @param code
     * @return
     */
    @Override