#pgsql 订单退款 结算退款 未消费结算

jiaosong

2023-10-11 65ad99e0a5e47c2cfcfd9ceade7dc6f2b83bcbd2

#pgsql 订单退款  结算退款 未消费结算

 server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java

@@ -11,6 +11,7 @@
import com.doumee.dao.business.model.WxBillDetail;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
import com.doumee.dao.business.web.request.GoodsorderBackDTO;
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.GoodsorderService;
@@ -21,6 +22,7 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;

@@ -113,4 +115,27 @@
    public ApiResponse<GoodsorderDetailDTO> findById(@PathVariable String id) {
        return ApiResponse.success(goodsorderService.getGoodsorderDetailDTO(id));
    }


    /**
     * å¼ºåˆ¶ç»“算订单
     * @param id
     * @return
     */
    @ApiOperation("根据ID查询")
    @PostMapping("/closerGoodsorder")
    @RequiresPermissions("business:goodsorder:query")
    public ApiResponse closerGoodsorder(@RequestParam String id){
        goodsorderService.closerGoodsorder(id);
        return ApiResponse.success(null);
    }


    @ApiOperation("根据ID查询")
    @PostMapping("/backGoodsorder")
    @RequiresPermissions("business:goodsorder:query")
    public ApiResponse backGoodsorder(@RequestBody GoodsorderBackDTO goodsorderBackDTO){
        goodsorderService.backGoodsorder(goodsorderBackDTO.getOrderId(),goodsorderBackDTO.getMoney());
        return ApiResponse.success(null);
    }
}

 server/platform/src/main/java/com/doumee/task/ScheduleTool.java

@@ -2,14 +2,19 @@


import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.WxBillService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;

/**
 * å®šæ—¶ä»»åŠ¡
@@ -25,9 +30,12 @@

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Autowired
    private WxBillService wxBillService;

    @Autowired
    private GoodsorderService goodsorderService;
    /**
     * @throws Exception
     */
@@ -44,8 +52,17 @@
     */
//    @Scheduled(fixedDelay = 1000*60)
    public void getYesterdayBill() throws Exception {
        Date ydate = DateUtil.addDaysToDate(new Date(), -1);
        wxBillService.getWxBill(ydate);

        Goodsorder goodsorder = new Goodsorder();
        goodsorder.setIsdeleted(Constants.ZERO);
        goodsorder.setStatus(Constants.goodsorderStatus.pay);
        List<Goodsorder> list = goodsorderService.findList(goodsorder);
        if (!CollectionUtils.isEmpty(list)){
            list.forEach(s->{
                goodsorderService.closerGoodsorder(s.getId());
            });

        }

    }
}

 server/services/src/main/java/com/doumee/core/mqtt/service/MqttPushCallback.java

@@ -20,7 +20,7 @@
        public void connectionLost(Throwable cause) {

            // è¿žæŽ¥ä¸¢å¤±åŽï¼Œä¸€èˆ¬åœ¨è¿™é‡Œé¢è¿›è¡Œé‡è¿ž
            System.out.println("连接断开，可以做重连");
//            System.out.println("连接断开，可以做重连");
        }

        @Override

 server/services/src/main/java/com/doumee/dao/business/web/request/GoodsorderBackDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.doumee.dao.business.web.request;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
/**
 * @author T14
 */
@Data
@ApiModel("退款请求")
public class GoodsorderBackDTO {


    @ApiModelProperty(value = "订单id")
    private String orderId;

    @ApiModelProperty(value = "退款金额")
    private BigDecimal money;
}

 server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java

@@ -4,6 +4,7 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -13,6 +14,7 @@
 * @author T14
 */
@Data
@ApiModel("骑行记录返回类")
public class MiniProgrammeDTO {

    @ApiModelProperty("主页主题")

 server/services/src/main/java/com/doumee/service/business/GoodsorderService.java

@@ -12,6 +12,7 @@
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
import com.doumee.dao.business.web.response.RidesDetailResponse;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -146,6 +147,13 @@


    /**
     * é€€æ¬¾
     * @param orderId
     */
    void backGoodsorder(String orderId, BigDecimal money);


