update 汇付协议

jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java

@@ -322,7 +322,7 @@ public interface OrderBasicInfoMapper {
      */
     List<JiangSuOrderInfoVO> getNROrderInfoByOrderCode(@Param("dto") NRQueryOrderDTO dto);
 
-    List<OrderPayDetailVO> queryOrderPayDetail(@Param("startTime") String startTime, @Param("endTime") String endTime);
+    List<OrderPaymentDetailVO> queryOrderPayDetail(@Param("startTime") String startTime, @Param("endTime") String endTime);
 
     /**
      * 根据车牌号查询订单信息（宁夏交投 用）

jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPayRecordMapper.java

@@ -1,6 +1,7 @@
 package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.OrderPayRecord;
+import com.jsowell.pile.vo.OrderPayRecordVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -39,4 +40,6 @@ public interface OrderPayRecordMapper {
     int insertOrUpdateSelective(OrderPayRecord record);
 
     List<OrderPayRecord> getOrderPayRecordList(@Param("orderCode") String orderCode);
+
+    List<OrderPayRecordVO> selectOrderPayRecordList(String orderCode);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java

@@ -404,7 +404,7 @@ public interface OrderBasicInfoService{
      * @param endTime
      * @return
      */
-    List<OrderPayDetailVO> queryOrderPayDetail(String startTime, String endTime);
+    List<OrderPaymentDetailVO> queryOrderPayDetail(String startTime, String endTime);
 
     /**
      * 根据车牌号查询订单信息（宁夏交投 用）

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -58,7 +58,6 @@ import com.jsowell.pile.vo.nanrui.JiangSuOrderInfoVO;
 import com.jsowell.pile.vo.uniapp.customer.*;
 import com.jsowell.pile.vo.web.*;
 import com.jsowell.wxpay.common.WeChatPayParameter;
-import com.jsowell.wxpay.dto.WechatSendMsgDTO;
 import com.jsowell.wxpay.response.WechatPayRefundRequest;
 import com.jsowell.wxpay.response.WechatPayRefundResponse;
 import com.jsowell.wxpay.service.WxAppletRemoteService;
@@ -3652,7 +3651,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
      * 根据时间端范围查询订单支付单id
      */
     @Override
-    public List<OrderPayDetailVO> queryOrderPayDetail(String startTime, String endTime) {
+    public List<OrderPaymentDetailVO> queryOrderPayDetail(String startTime, String endTime) {
         return orderBasicInfoMapper.queryOrderPayDetail(startTime, endTime);
     }
 

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java

@@ -19,6 +19,7 @@ import com.jsowell.pile.domain.OrderPayRecord;
 import com.jsowell.pile.domain.WxpayCallbackRecord;
 import com.jsowell.pile.mapper.OrderPayRecordMapper;
 import com.jsowell.pile.service.*;
+import com.jsowell.pile.vo.OrderPayRecordVO;
 import com.jsowell.pile.vo.web.OrderDetailInfoVO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,6 +92,38 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService {
         return resultList;
     }
 
+    /**
+     * 查询订单支付信息
+     */
+    public List<OrderPayRecordVO> selectOrderPayRecordList(String orderCode) {
+        // 缓存
+        String redisKey = CacheConstants.SELECT_ORDER_PAY_INFO_LIST + orderCode;
+        List<OrderPayRecordVO> resultList = redisCache.getCacheList(redisKey);
+        if (CollectionUtils.isNotEmpty(resultList)) {
+            return resultList;
+        }
+
+        // 订单信息
+        OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
+        if (orderBasicInfo == null) {
+            return Lists.newArrayList();
+        }
+
+        resultList = orderPayRecordMapper.selectOrderPayRecordList(orderCode);
+
+        if (CollectionUtils.isEmpty(resultList)) {
+            return Lists.newArrayList();
+        }
+
+        for (OrderPayRecordVO orderPayRecordVO : resultList) {
+
+        }
+
+        return resultList;
+    }
+
+
+
     /**
      * 查询订单支付信息
      * 加缓存
@@ -112,6 +145,7 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService {
         if (orderBasicInfo == null) {
             return Lists.newArrayList();
         }
+
         // 支付流水
         List<OrderPayRecord> orderPayRecordList = getOrderPayRecordList(orderCode);
         if (CollectionUtils.isEmpty(orderPayRecordList)) {

jsowell-pile/src/main/java/com/jsowell/pile/vo/OrderPayRecordVO.java

@@ -0,0 +1,18 @@
+package com.jsowell.pile.vo;
+
+import lombok.Data;
+
+@Data
+public class OrderPayRecordVO {
+    private String orderCode; // 订单编号
+    private String payAmount; // 支付金额
+    private String payStatus; // 支付状态
+    private String payMode; // 支付方式（1-本金余额支付；2-赠送金余额支付；3-白名单支付；4-微信支付；5-支付宝支付）
+    private String payModeDesc; // 支付方式描述
+    private String payTime; // 支付时间
+    private String outTradeNo; // 微信商户订单号  real_time_monitor_data
+    private String transactionId; // 微信支付订单号
+    private String refundAmount; // 退款金额
+    private String payChannel; // 汇付定义的支付渠道
+    private String payChannelDesc; // 支付渠道描述
+}

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderPaymentDetailVO.java

@@ -5,9 +5,12 @@ import lombok.Setter;
 
 import java.math.BigDecimal;
 
+/**
+ * 订单支付&退款&结算信息
+ */
 @Getter
 @Setter
-public class OrderPayDetailVO {
+public class OrderPaymentDetailVO {
     // 订单编号
     private String orderCode;