add:结算新逻辑

cloudroam

2024-10-23 843dd3a17de187191cf7c442062b3de678bdad65

add:结算新逻辑

 src/main/java/com/mzl/flower/dto/request/wallet/WalletWithdrawRecordDTO.java

@@ -8,7 +8,7 @@
    private Long id;

    @ApiModelProperty(value = "审核状态（待审核、已通过、已拒绝）")
    private Integer approveState;
    private String approveState;

    @ApiModelProperty(value = "不通过原因")
    private String rejectReason;

 src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java

@@ -1,6 +1,8 @@
package com.mzl.flower.entity.wallet;

import java.math.BigDecimal;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.mzl.flower.base.BaseAutoEntity;
import com.mzl.flower.base.BaseEntity;
@@ -17,8 +19,7 @@
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("t_wallet_bill_record")
public class WalletBillRecordDO extends BaseAutoEntity {

public class WalletBillRecordDO extends BaseEntity {

    @ApiModelProperty(value = "供应商Id")
    private Long supplierId;
@@ -31,6 +32,9 @@

    @ApiModelProperty(value = "类型明细")
    private String typeDetail;

    @ApiModelProperty(value = "结算单id")
    private String settlementId;

    @ApiModelProperty(value = "转账Id")
    private String transferId;
@@ -47,5 +51,10 @@
    @ApiModelProperty(value = "余额")
    private BigDecimal balance;

    @ApiModelProperty(value = "转账明细id")
    private String transferDetailId;

    @ApiModelProperty(value = "openId")
    private String openId;

}

 src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDetail.java

对比新文件
@@ -0,0 +1,49 @@
package com.mzl.flower.entity.wallet;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.mzl.flower.base.BaseEntity;
import lombok.Data;

import java.math.BigDecimal;

@Data
@TableName("t_wallet_bill_record_detail")
public class WalletBillRecordDetail extends BaseEntity {

    @TableField("bill_record_id")
    private String billRecordId;//结算单id

    @TableField("settlement_id")
    private String settlementId;//结算单id

    @TableField("order_id")
    private String orderId;//订单id

    @TableField("order_item_id")
    private String orderItemId;//订单商品id

    @TableField("price")
    private BigDecimal price;//结算单价

    @TableField("num")
    private Integer num;//数量

    @TableField("total_amount")
    private BigDecimal totalAmount;//结算合计

    @TableField("check_fee")
    private BigDecimal checkFee;//质检扣款

    @TableField("lack_fee")
    private BigDecimal lackFee;//缺货扣款

    @TableField("replace_fee")
    private BigDecimal replaceFee;//补货扣款

    @TableField("station_fee")
    private BigDecimal stationFee;//集货站运费

    @TableField("sales_fee")
    private BigDecimal salesFee;//售后理赔
}

 src/main/java/com/mzl/flower/mapper/wallet/WalletBillRecordDetailMapper.java

对比新文件
@@ -0,0 +1,11 @@
package com.mzl.flower.mapper.wallet;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mzl.flower.entity.wallet.WalletBillRecordDetail;
import org.springframework.stereotype.Repository;


@Repository
public interface WalletBillRecordDetailMapper extends BaseMapper<WalletBillRecordDetail> {

}

 src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java

@@ -1,28 +1,45 @@
package com.mzl.flower.service.impl.wallet;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mzl.flower.config.PyamentV3Configurer;
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.constant.Constants;
import com.mzl.flower.dto.request.payment.TransferDetailReqDTO;
import com.mzl.flower.dto.request.payment.TransferReqDTO;
import com.mzl.flower.dto.request.wallet.CreateWalletWithdrawRecordDTO;
import com.mzl.flower.dto.request.wallet.QueryWalletDTO;
import com.mzl.flower.dto.request.wallet.WalletWithdrawRecordDTO;
import com.mzl.flower.dto.response.supplier.SupplierDTO;
import com.mzl.flower.dto.response.wallet.WalletWithdrawRecordVO;
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.WalletDO;
import com.mzl.flower.entity.wallet.WalletWithdrawRecordDO;
import com.mzl.flower.mapper.supplier.SupplierMapper;
import com.mzl.flower.mapper.system.UserWechatMapper;
import com.mzl.flower.mapper.wallet.WalletBillRecordMapper;
import com.mzl.flower.mapper.wallet.WalletWithdrawRecordMapper;
import com.mzl.flower.service.payment.UserPaymentV3Service;
import com.mzl.flower.service.supplier.SupplierService;
import com.mzl.flower.service.wallet.WalletService;
import com.mzl.flower.service.wallet.WalletWithdrawRecordService;
import com.mzl.flower.utils.UUIDGenerator;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;

/**
@@ -33,6 +50,7 @@
 * @author @TaoJie
 * @since 2024-10-22
 */
@Slf4j
@Service
@Transactional
@RequiredArgsConstructor
@@ -40,6 +58,11 @@
    private final WalletWithdrawRecordMapper walletWithdrawRecordMapper;
    private final WalletService walletService;
    private final SupplierService supplierService;
    private final SupplierMapper supplierMapper;
    private final UserWechatMapper wechatMapper;
    private final UserPaymentV3Service paymentV3Service;

