update:退款暂存

fengliang
1 parent 39095a05
Showing 16 changed files with 725 additions and 43 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderController.java
etrade-order/src/main/java/com/diligrp/etrade/order/controller/OrderManagerController.java
etrade-order/src/main/java/com/diligrp/etrade/order/dao/OrderRefundMapper.java
etrade-order/src/main/java/com/diligrp/etrade/order/model/Order.java
etrade-order/src/main/java/com/diligrp/etrade/order/model/OrderRefund.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/OrderRefundService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/OrderService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderRefundServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/type/OrderRefundState.java
etrade-order/src/main/java/com/diligrp/etrade/order/util/OrderConstant.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderRefundMapper.xml
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/PayRpc.java
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/dto/WeChatPayRefundBackDto.java → etrade-rpc/src/main/java/com/diligrp/etrade/rpc/dto/WeChatRefundBackDto.java
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/resolver/WeChatPayRpcResolver.java
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/type/WeChatRefundState.java
@@ -806,28 +806,4 @@ public class OrderController {
             return Message.failure("服务暂时不在线，请稍后");
         }
     }
-
-
-    /**
-     * 发起退款
-     * @param refundDto
-     * @return
-     */
-    @RequestMapping(value = "/refund",method = {RequestMethod.POST},produces="application/json;charset=UTF-8")
-    public Message<OrderDto> refund(@RequestBody OrderRefundDto refundDto){
-        try{
-            RLock lock = redissonClient.getLock(OrderConstant.OrderLock + refundDto.getCode());
-            try {
-                lock.lock();
-                orderService.refundByOrderCode(refundDto);
-                return Message.success();
-            }finally {
-                lock.unlock();
-            }
-
-        }catch (PlatformServiceException pe) {
-            LOGGER.warn("服务异常{}:{}",pe.getCode(), pe.getMessage());
-            return Message.failure("服务暂时不在线，请稍后");
-        }
-    }
 }
 package com.diligrp.etrade.order.controller;
+import com.diligrp.etrade.core.authority.SessionContext;
+import com.diligrp.etrade.core.authority.UserTicket;
+import com.diligrp.etrade.core.domain.Message;
+import com.diligrp.etrade.core.exception.PlatformServiceException;
+import com.diligrp.etrade.order.domain.OrderRefundDto;
+import com.diligrp.etrade.order.service.OrderRefundService;
+import com.diligrp.etrade.order.util.OrderConstant;
+import jakarta.annotation.Resource;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/orderManager")
 public class OrderManagerController {
+    private static final Logger LOGGER = LoggerFactory.getLogger(OrderManagerController.class);
+
+    @Resource
+    private RedissonClient redissonClient;
+    @Resource
+    private OrderRefundService orderRefundService;
+    /**
+     * 发起退款
+     * @param refundDto
+     * @return
+     */
+    @RequestMapping(value = "/refund",method = {RequestMethod.POST},produces="application/json;charset=UTF-8")
+    public Message refund(@RequestBody OrderRefundDto refundDto){
+        UserTicket userTicket = SessionContext.getUserTicket();
+        try{
+            RLock lock = redissonClient.getLock(OrderConstant.OrderLock + refundDto.getCode());
+            try {
+                lock.lock();
+                return orderRefundService.addRefund(refundDto,userTicket);
+            }finally {
+                lock.unlock();
+            }
+
+        }catch (PlatformServiceException pe) {
+            LOGGER.warn("服务异常{}:{}",pe.getCode(), pe.getMessage());
+            return Message.failure("服务暂时不在线，请稍后");
+        }
+    }
+
+    @RequestMapping(value = "/refundCheck",method = {RequestMethod.POST},produces="application/json;charset=UTF-8")
+    public Message refundCheck(@RequestBody OrderRefundDto refundDto){
+        try{
+            return orderRefundService.refundCheck();
+        }catch (PlatformServiceException pe) {
+            LOGGER.warn("服务异常{}:{}",pe.getCode(), pe.getMessage());
+            return Message.failure("服务暂时不在线，请稍后");
+        }
+    }
+
+    @RequestMapping(value = "/refundCallBack",method = {RequestMethod.POST},produces="application/json;charset=UTF-8")
+    public Message refundCallBack(@RequestBody OrderRefundDto refundDto){
+        try{
+            return orderRefundService.refundCheck();
+        }catch (PlatformServiceException pe) {
+            LOGGER.warn("服务异常{}:{}",pe.getCode(), pe.getMessage());
+            return Message.failure("服务暂时不在线，请稍后");
+        }
+    }
 }
