add:结算新逻辑

cloudroam

2024-10-23 843dd3a17de187191cf7c442062b3de678bdad65

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

@@ -16,10 +16,16 @@
import com.mzl.flower.entity.supplier.Station;
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.*;
import com.mzl.flower.mapper.supplier.StationMapper;
import com.mzl.flower.mapper.system.UserWechatMapper;
import com.mzl.flower.mapper.wallet.WalletBillRecordDetailMapper;
import com.mzl.flower.mapper.wallet.WalletBillRecordMapper;
import com.mzl.flower.mapper.wallet.WalletMapper;
import com.mzl.flower.service.BaseService;
import com.mzl.flower.utils.UUIDGenerator;
import lombok.extern.slf4j.Slf4j;
@@ -27,6 +33,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -74,6 +82,21 @@
    @Autowired
    private OrderItemSettlementMapper orderItemSettlementMapper;

    @Autowired
    private TransferMapper transferMapper;

    @Autowired
    private TransferDetailMapper transferDetailMapper;

    @Autowired
    private WalletBillRecordMapper walletBillRecordMapper;

    @Autowired
    private WalletMapper walletMapper;

    @Autowired
    private WalletBillRecordDetailMapper walletBillRecordDetailMapper;

    public Page<OrderSettlementListDTO> selectSettlementList(Page page, OrderSettlementQueryDTO dto){
        dto.setStartDate(parseLocalDateTime(dto.getStartDateStr(), true));
        dto.setEndDate(parseLocalDateTime(dto.getEndDateStr(), false));
@@ -117,19 +140,34 @@
        }
        String type = settlement.getType();

        //2024-10-23
        //供应商新的结算逻辑不结算供应商的钱。
        if (Constants.SETTLEMENT_TYPE.supplier.name().equals(type)) {
            throw new ValidationException("供应商不需要手动结算");
        }
        String status = settlement.getStatus();
        if(Constants.SETTLEMENT_STATUS.PROCESSING.name().equals(status)){
            throw new ValidationException("结算中，不用重复结算");
        }
        if(Constants.SETTLEMENT_STATUS.COMPLETED.name().equals(status)){
            throw new ValidationException("结算成功，不用重复结算");
        }

        String name = "";
        if(Constants.SETTLEMENT_TYPE.supplier.name().equals(type)){
            Supplier s = supplierMapper.selectOne(new QueryWrapper<Supplier>()
                    .eq("user_id", settlement.getUserId()));
            name = "供应商" + s.getName();
        } else {
            Partner p = partnerMapper.selectOne(new QueryWrapper<Partner>()
                    .eq("user_id", settlement.getUserId()));
            name = "合伙人" + p.getName();
        }

        UserWechat wechat = wechatMapper.selectOne(new QueryWrapper<UserWechat>()
                .eq("user_id", settlement.getUserId()));
        if(wechat == null){
            String msg;
            if(Constants.SETTLEMENT_TYPE.supplier.name().equals(type)){
                Supplier s = supplierMapper.selectOne(new QueryWrapper<Supplier>()
                        .eq("user_id", settlement.getUserId()));
                msg = "供应商" + s.getName() + "未绑定账号无法结算";
            } else {
                Partner p = partnerMapper.selectOne(new QueryWrapper<Partner>()
                        .eq("user_id", settlement.getUserId()));
                msg = "合伙人" + p.getName() + "未绑定账号无法结算";
            }
            String msg = name + "未绑定账号无法结算";
            log.error(msg);
            throw new ValidationException(msg);
        }
@@ -138,8 +176,7 @@
        LocalDateTime now = LocalDateTime.now();
        String day = format(now, "yyyy-MM-dd");

        String remarks = Constants.SETTLEMENT_TYPE.supplier.name().equals(type)
                ? "供应商账单结算" : "合伙人账单结算";
        String remarks = name + "账单结算";

        String appId = Constants.SETTLEMENT_TYPE.supplier.name().equals(type)
                ? PyamentV3Configurer.supplier_app_id : PyamentV3Configurer.partner_app_id;
