add:物流发货针对散户更改微信发货方式，保存物流单号，未发送之前可更改

cloudroam

2025-01-08 72cf5cdaef3be1e81da7f59d6ed61fe368f44816

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

@@ -18,7 +18,6 @@
import com.mzl.flower.entity.supplier.Supplier;
import com.mzl.flower.entity.system.UserWechat;
import com.mzl.flower.entity.wallet.WalletBillRecordDO;
import com.mzl.flower.entity.wallet.WalletBillRecordDetail;
import com.mzl.flower.entity.wallet.WalletDO;
import com.mzl.flower.mapper.flower.FlowerSupplierSaleNumMapper;
import com.mzl.flower.mapper.payment.*;
@@ -29,6 +28,7 @@
import com.mzl.flower.mapper.wallet.WalletMapper;
import com.mzl.flower.service.BaseService;
import com.mzl.flower.service.wallet.WalletService;
import com.mzl.flower.utils.ExcelExportUtil;
import com.mzl.flower.utils.UUIDGenerator;
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RLock;
@@ -38,10 +38,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -676,11 +677,6 @@
            settlement.setUserId(s.getUserId());
            settlement.setStatus(Constants.SETTLEMENT_STATUS.PENDING.name());

            //2024-10-23
            //新增WalletBillRecordDO
            WalletBillRecordDO walletBillRecord =  new WalletBillRecordDO();
            walletBillRecord.setId(UUIDGenerator.getUUID());

            Integer flowerNum = 0;//商品数量
            BigDecimal totalAmount = new BigDecimal(0);//交易合计
            BigDecimal checkFee = new BigDecimal(0);//降级扣款
@@ -723,10 +719,10 @@

                //2024-10-23
                //copy信息到t_wallet_bill_record_detail
                WalletBillRecordDetail walletBillRecordDetail = new WalletBillRecordDetail();
                BeanUtils.copyProperties(detail, walletBillRecordDetail, "id");
                walletBillRecordDetail.setBillRecordId(walletBillRecord.getId());
                walletBillRecordDetailMapper.insert(walletBillRecordDetail);
//                WalletBillRecordDetail walletBillRecordDetail = new WalletBillRecordDetail();
//                BeanUtils.copyProperties(detail, walletBillRecordDetail, "id");
//                walletBillRecordDetail.setBillRecordId(walletBillRecord.getId());
//                walletBillRecordDetailMapper.insert(walletBillRecordDetail);

                flowerNum += oi.getNum();
                totalAmount = totalAmount.add(detail.getTotalAmount());
@@ -738,6 +734,51 @@
                serviceFee = serviceFee.add(ois.getServiceFee());
                serviceFeeRate = ois.getServiceFeeRate();
                settlementAmount = settlementAmount.add(ois.getIncomeSupplier());
                WalletDO walletDO = walletService.getOrCreateBySupplierId(supplierId);
                RLock lock = redissonClient.getLock(String.format(LockConstants.WALLET_ID_KEY, walletDO.getId()));
                try {
                    if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
                        try {
                            //2024-10-28 直接保存到walletBillRecord
                            //新增WalletBillRecordDO
                            if(ois.getIncomeSupplier().compareTo(BigDecimal.ZERO) > 0) {
                                WalletBillRecordDO walletBillRecord = new WalletBillRecordDO();
                                walletBillRecord.setId(UUIDGenerator.getUUID());
                                WalletDO walletDOInfo = walletService.getBySupplierId(supplierId);
                                //增加供应商结算金额保存到钱包
                                walletBillRecord.setSupplierId(supplierId);
                                walletBillRecord.setWalletId(walletDOInfo.getId());
                                walletBillRecord.setSettlementId(settlement.getId());
                                walletBillRecord.setOrderItemId(detail.getOrderItemId());
                                //变动金额等于供应商收入
                                walletBillRecord.setTotalAmount(ois.getIncomeSupplier());
                                walletBillRecord.setType(Constants.BILL_CHANGE_TYPE.settlement.name());
                                walletBillRecord.setMethod(Constants.BILL_CHANGE_METHOD.add.name());
                                walletBillRecord.setOriginalAmount(walletDOInfo.getTotalAmount());
                                walletBillRecord.setChangeAmount(ois.getIncomeSupplier());
                                walletBillRecord.setBalance(walletDOInfo.getWithdrawableAmount().add(ois.getIncomeSupplier()));
                                Order order = orderMapper.selectById(detail.getOrderId());
                                if (!ObjectUtils.isEmpty(order)) {
                                    walletBillRecord.setRemark("订单完成(订单号" + order.getOrderNo() + ")" + ",获得收入");
                                    walletBillRecord.setOrderNo(order.getOrderNo());
                                }
                                //更新钱包
                                //可提现金额=钱包余额=结算金额
                                walletDOInfo.setWithdrawableAmount(walletDOInfo.getWithdrawableAmount().add(ois.getIncomeSupplier()));
                                walletDOInfo.setTotalAmount(walletDOInfo.getWithdrawableAmount());
                                //已结算金额
                                walletDOInfo.setSettledAmount(walletDOInfo.getSettledAmount().add(ois.getIncomeSupplier()));
                                walletMapper.updateById(walletDOInfo);
                                walletBillRecord.create();
                                walletBillRecordMapper.insert(walletBillRecord);
                            }
                        } finally {
                            lock.unlock();
                        }
                    }
                } catch (InterruptedException e) {
                    throw new RuntimeException(e);
                }
            }

            settlement.setFlowerNum(flowerNum);