    private final WalletBillRecordMapper walletBillRecordMapper;

    @Transactional
    @Override
@@ -82,11 +105,76 @@
        if (StringUtils.isEmpty(walletWithdrawRecordDTO.getApproveState())) {
            throw new ValidationException("审批状态不能为空");
        }
        if (Constants.WALLET_APPROVE_STATE.REJECT.name().equals(walletWithdrawRecordDTO.getApproveState())) {
           if(StringUtils.isEmpty(walletWithdrawRecordDTO.getRejectReason())){
               throw new ValidationException("不通过理由不能为空");
           }
        }
        BeanUtils.copyProperties(walletWithdrawRecordDTO, withdrawRecordDO);
        withdrawRecordDO.update(SecurityUtils.getUserId());
        withdrawRecordDO.setApproveState(walletWithdrawRecordDTO.getApproveState());
        withdrawRecordDO.setApproveBy(SecurityUtils.getUserId());
        withdrawRecordDO.setApproveTime(LocalDateTime.now());
        walletWithdrawRecordMapper.updateById(withdrawRecordDO);
    }

        //审批通过之后写转账信息
        if(Constants.WALLET_APPROVE_STATE.APPROVE.name().equals(walletWithdrawRecordDTO.getApproveState())){
            Supplier s = supplierMapper.selectById(withdrawRecordDO.getSupplierId());
            String name = "";
            name = "供应商" + s.getName();
            UserWechat wechat = wechatMapper.selectOne(new QueryWrapper<UserWechat>().eq("user_id", s.getUserId()));
            if(wechat == null){
                String msg = name + "未绑定账号无法结算";
                log.error(msg);
                throw new ValidationException(msg);
            }
            LocalDateTime now = LocalDateTime.now();
            String day = format(now, "yyyy-MM-dd");
            String remarks = name + "钱包提现";
            String appId = PyamentV3Configurer.supplier_app_id;
            TransferReqDTO transferReqDTO = new TransferReqDTO();
            transferReqDTO.setId(UUIDGenerator.getUUID());
            transferReqDTO.setAppId(appId);
            transferReqDTO.setName(day + "日" + remarks);
            transferReqDTO.setRemarks(remarks);

            //保存账单信息
            WalletBillRecordDO  walletBillRecordDO = new WalletBillRecordDO();
            walletBillRecordDO.setSupplierId(s.getId());
            walletBillRecordDO.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
            walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.reduce.name());
            walletBillRecordDO.setTransferId(transferReqDTO.getAppId());
            //提现金额
            BigDecimal withdrawAmount  = withdrawRecordDO.getAmount();
            if(withdrawAmount.doubleValue() > 0) {//结算金额>0时才去转账
                TransferDetailReqDTO dr = new TransferDetailReqDTO();
                dr.setId(UUIDGenerator.getUUID());
                dr.setAmount(withdrawAmount.multiply(new BigDecimal(100)).longValue());
                dr.setOpenId(wechat.getOpenId());
                dr.setRemarks(remarks);
                if (withdrawAmount.doubleValue() >= 2000) {
                    dr.setUserName(wechat.getRealName());
                }

                List<TransferDetailReqDTO> details = new ArrayList<>();
                details.add(dr);
                walletBillRecordDO.setTransferDetailId(dr.getId());
                log.info("发起转账");
                transferReqDTO.setDetails(details);
                //发起转账
                paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
            }
            walletBillRecordMapper.insert(walletBillRecordDO);
            //不需要更新结算单了，此时提现的金额和计算单上的金额不一致

        }
    }
    public String format(LocalDateTime dateTime, String format) {
        if (dateTime == null || format == null) {
            return null;
        }
        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(format).withZone(ZoneId.of("Asia/Shanghai"));
        return dateTimeFormatter.format(dateTime);
    }
}


 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;
@@ -80,6 +88,15 @@
    @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));
@@ -121,6 +138,13 @@
        if(settlement == null){
            throw new ValidationException("结算单不存在");
        }
        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("结算中，不用重复结算");
@@ -128,7 +152,6 @@
        if(Constants.SETTLEMENT_STATUS.COMPLETED.name().equals(status)){
            throw new ValidationException("结算成功，不用重复结算");
        }
        String type = settlement.getType();

        String name = "";
        if(Constants.SETTLEMENT_TYPE.supplier.name().equals(type)){
@@ -642,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);//降级扣款
@@ -682,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());
@@ -719,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);

        }

        /* ******************************************************************** */

 src/main/resources/mapper/wallet/WalletBillRecordDetailMapper.xml

对比新文件
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mzl.flower.mapper.wallet.WalletBillRecordDetailMapper">

</mapper>

 src/main/resources/mapper/wallet/WalletBillRecordMapper.xml

@@ -19,6 +19,8 @@
        <result column="original_amount" property="originalAmount" />
        <result column="change_amount" property="changeAmount" />
        <result column="balance" property="balance" />
        <result column="transfer_detail_id" property="transferDetailId" />
        <result column="open_id" property="openId" />
    </resultMap>

</mapper>