@@ -174,10 +211,37 @@
        }

        settlement.setTransferTime(LocalDateTime.now());
        settlement.setStatus(Constants.SETTLEMENT_STATUS.COMPLETED.name());
        settlement.setStatus(Constants.SETTLEMENT_STATUS.PROCESSING.name());
        settlement.update(SecurityUtils.getUserId());

        settlementMapper.updateById(settlement);
    }

    public void updateSettlementStatus(String transferId){
        Transfer t  = transferMapper.selectById(transferId);
        if("FINISHED".equals(t.getStatus())){
            OrderSettlement settlement = settlementMapper.selectOne(new QueryWrapper<OrderSettlement>()
                    .eq("transfer_id", transferId));
            if(settlement == null){
                return;
            }
            String transferDetailId = settlement.getTransferDetailId();
            TransferDetail td = transferDetailMapper.selectById(transferDetailId);
            if(td == null){
                log.warn("未找到对应明细");
                return;
            }
            String dStatus = td.getStatus();
            if("SUCCESS".equals(dStatus)){
                settlement.setStatus(Constants.SETTLEMENT_STATUS.COMPLETED.name());
                settlement.update("sys");
                settlementMapper.updateById(settlement);
            } else if ("FAIL".equals(dStatus)){
                settlement.setStatus(Constants.SETTLEMENT_STATUS.FAILED.name());
                settlement.update("sys");
                settlementMapper.updateById(settlement);
            }
        }
    }

    public void doSettlement(){//弃用
@@ -601,6 +665,11 @@
            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);//降级扣款
@@ -641,6 +710,13 @@
                detail.create();
                settlementDetailMapper.insert(detail);

                //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);

                flowerNum += oi.getNum();
                totalAmount = totalAmount.add(detail.getTotalAmount());
                checkFee = checkFee.add(detail.getCheckFee());
@@ -678,7 +754,40 @@
            settlement.setSettlementAmount(settlementAmount);
            settlement.create();

            //2024-10-23
            //计算到钱包后订单状态变成已结算
            //旧逻辑转账的时候才会标记状态为结算中
            //新逻辑不是立即转账。不走结算后转账逻辑。此时没有转账时间、openID、转账ID、转账明细ID，直接标记结算状态完成，存金额到钱包中
            settlement.setStatus(Constants.SETTLEMENT_STATUS.COMPLETED.name());

            settlementMapper.insert(settlement);

            //增加供应商结算金额保存到钱包
            walletBillRecord.setSupplierId(s.getId());
            walletBillRecord.setSettlementId(settlement.getId());
            walletBillRecord.setType(Constants.BILL_CHANGE_TYPE.settlement.name());
            walletBillRecord.setMethod(Constants.BILL_CHANGE_METHOD.add.name());
            WalletDO walletDOInfo = walletMapper.getTotalAmount(s.getUserId());
            if (ObjectUtils.isEmpty(walletDOInfo)) {
                // 新增钱包
                WalletDO walletDO = new WalletDO();
                walletDO.setUserId(s.getUserId());
                walletDO.setSupplierId(s.getId());
                walletDO.setTotalAmount(BigDecimal.ZERO);
                walletMapper.insert(walletDO);
                walletBillRecord.setOriginalAmount(BigDecimal.ZERO);
                walletBillRecord.setChangeAmount(settlementAmount);
                walletBillRecord.setBalance(settlementAmount);
            }else{
                walletBillRecord.setOriginalAmount(walletDOInfo.getTotalAmount());
                walletBillRecord.setChangeAmount(settlementAmount);
                walletBillRecord.setBalance(walletDOInfo.getTotalAmount().add(settlementAmount));
                //更新钱包
                walletDOInfo.setTotalAmount(walletBillRecord.getBalance());
                walletMapper.updateById(walletDOInfo);
            }
            walletBillRecordMapper.insert(walletBillRecord);

        }

        /* ******************************************************************** */
@@ -716,7 +825,7 @@

                detail.setOrderId(oi.getOrderId());
                detail.setOrderItemId(itemId);
                detail.setPrice(oi.getMarkupPartner());
                detail.setPrice(getAmount(oi.getMarkupPartner()));
                detail.setNum(oi.getNum());
                detail.setTotalAmount(detail.getPrice().multiply(new BigDecimal(detail.getNum())));
                detail.setCheckFee(new BigDecimal(0));