update:增加返回参数

fengliang
1 parent 62b2f7d2
Showing 7 changed files with 254 additions and 33 deletions
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/domain/OrderRefundAddDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderRefundDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/OrderRefundService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderRefundServiceImpl.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderRefundMapper.xml
@@ -5,6 +5,7 @@ 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.OrderRefundCheckDto;
+import com.diligrp.etrade.order.domain.OrderRefundAddDto;
 import com.diligrp.etrade.order.domain.OrderRefundDto;
 import com.diligrp.etrade.order.domain.OrderRefundQueryDto;
 import com.diligrp.etrade.order.model.OrderRefund;
@@ -42,7 +43,7 @@ public class OrderManagerController {
      * @return
      */
     @RequestMapping(value = "/refund",method = {RequestMethod.POST},produces="application/json;charset=UTF-8")
-    public Message<OrderRefund> refund(@RequestBody OrderRefundDto refundDto){
+    public Message<OrderRefund> refund(@RequestBody OrderRefundAddDto refundDto){
         UserTicket userTicket = SessionContext.getUserTicket();
         try{
             RLock lock = redissonClient.getLock(OrderConstant.OrderLock + refundDto.getCode());
@@ -101,12 +102,12 @@ public class OrderManagerController {
      * @return
      */
     @RequestMapping(value = "/refundList",method = {RequestMethod.POST},produces="application/json;charset=UTF-8")
-    public Message<List<OrderRefund>> getOrderRefundList(@RequestBody OrderRefundQueryDto orderRefundQueryDto){
+    public Message<List<OrderRefundDto>> getOrderRefundList(@RequestBody OrderRefundQueryDto orderRefundQueryDto){
         try{
             if(StringUtils.isBlank(orderRefundQueryDto.getOrderCode())){
                 return Message.failure("订单号不能为空");
             }
-            List<OrderRefund> orderRefundList = orderRefundService.getOrderRefundList(orderRefundQueryDto);
+            List<OrderRefundDto> orderRefundList = orderRefundService.getOrderRefundList(orderRefundQueryDto);
             return Message.success(orderRefundList);
         }catch (PlatformServiceException pe) {
             LOGGER.warn("服务异常{}:{}",pe.getCode(), pe.getMessage());
@@ -2,6 +2,7 @@ package com.diligrp.etrade.order.dao;
 import com.diligrp.etrade.core.mybatis.MybatisMapperSupport;
 import com.diligrp.etrade.order.domain.OrderRefundCheckDto;
+import com.diligrp.etrade.order.domain.OrderRefundDto;
 import com.diligrp.etrade.order.domain.OrderRefundQueryDto;
 import com.diligrp.etrade.order.model.OrderRefund;
 import org.apache.ibatis.annotations.Param;
@@ -40,5 +41,5 @@ public interface OrderRefundMapper extends MybatisMapperSupport {
      * @param queryDto
      * @return
      */
-    List<OrderRefund> getOrderRefundList(OrderRefundQueryDto queryDto);
+    List<OrderRefundDto> getOrderRefundList(OrderRefundQueryDto queryDto);
 }
+package com.diligrp.etrade.order.domain;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+import java.math.BigDecimal;
+
+/** 订单出参 */
+public class OrderRefundAddDto {
+
+    /**
+     * 订单编码（全局唯一）
+     */
+    @NotBlank(message = "订单编码不能为空")
+    private String code;
+    /**
+     * 退款金额
+     */
+    @NotNull(message = "退款金额不能为空")
+    private BigDecimal refundAmount;
+
+    /**
+     * 退款说明
+     */
+    private String refundMessage;
+    /**
+     * 市场主键
+     */
+    @NotNull(message = "市场主键不能为空")
+    private Long marketId;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public BigDecimal getRefundAmount() {
+        return refundAmount;
+    }
+
+    public void setRefundAmount(BigDecimal refundAmount) {
+        this.refundAmount = refundAmount;
+    }
+
+    public String getRefundMessage() {
+        return refundMessage;
+    }
+
+    public void setRefundMessage(String refundMessage) {
+        this.refundMessage = refundMessage;
+    }
+
+    public Long getMarketId() {
+        return marketId;
+    }
+
+    public void setMarketId(Long marketId) {
+        this.marketId = marketId;
+    }
+}
 package com.diligrp.etrade.order.domain;
-import com.diligrp.etrade.order.type.OrderPaymentAllChannel;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.LocalDateTime;
-import java.util.List;
 /** 订单出参 */
 public class OrderRefundDto {
+    private Long id;
     /**
-     * 订单编码（全局唯一）
+     * 实际退款单号
      */
-    @NotBlank(message = "订单编码不能为空")
-    private String code;
+    private String refundId;
+
+    /**
+     * 市场主键
+     */
+    private Long marketId;
+
+    /**
+     * 订单主键
+     */
+    private Long orderId;
+
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
     /**
      * 退款金额
      */
-    @NotNull(message = "退款金额不能为空")
     private BigDecimal refundAmount;
     /**
      * 退款说明
      */
     private String refundMessage;
+
     /**
-     * 市场主键
+     * 退款单状态
      */
-    @NotNull(message = "市场主键不能为空")
-    private Long marketId;
+    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 getCode() {
-        return code;
+    public String getOrderCode() {
+        return orderCode;
     }
-    public void setCode(String code) {
-        this.code = code;
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
     }
     public BigDecimal getRefundAmount() {
@@ -57,11 +136,83 @@ public class OrderRefundDto {
         this.refundMessage = refundMessage;
     }
-    public Long getMarketId() {
-        return marketId;
+    public Integer getState() {
+        return state;
     }
-    public void setMarketId(Long marketId) {
-        this.marketId = marketId;
+    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 Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    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 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;
     }
 }
@@ -3,6 +3,7 @@ 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.OrderRefundCheckDto;
+import com.diligrp.etrade.order.domain.OrderRefundAddDto;
 import com.diligrp.etrade.order.domain.OrderRefundDto;
 import com.diligrp.etrade.order.domain.OrderRefundQueryDto;
 import com.diligrp.etrade.order.model.OrderRefund;
@@ -19,7 +20,7 @@ public interface OrderRefundService {
      * @param userTicket
      * @return
      */
-    Message<OrderRefund> addRefund(OrderRefundDto refundDto, UserTicket userTicket);
+    Message<OrderRefund> addRefund(OrderRefundAddDto refundDto, UserTicket userTicket);
     /**
      * 根据退款单发起退款
@@ -54,5 +55,5 @@ public interface OrderRefundService {
      * @param queryDto
      * @return
      */
-    List<OrderRefund> getOrderRefundList(OrderRefundQueryDto queryDto);
+    List<OrderRefundDto> getOrderRefundList(OrderRefundQueryDto queryDto);
 }
@@ -3,10 +3,7 @@ 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.OrderRefundCheckDto;
-import com.diligrp.etrade.order.domain.OrderRefundDto;
-import com.diligrp.etrade.order.domain.OrderRefundQueryDto;
+import com.diligrp.etrade.order.domain.*;
 import com.diligrp.etrade.order.exception.OrderErrorCode;
 import com.diligrp.etrade.order.exception.OrderException;
 import com.diligrp.etrade.order.model.Order;
@@ -60,7 +57,7 @@ public class OrderRefundServiceImpl implements OrderRefundService {
     private WeChatPayRpcResolver weChatPayRpcResolver;
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Message<OrderRefund> addRefund(OrderRefundDto refundDto, UserTicket userTicket) {
+    public Message<OrderRefund> addRefund(OrderRefundAddDto refundDto, UserTicket userTicket) {
         //基础参数效验
         LOGGER.info("退款单入参{}，操作员{}",refundDto,userTicket);
         Order order = orderService.getOneOrder(new OrderGetDto(null, refundDto.getCode(), refundDto.getMarketId()));
@@ -228,7 +225,7 @@ public class OrderRefundServiceImpl implements OrderRefundService {
      * @param userTicket
      * @return
      */
-    private OrderRefund bulidOrderReFund(OrderRefundDto refundDto, Order order, OrderPayment orderPayment,UserTicket userTicket) {
+    private OrderRefund bulidOrderReFund(OrderRefundAddDto refundDto, Order order, OrderPayment orderPayment, UserTicket userTicket) {
         OrderRefund orderRefund = new OrderRefund();
         orderRefund.setOrderCode(order.getCode());
         orderRefund.setOrderId(order.getId());
@@ -256,7 +253,7 @@ public class OrderRefundServiceImpl implements OrderRefundService {
     @Override
-    public List<OrderRefund> getOrderRefundList(OrderRefundQueryDto queryDto){
+    public List<OrderRefundDto> getOrderRefundList(OrderRefundQueryDto queryDto){
         if(queryDto==null){
             return new ArrayList<>();
         }
@@ -26,6 +26,13 @@
             order_payment_id,created_time,modified_time,version,
             refund_time,create_id,create_name
     </sql>
+    <sql id="baseDecimalSql" >
+        id,refund_id,order_id,order_code,market_id,
+            convert(refund_amount, decimal(20,2))/100 as 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,
@@ -105,9 +112,9 @@
             </if>
         </where>
     </select>
-    <select id="getOrderRefundList" resultType="com.diligrp.etrade.order.model.OrderRefund"
+    <select id="getOrderRefundList" resultType="com.diligrp.etrade.order.domain.OrderRefundDto"
             parameterType="com.diligrp.etrade.order.domain.OrderRefundQueryDto">
-        select <include refid="baseSql"/> from order_refund
+        select <include refid="baseDecimalSql"/> from order_refund
         <where>
             <if test="orderCode != null and orderCode !='' " >
                 and order_code = #{orderCode,jdbcType=VARCHAR}