@@ -771,40 +812,6 @@
            //新逻辑不是立即转账。不走结算后转账逻辑。此时没有转账时间、openID、转账ID、转账明细ID，直接标记结算状态完成，存金额到钱包中
            settlement.setStatus(Constants.SETTLEMENT_STATUS.COMPLETED.name());
            settlementMapper.insert(settlement);

            WalletDO walletDO = walletService.getCurrentSupplier();
            if (null == walletDO) {
                throw new ValidationException("钱包不能为空");
            }
            RLock lock = redissonClient.getLock(String.format(LockConstants.WALLET_ID_KEY, walletDO.getId()));
            try {
                if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
                    try {
                        WalletDO walletDOInfo = walletService.getCurrentSupplier();
                        //增加供应商结算金额保存到钱包
                        walletBillRecord.setSupplierId(s.getId());
                        walletBillRecord.setWalletId(walletDOInfo.getId());
                        walletBillRecord.setSettlementId(settlement.getId());
                        walletBillRecord.setType(Constants.BILL_CHANGE_TYPE.settlement.name());
                        walletBillRecord.setMethod(Constants.BILL_CHANGE_METHOD.add.name());
                        walletBillRecord.setOriginalAmount(walletDOInfo.getTotalAmount());
                        walletBillRecord.setChangeAmount(settlementAmount);
                        walletBillRecord.setBalance(walletDOInfo.getWithdrawableAmount().add(settlementAmount));
                        //更新钱包
                        //可提现金额=钱包余额=结算金额
                        walletDOInfo.setWithdrawableAmount(walletDOInfo.getWithdrawableAmount().add(settlementAmount));
                        walletDOInfo.setTotalAmount(walletDOInfo.getWithdrawableAmount());
                        //已结算金额
                        walletDOInfo.setSettledAmount(walletDOInfo.getSettledAmount().add(settlementAmount));
                        walletMapper.updateById(walletDOInfo);
                        walletBillRecordMapper.insert(walletBillRecord);
                    } finally {
                        lock.unlock();
                    }
                }
            } catch (InterruptedException e) {
                throw new RuntimeException(e);
            }

        }

@@ -899,4 +906,48 @@
            orderMapper.updateById(o);
        }
    }

    public void exportSettlementList(HttpServletResponse response, OrderSettlementQueryDTO dto) {
        dto.setStartDate(parseLocalDateTime(dto.getStartDateStr(), true));
        dto.setEndDate(parseLocalDateTime(dto.getEndDateStr(), false));
        List<OrderSettlementListDTO> ls = settlementMapper.selectSettlementListInfo(null, dto);

        String[] rowsName = new String[]{"序号","结算人", "结算金额(元)", "订单数量", "买家数量", "商品数量", "结算合计(元)", "结算均价(元)", "降级扣款(元)",
                "缺货扣款(元)", "补货扣款(元)", "售后理赔(元)", "服务费(元)", "集货站运费(元)", "结算类型", "结算状态", "结算时间"};
        List<Object[]> dataList = new ArrayList<>();
        int sn = 1;
        for (OrderSettlementListDTO o : ls) {
            Object[] objs = new Object[rowsName.length];
            int a = 0;
            objs[a++] = sn;
            objs[a++] = o.getUserName();
            objs[a++] = o.getSettlementAmount();
            objs[a++] = o.getOrderNum();
            objs[a++] = o.getCustomerNum();
            objs[a++] = o.getFlowerNum();
            objs[a++] = o.getTotalAmount();
            objs[a++] = o.getPrice();
            objs[a++] = o.getCheckFee();
            objs[a++] = o.getLackFee();
            objs[a++] = o.getReplaceFee();
            objs[a++] = o.getSalesFee();
            objs[a++] = o.getServiceFee();
            objs[a++] = o.getStationFee();
            objs[a++] = o.getTypeStr();
            objs[a++] = o.getStatusStr();
            objs[a++] = o.getTransferTime();
            dataList.add(objs);

            sn++;
        }
        ExcelExportUtil excelExportUtil = new ExcelExportUtil("结算列表", rowsName, dataList, response);
        try {
            response.addHeader("filename", URLEncoder.encode("结算列表.xls", "UTF-8"));
            response.addHeader("Access-Control-Expose-Headers", "filename");
            excelExportUtil.export();
        } catch (Exception e) {
            log.error(e.getMessage(), e);
        }

    }
}