fix:合伙人列表操作日志

cloudroam

2024-12-04 6c823dd44dbde79f008001a2a11e7bf9bc6bf8cc

 src/main/java/com/mzl/flower/service/payment/UserPaymentV3Service.java

@@ -11,7 +11,6 @@
import com.mzl.flower.dto.request.payment.UserPaymentDTO;
import com.mzl.flower.entity.flower.Flower;
import com.mzl.flower.entity.payment.*;
import com.mzl.flower.entity.system.UserWechat;
import com.mzl.flower.mapper.flower.FlowerMapper;
import com.mzl.flower.mapper.payment.*;
import com.mzl.flower.mapper.system.UserWechatMapper;
@@ -46,9 +45,7 @@
import java.io.InputStreamReader;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
@@ -181,7 +178,7 @@
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX");

        // 使用formatter格式化ZonedDateTime
        String formattedDateTime = zonedDateTime.plusMinutes(5).format(formatter);
        String formattedDateTime = zonedDateTime.plusMinutes(15).format(formatter);

        return formattedDateTime; // 格式化日期
    }
@@ -331,6 +328,18 @@
                    order.setPaymentAmount(order.getTotalAmount());
                }
                order.setPaymentTime(up.getPaymentTimeCallback());
                if(null!=order.getPaymentTime()){
                    LocalDateTime paymentTime = order.getPaymentTime();
                    LocalDate paymentDate = paymentTime.toLocalDate();
                    LocalDateTime today1700 = paymentTime.with(LocalTime.of(17, 0));
                    // 比较时间是否大于当天的 17:00
                    if (paymentTime.isAfter(today1700)) {
                        // 如果大于 17:00，设置为下一天的日期
                        paymentDate = paymentDate.plusDays(1);
                    }
                    order.setPaymentDateSta(paymentDate);
                }

                order.setStatus(Constants.ORDER_STATUS.SEND.name());
            } else if (Constants.ORDER_STATUS_BACKEND.CANCEL.name().equals(orderStatus)){
                order.setStatus(Constants.ORDER_STATUS.CANCEL.name());
@@ -703,8 +712,8 @@
        InitiateBatchTransferRequest request = new InitiateBatchTransferRequest();
        request.setAppid(dto.getAppId());
        request.setOutBatchNo(transfer.getId());//【商家批次单号】 商户系统内部的商家批次单号，要求此参数只能由数字、大小写字母组成，在商户系统内部唯一
        request.setBatchName(transfer.getName());//【批次名称】 该笔批量转账的名称
        request.setBatchRemark(transfer.getRemarks());//【批次备注】 转账说明，UTF8编码，最多允许32个字符
        request.setBatchName(subString(transfer.getName(), 32));//【批次名称】 该笔批量转账的名称
        request.setBatchRemark(subString(transfer.getRemarks(), 32));//【批次备注】 转账说明，UTF8编码，最多允许32个字符

        List<TransferDetailReqDTO> details = dto.getDetails();
        transfer.setTotalNum(details.size());
@@ -749,6 +758,19 @@
        return transfer.getId();
    }

    private String subString(String str, int len){
        if(StringUtils.isEmpty(str)){
            return str;
        }

        int length = str.length();
        if(length > len){
            return str.substring(0, len - 1);
        }

        return str;
    }

    public void checkTransferStatus(Transfer transfer) {//定时任务验证转账状态
        GetTransferBatchByOutNoRequest request = new GetTransferBatchByOutNoRequest();
        request.setOutBatchNo(transfer.getId());