2024-10-12 朱宝民 优化交易明细导出、取水口导出、阀控器导出

zhubaomin

2024-10-12 2a959177f1adcd36f790e14718bbd116752e5c64

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java

@@ -160,8 +160,7 @@

        // 获取各支付方式ID
        Long paymentId_cash = 0L;
        Long paymentId_wechat = 0L;
        Long paymentId_alipay = 0L;
        Long paymentId_pos = 0L;
        Long paymentId_transfer = 0L;
        List<SePaymentMethod> list_payment = sePaymentMethodMapper.getPaymentMethods();
        for (int i = 0; i < list_payment.size(); i++) {
@@ -169,16 +168,12 @@
            if(paymentMethod.getName().equals("现金")) {
                paymentId_cash = paymentMethod.getId();
            }
            if(paymentMethod.getName().equals("微信支付")) {
                paymentId_wechat = paymentMethod.getId();
            }
            if(paymentMethod.getName().equals("支付宝支付")) {
                paymentId_alipay = paymentMethod.getId();
            if(paymentMethod.getName().equals("POS机")) {
                paymentId_pos = paymentMethod.getId();
            }
            if(paymentMethod.getName().equals("银行转账")) {
                paymentId_transfer = paymentMethod.getId();
            }

        }

        // 接收传入参数：交易起止日期、收银员ID
@@ -193,20 +188,19 @@
            String tradeDate = dateFormat.format(calendar.getTime()) ;
            if(cashierId != 1000000L) {
                Float receivedCash = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId, paymentId_cash)).orElse(0f);
                Float receivedWechat = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId,paymentId_wechat)).orElse(0f);
                Float receivedAlipay = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId,paymentId_alipay)).orElse(0f);
                Float receivedPos = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId,paymentId_pos)).orElse(0f);
                Float receivedTransfer = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId, paymentId_transfer)).orElse(0f);

                JSONObject job = new JSONObject();
                job.put("tradeDate", tradeDate);
                job.put("receivedCash", receivedCash);
                job.put("receivedWechat", receivedWechat);
                job.put("receivedAlipay", receivedAlipay);
                job.put("receivedPos", receivedPos);
                job.put("receivedTransfer", receivedTransfer);
                array_paymentSums.add(job);

            }else {
                // 分级计算指定日期微信收退款合计，再计算实收金额
                // 此处应用时再优化
                Double rechargeWeChat = Optional.ofNullable(seWalletRechargeMapper.getRechargeSum(tradeDate)).orElse(0.0);
                Double refundWeChat = Optional.ofNullable(seRefundMapper.getRefundSum(tradeDate)).orElse(0.0);
                Double receiveWeChat = rechargeWeChat - refundWeChat;