changes

liuhaonan

2022-08-24 70c66f5e065b6d467812f8e702f87c2262bce67e

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java

@@ -71,18 +71,18 @@
     * @param outTradeNo
     * @return
     */
    public boolean orderRefund(String outTradeNo, Double amt) {
    public boolean orderRefund(String outTradeNo) {
        Long userId = SecurityUtils.getUserId();
        String username = SecurityUtils.getUsername();
        C3mOrder orderByOutTradeNo = c3mOrderMapper.getOrderByOutTradeNo(outTradeNo);
        Double refundAmount = orderByOutTradeNo.getSurplusAmount();
        if (orderByOutTradeNo.getTotalAmount() < refundAmount) {
            throw new BusinessException("退款金额错误,不能大于付款金额");
        }

        if (orderByOutTradeNo == null) {
            throw new BusinessException("未找到订单");
        } else {
            orderByOutTradeNo.setRefundAmount(refundAmount);
            if (orderByOutTradeNo.getTotalAmount() < orderByOutTradeNo.getRefundAmount()) {
                throw new BusinessException("退款金额错误,不能大于付款金额");
            }
            orderByOutTradeNo.setRefundAmount(orderByOutTradeNo.getSurplusAmount());
            return c3mOrderRefund(orderByOutTradeNo, "充电桩退款", userId, username);
        }

@@ -110,12 +110,7 @@
                    C3mOrder.getRefundAmount());
        } else if (C3mOrder.getOrderType().equals(OrderType.WXPAY.getCode())) {
            //  进行微信退款
            b = fastPayService.refund(
                    C3mOrder.getTotalAmount(),
                    C3mOrder.getRefundAmount(),
                    C3mOrder.getOutTradeNo(),
                    C3mOrder.getPoleId()
            );
            b = fastPayService.refund(C3mOrder);
        }
        C3mOrder.setRefundTimestamp(System.currentTimeMillis());
        C3mOrder.setRefundMsg(msg);
@@ -189,7 +184,8 @@
        c3mOrderEntity.setOrderStatus(0);
        c3mOrderEntity.setUserCode(wxCode);
        c3mOrderEntity.setC3Udid(c3m.getMcuUdid());

        c3mOrderEntity.setRefundAmount(totalAmount);
        c3mOrderEntity.setSurplusAmount(totalAmount);


        if (save(c3mOrderEntity)) {