+package com.diligrp.etrade.order.dao;
+
+import com.diligrp.etrade.core.mybatis.MybatisMapperSupport;
+import com.diligrp.etrade.order.model.OrderRefund;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Map;
+
+@Repository("orderRefundMapper")
+public interface OrderRefundMapper extends MybatisMapperSupport {
+    Map<String, Long> getRefundInfoBefore(@Param("orderId") Long orderId);
+
+    Long insert(OrderRefund orderRefund);
+
+    Integer update(OrderRefund orderRefund);
+}
@@ -284,6 +284,12 @@ public class Order {
     /** 扣减库存状态（1未扣减，2已扣减） */
     private Integer stockDeductionState;
+    /**
+     * 退款总计
+     * @return
+     */
+    private Long totalRefundAmount;
+
     public Integer getAchieveType() {
         return achieveType;
     }
@@ -755,4 +761,12 @@ public class Order {
     public void setStockDeductionState(Integer stockDeductionState) {
         this.stockDeductionState = stockDeductionState;
     }
+
+    public Long getTotalRefundAmount() {
+        return totalRefundAmount;
+    }
+
+    public void setTotalRefundAmount(Long totalRefundAmount) {
+        this.totalRefundAmount = totalRefundAmount;
+    }
 }
 \ No newline at end of file
+package com.diligrp.etrade.order.model;
+
+import java.time.LocalDateTime;
+
+/**
+ * 交易订单结算单
+ * @author fengliang
+ * @since 2023.08.25
+ */
+public class OrderRefund {
+    private Long id;
+
+    /**
+     * 实际退款单号
+     */
+    private String refundId;
+
+    /**
+     * 市场主键
+     */
+    private Long marketId;
+
+    /**
+     * 订单主键
+     */
+    private Long orderId;
+
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 退款金额
+     */
+    private Long refundAmount;
+
+    /**
+     * 退款说明
+     */
+    private String refundMessage;
+
+    /**
+     * 退款单状态
+     */
+    private Integer state;
+
+    /**
+     * paymentId微信交易单号
+     */
+    private String tradeId;
+
+    /**
+     * 退款失败原因
+     */
+    private String notic;
+
+    /**
+     * 交费单主键
+     */
+    private Long orderPaymentId;
+
+    /**
+     * 版本号
+     */
+    private Integer version;
+
+    /** 退款单创建时间 */
+    private LocalDateTime createdTime;
+
+    /** 退款单更新时间 */
+    private LocalDateTime modifiedTime;
+
+    /**
+     * 退款时间
+     */
+    private LocalDateTime refundTime;
+
+    private Long createId;
+
+    private String createName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRefundId() {
+        return refundId;
+    }
+
+    public void setRefundId(String refundId) {
+        this.refundId = refundId;
+    }
+
+    public Long getMarketId() {
+        return marketId;
+    }
+
+    public void setMarketId(Long marketId) {
+        this.marketId = marketId;
+    }
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+
+    public Long getRefundAmount() {
+        return refundAmount;
+    }
+
+    public void setRefundAmount(Long refundAmount) {
+        this.refundAmount = refundAmount;
+    }
+
+    public String getRefundMessage() {
+        return refundMessage;
+    }
+
+    public void setRefundMessage(String refundMessage) {
+        this.refundMessage = refundMessage;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public void setTradeId(String tradeId) {
+        this.tradeId = tradeId;
+    }
+
+    public String getNotic() {
+        return notic;
+    }
+
+    public void setNotic(String notic) {
+        this.notic = notic;
+    }
+
+    public Long getOrderPaymentId() {
+        return orderPaymentId;
+    }
+
+    public void setOrderPaymentId(Long orderPaymentId) {
+        this.orderPaymentId = orderPaymentId;
+    }
+
+    public LocalDateTime getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(LocalDateTime createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public LocalDateTime getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(LocalDateTime modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public LocalDateTime getRefundTime() {
+        return refundTime;
+    }
+
+    public void setRefundTime(LocalDateTime refundTime) {
+        this.refundTime = refundTime;
+    }
+
+    public Long getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+}
 \ No newline at end of file
+package com.diligrp.etrade.order.service;
+
+import com.diligrp.etrade.core.authority.UserTicket;
+import com.diligrp.etrade.core.domain.Message;
+import com.diligrp.etrade.order.domain.OrderRefundDto;
+import com.diligrp.etrade.order.model.OrderPayment;
+import com.diligrp.etrade.order.model.OrderRefund;
+
+/** 订单接口 */
+public interface OrderRefundService {
+
+    /**
+     * 退款申请
+     * @param refundDto
+     * @param userTicket
+     * @return
+     */
+    Message addRefund(OrderRefundDto refundDto, UserTicket userTicket);
+
+    /**
+     * 根据退款单发起退款
+     * @param orderRefund
+     */
+    OrderRefund bulidRefundOrderAndRefund(OrderRefund orderRefund);
+
+    /**
+     * 退款查询
+     * @return
+     */
+    Message refundCheck();
+}
 package com.diligrp.etrade.order.service;
 import com.diligrp.etrade.admin.domain.StoreCustomerResponseDto;
+import com.diligrp.etrade.core.authority.UserTicket;
 import com.diligrp.etrade.core.domain.Message;
 import com.diligrp.etrade.order.domain.*;
 import com.diligrp.etrade.order.model.Order;
@@ -8,6 +9,7 @@ import com.diligrp.etrade.order.type.OrderOrderState;
 import com.diligrp.etrade.rpc.dto.WeChatPayFunctionDto;
 import com.diligrp.etrade.rpc.dto.WeChatPayTradeCallBackDto;
 import com.diligrp.etrade.shared.domain.OrderQrCode;
+import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -22,6 +24,12 @@ public interface OrderService {
     Order createOrder(OrderCreateDto orderBuyerDto, Integer orderType,Boolean transportFeeFlag);
     /**
+     * 更新订单
+     * @param order
+     */
+    void updateByOnly(Order order);
+
+    /**
      * 创建或更新订单
      * @param orderBuyerDto
      * @param orderType 身份类型
@@ -258,6 +266,4 @@ public interface OrderService {
     OrderDto checkOrderState(String code);
     TransportFeeDto getTransportFee(OrderTransportFeeQuery order);
-
-    void refundByOrderCode(OrderRefundDto refundDto);
 }
+package com.diligrp.etrade.order.service.impl;
+
+import com.diligrp.etrade.core.authority.UserTicket;
+import com.diligrp.etrade.core.domain.Message;
+import com.diligrp.etrade.order.dao.OrderRefundMapper;
+import com.diligrp.etrade.order.domain.OrderGetDto;
+import com.diligrp.etrade.order.domain.OrderRefundDto;
+import com.diligrp.etrade.order.exception.OrderErrorCode;
+import com.diligrp.etrade.order.model.Order;
+import com.diligrp.etrade.order.model.OrderPayment;
+import com.diligrp.etrade.order.model.OrderRefund;
+import com.diligrp.etrade.order.service.OrderPaymentService;
+import com.diligrp.etrade.order.service.OrderRefundService;
+import com.diligrp.etrade.order.service.OrderService;
+import com.diligrp.etrade.order.type.OrderPaymentState;
+import com.diligrp.etrade.order.type.OrderRefundState;
+import com.diligrp.etrade.order.util.NumberTransform;
+import com.diligrp.etrade.order.util.OrderConstant;
+import com.diligrp.etrade.rpc.dto.WeChatRefundBackDto;
+import com.diligrp.etrade.rpc.dto.WeChatPayRefundDto;
+import com.diligrp.etrade.rpc.resolver.WeChatPayRpcResolver;
+import com.diligrp.etrade.rpc.type.WeChatRefundState;
+import jakarta.annotation.Resource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.util.Map;
+
+
+/**
+ * 订单主单服务实现
+ */
+@Service
+public class OrderRefundServiceImpl implements OrderRefundService {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OrderRefundServiceImpl.class);
+
+    @Resource
+    private OrderRefundMapper orderRefundMapper;
+
+    @Resource
+    private OrderService orderService;
+
+    @Resource
+    private OrderPaymentService orderPaymentService;
+
+    @Resource
+    private WeChatPayRpcResolver weChatPayRpcResolver;
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Message addRefund(OrderRefundDto refundDto, UserTicket userTicket) {
+        //基础参数效验
+        LOGGER.info("退款单入参{}，操作员{}",refundDto,userTicket);
+        Order order = orderService.getOneOrder(new OrderGetDto(null, refundDto.getCode(), refundDto.getMarketId()));
+        if(order == null){
+            return Message.failure(OrderErrorCode.PARAM_ERROR,"订单不存在");
+        }
+        OrderPayment orderPayment = orderPaymentService.getOrderPaymentById(order.getId(), order.getMarketId(), OrderPaymentState.FINISH_PAY.getCode());
+        if(orderPayment == null){
+            return Message.failure(OrderErrorCode.PARAM_ERROR,"订单未支付");
+        }
+        //是否可退款效验
+        Map<String,Long> oldMap = orderRefundMapper.getRefundInfoBefore(order.getId());
+        Long refundAmount = refundDto.getRefundAmount().setScale(2, RoundingMode.HALF_UP).multiply(NumberTransform.ONE_HUNDERD).longValue();
+        if(oldMap!=null){
+            if(oldMap.get("doing")!=null&&!oldMap.get("doing").equals(0L)){
+                return Message.failure(OrderErrorCode.PARAM_ERROR,"有处理中的退款单据，请确定状态后，再操作");
+            }
+            Long AllRefundAmount = orderPayment.getPayAmount()-orderPayment.getPayDiscount();
+            if(oldMap.get("success")!=null&&oldMap.get("success")> AllRefundAmount - refundAmount){
+                return Message.failure(OrderErrorCode.PARAM_ERROR,"退款金额不能大于可退金额");
+            }
+        }
+        OrderRefund orderRefund = bulidOrderReFund(refundDto,order,orderPayment,userTicket);
+        orderRefundMapper.insert(orderRefund);
+
+        //发起退款
+        orderRefund = bulidRefundOrderAndRefund(orderRefund);
+        orderRefundMapper.update(orderRefund);
+        //根据退款结果更新退款单内容
+        if(orderRefund.getState().equals(OrderRefundState.SUCCESS.getCode())){
+            order.setTotalRefundAmount(order.getTotalRefundAmount()+refundAmount);
+            orderService.updateByOnly(order);
+            return Message.success();
+        }else{
+            return Message.failure(OrderErrorCode.PARAM_ERROR,"已成功发起退款，退款结果暂未获得");
+        }
+
+    }
+
+    /**
+     * 发起退款
+     * @param orderRefund
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public OrderRefund bulidRefundOrderAndRefund(OrderRefund orderRefund) {
+        WeChatPayRefundDto weChatPayRefundDto = bulidWeChatPayRefundDto(orderRefund);
+        Message<WeChatRefundBackDto> refundInfo = weChatPayRpcResolver.refund(weChatPayRefundDto);
+        if(refundInfo!=null&&refundInfo.getData()!=null){
+            orderRefund.setRefundId(refundInfo.getData().getRefundId());
+            if(refundInfo.getData().getState().equals(WeChatRefundState.REFUND_SUCCESS.getCode())){
+                orderRefund.setRefundTime(refundInfo.getData().getWhen()==null?LocalDateTime.now():refundInfo.getData().getWhen());
+                orderRefund.setState(OrderRefundState.SUCCESS.getCode());
+            } else if (refundInfo.getData().getState().equals(WeChatRefundState.REFUND_FAIL.getCode())) {
+                orderRefund.setState(OrderRefundState.FAIL.getCode());
+            }
+        }
+        return orderRefund;
+    }
+
+    @Override
+    public Message refundCheck() {
+        return null;
+    }
+
+    private WeChatPayRefundDto bulidWeChatPayRefundDto(OrderRefund orderRefund) {
+        WeChatPayRefundDto weChatPayRefundDto = new WeChatPayRefundDto();
+        weChatPayRefundDto.setPaymentId(orderRefund.getTradeId());
+        weChatPayRefundDto.setMarketId(orderRefund.getMarketId());
+        weChatPayRefundDto.setAmount(orderRefund.getRefundAmount());
+        weChatPayRefundDto.setDescription(orderRefund.getRefundMessage());
+        weChatPayRefundDto.setNotifyUrl(OrderConstant.WECHAT_REFUND_BACK_API);
+        return weChatPayRefundDto;
+    }
+
+    /**
+     * 构建退款单
+     * @param refundDto
+     * @param order
+     * @param orderPayment
+     * @param userTicket
+     * @return
+     */
+    private OrderRefund bulidOrderReFund(OrderRefundDto refundDto, Order order, OrderPayment orderPayment,UserTicket userTicket) {
+        OrderRefund orderRefund = new OrderRefund();
+        orderRefund.setOrderCode(order.getCode());
+        orderRefund.setOrderId(order.getId());
+        orderRefund.setMarketId(order.getMarketId());
+        orderRefund.setRefundAmount(refundDto.getRefundAmount().setScale(2, RoundingMode.HALF_UP).multiply(NumberTransform.ONE_HUNDERD).longValue());
+        orderRefund.setRefundMessage(refundDto.getRefundMessage());
+        orderRefund.setState(OrderRefundState.DOING.getCode());
+        orderRefund.setTradeId(orderPayment.getTradeId());
+        orderRefund.setVersion(NumberTransform.DEFAULT_VERSION);
+        orderRefund.setOrderPaymentId(orderPayment.getId());
+        orderRefund.setCreateId(userTicket.getId());
+        orderRefund.setCreateName(userTicket.getRealName());
+        return orderRefund;
+    }
+}
@@ -25,28 +25,22 @@ import com.diligrp.etrade.order.util.NumberTransform;
 import com.diligrp.etrade.rpc.CustomerRpc;
 import com.diligrp.etrade.rpc.UapRpc;
 import com.diligrp.etrade.rpc.UidRpc;
-import com.diligrp.etrade.rpc.basicdata.BasicDataConfigRpc;
 import com.diligrp.etrade.rpc.dto.*;
-import com.diligrp.etrade.rpc.dto.request.ConfigQueryDto;
 import com.diligrp.etrade.rpc.dto.response.*;
 import com.diligrp.etrade.rpc.resolver.PayRpcResolver;
 import com.diligrp.etrade.rpc.dto.response.BalanceResponseDto;
 import com.diligrp.etrade.rpc.dto.response.Customer;
 import com.diligrp.etrade.rpc.dto.response.CustomerMarket;
 import com.diligrp.etrade.rpc.dto.response.DataDictionaryValueDTO;
-import com.diligrp.etrade.rpc.resolver.WeChatPayRpcResolver;
 import com.diligrp.etrade.rpc.type.CustomerState;
 import com.diligrp.etrade.rpc.type.WeChatPayState;
-import com.diligrp.etrade.rpc.type.WeChatPayType;
 import com.diligrp.etrade.rpc.util.Constants;
 import com.diligrp.etrade.shared.SharedConfiguration;
 import com.diligrp.etrade.shared.domain.OrderQrCode;
-import com.diligrp.etrade.shop.domain.request.ShopCo;
 import com.diligrp.etrade.shop.domain.request.ShopExpressQueryCo;
 import com.diligrp.etrade.shop.domain.response.ShopExpressVo;
 import com.diligrp.etrade.shop.domain.response.ShopVo;
 import com.diligrp.etrade.shop.service.ShopExpressSettingService;
-import com.diligrp.etrade.shop.service.ShopService;
 import com.diligrp.etrade.shop.type.ExpressCondition;
 import com.diligrp.etrade.shop.type.ExpressType;
 import jakarta.annotation.Resource;
@@ -390,7 +384,9 @@ public class OrderServiceImpl implements OrderService {
         updateByOnly(order);
     }
-    private void updateByOnly(Order order) {
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateByOnly(Order order) {
         Long l = orderMapper.updateByIdSelective(order);
         if(l<=0){
             throw new OrderException(OrderErrorCode.ORDER_SYSTEM_ERROR,"数据已在其他地方处理，请刷新后重试");
+package com.diligrp.etrade.order.type;
+
+import com.diligrp.etrade.core.type.IEnumType;
+
+public enum OrderRefundState implements IEnumType {
+    FAIL("失败", 1),
+    DOING("处理中", 2),
+    SUCCESS("成功", 3);
+
+    private String name;
+    private Integer code;
+
+    private OrderRefundState(String name, Integer code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static OrderRefundState getByCode(Integer code) {
+        for (OrderRefundState temp : OrderRefundState.values()) {
+            if (temp.getCodeInteger().equals(code)) {
+                return temp;
+            }
+        }
+        return null;
+    }
+
+    public static String getNameByCode(Integer code) {
+        for (OrderRefundState temp : OrderRefundState.values()) {
+            if (temp.getCodeInteger().equals(code)) {
+                return temp.getName();
+            }
+        }
+        return null;
+    }
+
+    public Integer getCodeInteger() {
+        return this.code;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public int getCode() {
+        return this.code;
+    }
+
+    public String toString() {
+        return this.name;
+    }
+}
 \ No newline at end of file
@@ -123,4 +123,9 @@ public class OrderConstant {
      */
     public static final String WECHATPAY_BACK_API= "api/order/wxChatPayCallBack";
+    /**
+     * 微信退款回调地址
+     */
+    public static final String WECHAT_REFUND_BACK_API= "api/orderManager/refundCallBack";
+
 }
+<?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.diligrp.etrade.order.dao.OrderRefundMapper">
+    <resultMap id="BaseResultMap" type="com.diligrp.etrade.order.model.OrderRefund">
+        <id column="id" jdbcType="BIGINT" property="id" />
+        <result column="refund_id" jdbcType="VARCHAR" property="refundId" />
+        <result column="order_id" jdbcType="BIGINT" property="orderId" />
+        <result column="order_code" jdbcType="VARCHAR" property="orderCode" />
+        <result column="market_id" jdbcType="BIGINT" property="marketId" />
+        <result column="refund_amount" jdbcType="BIGINT" property="refundAmount" />
+        <result column="refund_message" jdbcType="VARCHAR" property="refundMessage" />
+        <result column="state" jdbcType="INTEGER" property="state" />
+        <result column="notic" jdbcType="VARCHAR" property="notic" />
+        <result column="trade_id" jdbcType="VARCHAR" property="tradeId" />
+        <result column="order_payment_id" jdbcType="BIGINT" property="orderPaymentId" />
+        <result column="created_time" jdbcType="TIMESTAMP" property="createdTime" />
+        <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
+        <result column="version" jdbcType="INTEGER" property="version" />
+        <result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" />
+        <result column="create_id" jdbcType="BIGINT" property="createId" />
+        <result column="create_name" jdbcType="VARCHAR" property="createName" />
+    </resultMap>
+    <sql id="baseSql" >
+        id,refund_id,order_id,order_code,market_id,
+            refund_amount,refund_message,state,notic,trade_id,
+            order_payment_id,created_time,modified_time,version,
+            refund_time,create_id,create_name
+    </sql>
+    <insert id="insert" parameterType="com.diligrp.etrade.order.model.OrderRefund" useGeneratedKeys="true" keyProperty="id" >
+        insert into order_refund (refund_id,order_id,order_code,market_id,
+            refund_amount,refund_message,state,notic,trade_id,
+            order_payment_id,created_time,version,refund_time,create_id,create_name)
+        values (#{refundId,jdbcType=VARCHAR},#{orderId,jdbcType=BIGINT},#{orderCode,jdbcType=VARCHAR},#{marketId,jdbcType=BIGINT},
+            #{refundAmount,jdbcType=BIGINT},#{refundMessage,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{notic,jdbcType=VARCHAR},#{tradeId,jdbcType=VARCHAR},
+            #{orderPaymentId,jdbcType=BIGINT},#{createdTime},#{version},#{refundTime},#{createId},#{createName})
+    </insert>
+    <update id="update" parameterType="com.diligrp.etrade.order.model.OrderRefund">
+        update order_refund
+        <set>
+            <if test="refundId != null" >
+                refund_id = #{refundId,jdbcType=VARCHAR},
+            </if>
+            <if test="orderId != null" >
+                order_id = #{orderId,jdbcType=BIGINT},
+            </if>
+            <if test="orderCode != null" >
+                order_code = #{orderCode,jdbcType=VARCHAR},
+            </if>
+            <if test="marketId != null" >
+                market_id = #{marketId,jdbcType=BIGINT},
+            </if>
+            <if test="refundAmount != null" >
+                refund_amount = #{refundAmount,jdbcType=BIGINT},
+            </if>
+            <if test="refundMessage != null" >
+                refund_message = #{refundMessage,jdbcType=VARCHAR},
+            </if>
+            <if test="state != null" >
+                state = #{state,jdbcType=INTEGER},
+            </if>
+            <if test="notic != null" >
+                notic = #{notic,jdbcType=VARCHAR},
+            </if>
+            <if test="tradeId != null" >
+                trade_id = #{tradeId,jdbcType=VARCHAR},
+            </if>
+            <if test="orderPaymentId != null" >
+                order_payment_id = #{orderPaymentId,jdbcType=BIGINT},
+            </if>
+            <if test="refundTime != null" >
+                refund_time = #{refundTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="createId != null" >
+                create_id = #{createId,jdbcType=BIGINT},
+            </if>
+            <if test="createName != null" >
+                create_name = #{createName,jdbcType=VARCHAR},
+            </if>
+            version = version + 1
+        </set>
+            where id = #{id}
+    </update>
+    <select id="getRefundInfoBefore" resultType="java.util.Map" parameterType="java.lang.Long">
+        select SUM(case when state = 2 then refund_amount else 0 end) as 'doing',
+               SUM(case when state = 3 then refund_amount else 0 end) as 'success' FROM order_refund
+        WHERE order_id = #{orderId}
+    </select>
+</mapper>
 \ No newline at end of file
@@ -147,14 +147,14 @@ public interface PayRpc {
      * @return
      */
     @RequestMapping(value = "/wechat/api/gateway.do?service=hzbank.payment.service:refund", method = RequestMethod.POST)
-    Message<WeChatPayRefundBackDto> refundHg(@RequestBody WeChatPayRefundDto requestDto, @RequestHeader HttpHeaders headers);
+    Message<WeChatRefundBackDto> refundHg(@RequestBody WeChatPayRefundDto requestDto, @RequestHeader HttpHeaders headers);
     /**
-     * 杭州银行微信退款
+     * 杭州银行微信退款查询
      * @param requestDto
      * @param headers
      * @return
      */
     @RequestMapping(value = "/wechat/api/gateway.do?service=hzbank.payment.service:refundState", method = RequestMethod.POST)
-    Message<WeChatPayRefundBackDto> refundCheckHg(@RequestBody WeChatPayRefundCheckDto requestDto, @RequestHeader HttpHeaders headers);
+    Message<WeChatRefundBackDto> refundCheckHg(@RequestBody WeChatPayRefundCheckDto requestDto, @RequestHeader HttpHeaders headers);
 }
 package com.diligrp.etrade.rpc.dto;
+import java.time.LocalDateTime;
+
 /**
  * 微信预支付返回
  * @author fengliang
  * @Date 2024-3-25
  */
-public class WeChatPayRefundBackDto {
+public class WeChatRefundBackDto {
     /**
      * 退款单号
@@ -22,6 +24,11 @@ public class WeChatPayRefundBackDto {
      */
     private String message;
+    /**
+     * 退款时间
+     */
+    private LocalDateTime when;
+
     public String getRefundId() {
         return refundId;
     }
@@ -45,4 +52,12 @@ public class WeChatPayRefundBackDto {
     public void setMessage(String message) {
         this.message = message;
     }
+
+    public LocalDateTime getWhen() {
+        return when;
+    }
+
+    public void setWhen(LocalDateTime when) {
+        this.when = when;
+    }
 }
@@ -15,8 +15,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
-import java.time.LocalDateTime;
-
 @Component
 @RefreshScope
 public class WeChatPayRpcResolver {
@@ -107,10 +105,11 @@ public class WeChatPayRpcResolver {
      * @param weChatPayRefundDto
      * @return
      */
-    public Message<WeChatPayRefundBackDto>  refund(WeChatPayRefundDto weChatPayRefundDto){
+    public Message<WeChatRefundBackDto>  refund(WeChatPayRefundDto weChatPayRefundDto){
+        weChatPayRefundDto.setNotifyUrl(backBaseUrl+weChatPayRefundDto.getNotifyUrl());
         //组装headers
         HttpHeaders prepareHeaders = creatHeader(weChatPayRefundDto.getMarketId().toString(), REFUND_STATE_INFO);
-        Message<WeChatPayRefundBackDto> refundJsonObject = payRpc.refundHg(weChatPayRefundDto, prepareHeaders);
+        Message<WeChatRefundBackDto> refundJsonObject = payRpc.refundHg(weChatPayRefundDto, prepareHeaders);
         if(!refundJsonObject.getCode().equals(200)){
             log.info("退款参数{},请求体头部为{},请求结果为{}",weChatPayRefundDto,prepareHeaders,refundJsonObject);
             throw new PlatformServiceException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "退款失败：" + refundJsonObject.getMessage());
@@ -124,10 +123,10 @@ public class WeChatPayRpcResolver {
      * @param weChatPayRefundCheckDto
      * @return
      */
-    public Message<WeChatPayRefundBackDto>  refundCheck(WeChatPayRefundCheckDto weChatPayRefundCheckDto){
+    public Message<WeChatRefundBackDto>  refundCheck(WeChatPayRefundCheckDto weChatPayRefundCheckDto){
         //组装headers
         HttpHeaders prepareHeaders = creatHeader(weChatPayRefundCheckDto.getMarketId().toString(), REFUND_CHECK_INFO);
-        Message<WeChatPayRefundBackDto> refundJsonObject = payRpc.refundCheckHg(weChatPayRefundCheckDto, prepareHeaders);
+        Message<WeChatRefundBackDto> refundJsonObject = payRpc.refundCheckHg(weChatPayRefundCheckDto, prepareHeaders);
         if(!refundJsonObject.getCode().equals(200)){
             log.info("退款查询参数{},请求体头部为{},请求结果为{}",weChatPayRefundCheckDto,prepareHeaders,refundJsonObject);
             throw new PlatformServiceException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "退款失败：" + refundJsonObject.getMessage());
+package com.diligrp.etrade.rpc.type;
+
+
+/**
+ * 微信支付类型
+ */
+public enum WeChatRefundState {
+    REFUND_SUCCESS(4, "支付成功"),
+
+    REFUND_FAIL(5, "支付失败");
+
+    private Integer code;
+    private String value;
+
+    WeChatRefundState(Integer code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public static WeChatRefundState getInstance(Integer code) {
+        WeChatRefundState[] var1 = values();
+        int var2 = var1.length;
+
+        for(int var3 = 0; var3 < var2; ++var3) {
+            WeChatRefundState state = var1[var3];
+            if (state.getCode().equals(code)) {
+                return state;
+            }
+        }
+        return null;
+    }
+
+    public Boolean equalsToCode(Integer code) {
+        return this.getCode().equals(code);
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+}