    /**
     * éª‘行记录详情
     * @param id
     * @return

 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -34,6 +34,7 @@
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.MemberRidesService;
import com.doumee.service.business.PricingRuleService;
import com.doumee.service.business.RefundService;
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
@@ -100,6 +101,9 @@

    @Autowired
    PricingRuleService pricingRuleService;

    @Autowired
    RefundService refundService;

    @Override
    public String create(Goodsorder goodsorder) {
@@ -326,15 +330,16 @@
        return goodsorderDetailDTO;
    }

    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    @Override
    public void closerGoodsorder(String id) {
    public void closerGoodsorder(String orderId) {


        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Goodsorder goodsorder = goodsorderMapper.selectById(id);
        Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
        QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(MemberRides::getOrdreId,id);
                .eq(MemberRides::getOrdreId,orderId);
        List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper);
        if (!CollectionUtils.isEmpty(memberRides)){
            boolean exitUnBack = memberRides.stream().anyMatch(s -> !Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey().equals(s.getStatus()));
@@ -361,8 +366,10 @@

            Integer durationSum = memberRides.stream().filter(s -> s.getDuration() > 0).mapToInt(s -> s.getDuration()).sum();
            if (durationSum > pricingRule.getMemberRides().getBaseTime()){
                BigDecimal bigDecimal = new BigDecimal((durationSum - pricingRule.getMemberRides().getBaseTime()));
                BigDecimal basePrice = pricingRule.getMemberRides().getBasePrice();
                BigDecimal multiply = pricingRule.getMemberRides().getUnitPrice().multiply(new BigDecimal((durationSum - pricingRule.getMemberRides().getBaseTime())));
                BigDecimal multiply = pricingRule.getMemberRides().getUnitPrice()
                                                .multiply(bigDecimal.divide(pricingRule.getMemberRides().getUnitPrice(),BigDecimal.ROUND_UP));
                ridesDetailResponse.setAmount(basePrice.add(multiply));
            }else {
                ridesDetailResponse.setAmount(pricingRule.getMemberRides().getBasePrice());
@@ -371,26 +378,34 @@
            ridesDetailResponse.setDuration(durationSum);
            ridesDetailResponse.setMemberRidesResponseList(collect);

            if(goodsorder.getMoney().compareTo(ridesDetailResponse.getAmount())>Constants.ZERO){

            Refund refund = new Refund();
            refund.setCreateDate(new Date());
            refund.setCreator(principal.getId());
            refund.setEditDate(new Date());
            refund.setEditor(principal.getId());
            refund.setIsdeleted(Constants.ZERO);
            refund.setInfo("系统结算后订单自动完结");
//            refund.setCode();
            refund.setMemberId(goodsorder.getMemberId());
            refund.setMoney(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
//            refund.setStatus();
//            refund.setPreOrderid();
//            refund.setOnlineOrderid();
            refund.setPayWay(goodsorder.getPayWay());
            refund.setDoneDate(new Date());
            refund.setType(Constants.ONE);
            refund.setObjId(goodsorder.getId());
            refund.setReason("确定强制结算吗？结算后订单自动完结");
            refundMapper.insert(refund);
                RefundDTO refundDTO = new RefundDTO();
                refundDTO.setOrderId(orderId);
                refundDTO.setCanBalance(goodsorder.getMoney());
                refundDTO.setRefundAmount(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
                refundDTO.setTotalAmount(goodsorder.getMoney());
                refundDTO.setMemberId(goodsorder.getMemberId());
                refundDTO.setReason("平台强制结算退款");
                refundDTO.setType(Constants.REFUND_TYPE.PLAT_AUTO.getKey());
                Refund refund = wxMiniUtilService.wxRefund(refundDTO);

                //存储 æ¶ˆè´¹äº¤æ˜“流水
                Transactions transactions = new Transactions();
                transactions.setMemberId(goodsorder.getMemberId());
                transactions.setCreateDate(new Date());
                transactions.setIsdeleted(Constants.ZERO);
                transactions.setOrderId(orderId);
                transactions.setMoney(goodsorder.getMoney().compareTo(ridesDetailResponse.getAmount())<=Constants.ZERO?goodsorder.getMoney():ridesDetailResponse.getAmount());
                transactions.setType(Constants.transactionsType.consumption);
                transactions.setDoneDate(new Date());
                transactions.setTitle("消费结算");
                transactions.setContent("结算实际消费");
                transactions.setBalance(BigDecimal.ZERO);
                transactions.setObjId(orderId);
                transactions.setObjType(Constants.ONE);
                transactionsMapper.insert(transactions);

            Goodsorder update = new Goodsorder();
            update.setId(goodsorder.getId());
            update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
@@ -401,6 +416,76 @@
            update.setCloseUserId(principal.getId());
            update.setCloseType(Constants.ONE);
            goodsorderMapper.updateById(update);
            }
        }else {

            RefundDTO refundDTO = new RefundDTO();
            refundDTO.setOrderId(orderId);
            refundDTO.setCanBalance(goodsorder.getMoney());
            refundDTO.setRefundAmount(goodsorder.getMoney());
            refundDTO.setTotalAmount(goodsorder.getMoney());
            refundDTO.setMemberId(goodsorder.getMemberId());
            refundDTO.setReason("平台强制结算退款");
            refundDTO.setType(Constants.REFUND_TYPE.PLAT_FORCE.getKey());
            Refund refund = wxMiniUtilService.wxRefund(refundDTO);

            //存储 æ¶ˆè´¹äº¤æ˜“流水
            Transactions transactions = new Transactions();
            transactions.setMemberId(goodsorder.getMemberId());
            transactions.setCreateDate(new Date());
            transactions.setIsdeleted(Constants.ZERO);
            transactions.setOrderId(orderId);
            transactions.setMoney(goodsorder.getMoney());
            transactions.setType(Constants.transactionsType.consumption);
            transactions.setDoneDate(new Date());
            transactions.setTitle("消费结算");
            transactions.setContent("结算实际消费");
            transactions.setBalance(BigDecimal.ZERO);
            transactions.setObjId(orderId);
            transactions.setObjType(Constants.ONE);
            transactionsMapper.insert(transactions);

            Goodsorder update = new Goodsorder();
            update.setId(goodsorder.getId());
            update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
            update.setCloseMoney(goodsorder.getMoney());
            update.setCloseId(refund.getId());
            update.setCloseDate(refund.getDoneDate());
            update.setCloseInfo(refund.getInfo());
            update.setCloseUserId(principal.getId());
            update.setCloseType(Constants.ONE);
            goodsorderMapper.updateById(update);

        }


    }

    @Override
    public void backGoodsorder(String orderId, BigDecimal money) {

        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
        QueryWrapper<Refund> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(Refund::getObjId,orderId)
                .orderByDesc(Refund::getCreateDate)
                .last("limit 1");
        Refund lastRefund = refundMapper.selectOne(wrapper);
        if (Objects.isNull(lastRefund)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"改订单请结算后在退款");
        }
        BigDecimal canBalance = lastRefund.getCanBalance();
        if(canBalance.compareTo(money) > Constants.ZERO){
            RefundDTO refundDTO = new RefundDTO();
            refundDTO.setOrderId(orderId);
            refundDTO.setCanBalance(lastRefund.getCanBalance().subtract(lastRefund.getMoney()));
            refundDTO.setRefundAmount(money);
            refundDTO.setTotalAmount(goodsorder.getMoney());
            refundDTO.setMemberId(goodsorder.getMemberId());
            refundDTO.setReason("平台退款");
            refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey());
            Refund refund = wxMiniUtilService.wxRefund(refundDTO);
        }
    }

@@ -611,7 +696,6 @@
            Integer durationSum = memberRides.stream().filter(s -> s.getDuration() > 0).mapToInt(s -> s.getDuration()).sum();
            if (durationSum > pricingRule.getMemberRides().getBaseTime()){
                BigDecimal basePrice = pricingRule.getMemberRides().getBasePrice();
                //TODO å–证
                BigDecimal multiply = pricingRule.getMemberRides().getUnitPrice().multiply(new BigDecimal((durationSum - pricingRule.getMemberRides().getBaseTime())).divide(new BigDecimal(pricingRule.getMemberRides().getUnitTime())).setScale(0,BigDecimal.ROUND_CEILING));
                ridesDetailResponse.setAmount(basePrice.add(multiply));
            }else {

 server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -79,13 +79,13 @@
        insert.setEditor(principal.getId());
        insert.setIsdeleted(Constants.ZERO);
        insert.setName(member.getName());
        insert.setName(member.getNickname());
        insert.setStatus(Constants.ZERO);
        insert.setNickname(member.getNickname());
        insert.setStatus(member.getStatus());
        insert.setRegisterDate(new Date());
        insert.setCardNo(member.getCardNo());
        insert.setType(Constants.ONE);
        memberMapper.insert(member);
        return member.getId();
        memberMapper.insert(insert);
        return insert.getId();
    }

    @Override

 server/services/src/main/java/com/doumee/service/business/impl/RentSiteServiceImpl.java