feat rtmark hourly

dengwei
1 parent 7ef99d77
Showing 21 changed files with 411 additions and 51 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/MallConstants.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/RtMarkBaseCO.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/dto/HourlyPaymentCallbackDTO.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/dto/HourlyRefundCallbackDTO.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/dto/package-info.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/exception/MallExceptionHandler.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/model/MallBizOrder.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/model/MallBizPayment.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/model/MallBizPaymentOrder.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/model/MallBizRefund.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/property/RtMallDynamicProperty.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/MallBizOrderServiceImpl.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/MallBizRefundServiceImpl.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/paychannel/CardPayChannel.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/paychannel/WeChatPayChannel.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/sourcechannel/AbstractSourceChannel.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/sourcechannel/RtMallChannel.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/sign/RtMallSign.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/type/OrderState.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/jackson/deserializer/SecondToDateDeserializer.java
@@ -5,6 +5,7 @@ import com.diligrp.cashier.shared.Constants;
 /**
  * 商城常量
+ * @author dengwei
  */
 public interface MallConstants {
     String RESULT_SUCCESS = "success";
@@ -14,4 +15,7 @@ public interface MallConstants {
     String MALL_TOKEN = Constants.PRODUCT_NAME + "mall_token:";
     String MALL_USER_INFO = Constants.PRODUCT_NAME + "mall_user_info:";
+
+    String HOURLY_PAYMENT_CALLBACK_METHOD = "hourly.payment.callback";
+    String HOURLY_REFUND_CALLBACK_METHOD = "hourly.refund.callback";
 }
@@ -16,6 +16,7 @@ public class RtMarkBaseCO {
     private String version;
     private String timestamp;
     private String nonceStr;
+    private String method;
     private String sign;
     public String getAppKey() {
@@ -50,6 +51,14 @@ public class RtMarkBaseCO {
         this.nonceStr = nonceStr;
     }
+    public String getMethod() {
+        return method;
+    }
+
+    public void setMethod(String method) {
+        this.method = method;
+    }
+
     public String getSign() {
         return sign;
     }
+package com.diligrp.cashier.mall.domain.rtmall.dto;
+
+import com.diligrp.cashier.mall.MallConstants;
+import com.diligrp.cashier.mall.domain.rtmall.RtMarkBaseCO;
+import com.diligrp.cashier.mall.model.MallBizPaymentOrder;
+import com.diligrp.cashier.mall.property.RtMallDynamicProperty;
+
+/**
+ * @ClassName HourlyPaymentCallbackDTO.java
+ * @author dengwei
+ * @version 1.0.0
+ * @Description HourlyPaymentCallbackDTO
+ */
+public class HourlyPaymentCallbackDTO extends RtMarkBaseCO {
+    /**
+     * 订单号
+     */
+    private String orderId;
+
+    /**
+     * 支付单号
+     */
+    private String tradeId;
+
+    /**
+     * 第三方支付流水号
+     */
+    private String transactionId;
+
+    /**
+     * 支付金额（分）
+     */
+    private Long payFee;
+
+    public static HourlyPaymentCallbackDTO of(final MallBizPaymentOrder mallBizPaymentOrder,
+                                              final RtMallDynamicProperty.AppSecretDynamicProperty property) {
+        HourlyPaymentCallbackDTO callbackDTO = new HourlyPaymentCallbackDTO();
+        callbackDTO.setOrderId(mallBizPaymentOrder.getOrderId());
+        callbackDTO.setTradeId(mallBizPaymentOrder.getTradeId());
+        callbackDTO.setTransactionId(mallBizPaymentOrder.getPayTradeId());
+        callbackDTO.setPayFee(mallBizPaymentOrder.getPayFee());
+        callbackDTO.setMethod(MallConstants.HOURLY_PAYMENT_CALLBACK_METHOD);
+        return callbackDTO;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public void setTradeId(String tradeId) {
+        this.tradeId = tradeId;
+    }
+
+    public String getTransactionId() {
+        return transactionId;
+    }
+
+    public void setTransactionId(String transactionId) {
+        this.transactionId = transactionId;
+    }
+
+    public Long getPayFee() {
+        return payFee;
+    }
+
+    public void setPayFee(Long payFee) {
+        this.payFee = payFee;
+    }
+}
+package com.diligrp.cashier.mall.domain.rtmall.dto;
+
+import com.diligrp.cashier.mall.MallConstants;
+import com.diligrp.cashier.mall.domain.rtmall.RtMarkBaseCO;
+import com.diligrp.cashier.mall.model.MallBizOrder;
+import com.diligrp.cashier.mall.model.MallBizRefund;
+import com.diligrp.cashier.mall.property.RtMallDynamicProperty;
+import com.diligrp.cashier.mall.type.RefundState;
+import com.diligrp.cashier.shared.jackson.serialization.DateToSecondSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.time.LocalDateTime;
+import java.util.Objects;
+
+/**
+ * @ClassName HourlyRefundCallbackDTO.java
+ * @author dengwei
+ * @version 1.0.0
+ * @Description HourlyRefundCallbackDTO
+ */
+public class HourlyRefundCallbackDTO extends RtMarkBaseCO {
+    /**
+     * 订单号
+     */
+    private String orderId;
+
+    /**
+     * 支付单号
+     */
+    private String tradeId;
+
+    /**
+     * 退款单号
+     */
+    private String refundBn;
+
+    /**
+     * 第三方退款单号
+     */
+    private String refundId;
+
+    /**
+     * 支付金额（分）
+     */
+    private Long payFee;
+
+    /**
+     * 退款状态
+     * SUCCESS成功，ERROR为失败
+     */
+    private String refundStatus;
+
+    /**
+     * 退款失败原因，退款失败时必传
+     */
+    private String refuseReason;
+
+    /**
+     * 退款时间
+     */
+    @JsonSerialize(using = DateToSecondSerializer.class)
+    private LocalDateTime refundTime;
+
+    /**
+     * of
+     */
+    public static HourlyRefundCallbackDTO of(final MallBizOrder mallBizOrder,
+                                             final MallBizRefund mallBizRefund,
+                                             final RtMallDynamicProperty.AppSecretDynamicProperty property) {
+        HourlyRefundCallbackDTO dto = new HourlyRefundCallbackDTO();
+        dto.setOrderId(mallBizOrder.getOrderId());
+        dto.setTradeId(mallBizOrder.getTradeId());
+        dto.setRefundBn(mallBizRefund.getRefundBn());
+        dto.setRefundId(mallBizRefund.getRefundTradeId());
+        dto.setPayFee(mallBizRefund.getRefundFee());
+        if (Objects.equals(mallBizRefund.getRefundState(), RefundState.SUCCESS.code)) {
+            dto.setRefundStatus("SUCCESS");
+        } else {
+            dto.setRefundStatus("ERROR");
+        }
+        dto.setRefuseReason(mallBizRefund.getRefuseReason());
+        dto.setRefundTime(mallBizRefund.getRefundTime());
+        dto.setMethod(MallConstants.HOURLY_REFUND_CALLBACK_METHOD);
+        return dto;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public void setTradeId(String tradeId) {
+        this.tradeId = tradeId;
+    }
+
+    public String getRefundBn() {
+        return refundBn;
+    }
+
+    public void setRefundBn(String refundBn) {
+        this.refundBn = refundBn;
+    }
+
+    public String getRefundId() {
+        return refundId;
+    }
+
+    public void setRefundId(String refundId) {
+        this.refundId = refundId;
+    }
+
+    public Long getPayFee() {
+        return payFee;
+    }
+
+    public void setPayFee(Long payFee) {
+        this.payFee = payFee;
+    }
+
+    public String getRefundStatus() {
+        return refundStatus;
+    }
+
+    public void setRefundStatus(String refundStatus) {
+        this.refundStatus = refundStatus;
+    }
+
+    public String getRefuseReason() {
+        return refuseReason;
+    }
+
+    public void setRefuseReason(String refuseReason) {
+        this.refuseReason = refuseReason;
+    }
+
+    public LocalDateTime getRefundTime() {
+        return refundTime;
+    }
+
+    public void setRefundTime(LocalDateTime refundTime) {
+        this.refundTime = refundTime;
+    }
+}
-/**
- * @ClassName package-info.java
- * @author dengwei
- * @version 1.0.0
- * @Description TODO
- * @date 2025-12-30 14:04
- */
-package com.diligrp.cashier.mall.domain.rtmall.dto;
 package com.diligrp.cashier.mall.exception;
 import com.diligrp.cashier.mall.domain.rtmall.RtMarkMessage;
+import com.diligrp.cashier.mall.type.RtMarkErrorCode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
@@ -24,4 +25,10 @@ public class MallExceptionHandler {
         LOG.warn("rt mart mall exception", ex);
         return RtMarkMessage.failure(ex.getCode(), ex.getMessage());
     }
+
+    @ExceptionHandler(Exception.class)
+    public RtMarkMessage<?> exception(Exception ex) {
+        LOG.warn("exception", ex);
+        return RtMarkMessage.failure(RtMarkErrorCode.E5000.getCode());
+    }
 }
@@ -106,7 +106,7 @@ public class MallBizOrder extends BaseDO {
     private Long discountFee;
     /**
-     * 订单状态(0-notpay-未支付-1-payed-已支付 2-notpaycancel-未支付取消 3-payedcancel-已支付取消  4-done-订单完成 5-buyer_confirm-待用户收货)
+     * 订单状态(0-notpay-未支付 1-payed-已支付 2-notpaycancel-已取消 3-payedcancel-已退款 4-done-订单完成 5-buyer_confirm-待用户收货)
      * @see OrderState
      */
     private Integer state;
@@ -41,7 +41,7 @@ public class MallBizPayment extends BaseDO {
     /**
      * dili交易流水号
      */
-    private String payPaymentId;
+    private String payTradeId;
     /**
      * 商户code
@@ -97,6 +97,7 @@ public class MallBizPayment extends BaseDO {
     /**
      * 支付渠道(微信 园区卡)
      * @see com.diligrp.cashier.mall.type.PaymentChanel
+     * @see com.diligrp.cashier.pipeline.type.ChannelType
      */
     private Integer channelId;
@@ -110,6 +111,11 @@ public class MallBizPayment extends BaseDO {
      */
     private String paymentCallback;
+    /**
+     * 扩展信息
+     */
+    private String ext;
+
     public MallBizPayment() {
     }
@@ -183,12 +189,12 @@ public class MallBizPayment extends BaseDO {
         this.tradeId = tradeId;
     }
-    public String getPayPaymentId() {
-        return payPaymentId;
+    public String getPayTradeId() {
+        return payTradeId;
     }
-    public void setPayPaymentId(String payPaymentId) {
-        this.payPaymentId = payPaymentId;
+    public void setPayTradeId(String payTradeId) {
+        this.payTradeId = payTradeId;
     }
     public String getMchId() {
@@ -295,6 +301,14 @@ public class MallBizPayment extends BaseDO {
         this.paymentCallback = paymentCallback;
     }
+    public String getExt() {
+        return ext;
+    }
+
+    public void setExt(String ext) {
+        this.ext = ext;
+    }
+
     /**
      * ofOrderPaymentVO
      *
@@ -305,7 +319,7 @@ public class MallBizPayment extends BaseDO {
         orderPaymentVO.setPayStatus(payState);
         orderPaymentVO.setPayFee(payFee);
         orderPaymentVO.setPayTime(payTime);
-        orderPaymentVO.setTransactionId(payPaymentId);
+        orderPaymentVO.setTransactionId(payTradeId);
         return orderPaymentVO;
     }
 }
@@ -36,9 +36,9 @@ public class MallBizPaymentOrder extends BaseDO {
     private String tradeId;
     /**
-     * dili交易流水号(mall_biz_payment.pay_payment_id)
+     * dili交易流水号(mall_biz_payment.pay_trade_id)
      */
-    private String payPaymentId;
+    private String payTradeId;
     /**
      * 支付金额分
@@ -104,12 +104,12 @@ public class MallBizPaymentOrder extends BaseDO {
         this.tradeId = tradeId;
     }
-    public String getPayPaymentId() {
-        return payPaymentId;
+    public String getPayTradeId() {
+        return payTradeId;
     }
-    public void setPayPaymentId(String payPaymentId) {
-        this.payPaymentId = payPaymentId;
+    public void setPayTradeId(String payTradeId) {
+        this.payTradeId = payTradeId;
     }
     public Long getPayFee() {
@@ -146,7 +146,7 @@ public class MallBizPaymentOrder extends BaseDO {
         orderPaymentVO.setPayStatus(payState);
         orderPaymentVO.setPayFee(payFee);
         orderPaymentVO.setPayTime(payTime);
-        orderPaymentVO.setTransactionId(payPaymentId);
+        orderPaymentVO.setTransactionId(payTradeId);
         return orderPaymentVO;
     }
 }
@@ -48,12 +48,12 @@ public class MallBizRefund extends BaseDO {
     /**
      * dili退款流水号
      */
-    private String refundPaymentId;
+    private String refundTradeId;
     /**
      * dili交易流水号
      */
-    private String payPaymentId;
+    private String payTradeId;
     /**
      * dili客户卡号
@@ -161,20 +161,20 @@ public class MallBizRefund extends BaseDO {
         this.tradeId = tradeId;
     }
-    public String getRefundPaymentId() {
-        return refundPaymentId;
+    public String getRefundTradeId() {
+        return refundTradeId;
     }
-    public void setRefundPaymentId(String refundPaymentId) {
-        this.refundPaymentId = refundPaymentId;
+    public void setRefundTradeId(String refundTradeId) {
+        this.refundTradeId = refundTradeId;
     }
-    public String getPayPaymentId() {
-        return payPaymentId;
+    public String getPayTradeId() {
+        return payTradeId;
     }
-    public void setPayPaymentId(String payPaymentId) {
-        this.payPaymentId = payPaymentId;
+    public void setPayTradeId(String payTradeId) {
+        this.payTradeId = payTradeId;
     }
     public String getRefundCardNo() {
@@ -293,10 +293,11 @@ public class MallBizRefund extends BaseDO {
         BeanUtils.copyProperties(refundCo, mallBizRefund);
         mallBizRefund.setOrderId(mallBizOrder.getOrderId());
+        mallBizRefund.setRefundTradeNo(snowflakeKeyManager.nextId(SnowflakeKey.MALL_BIZ_REFUND_ID).toString());
         mallBizRefund.setTradeId(mallBizPaymentOrder.getTradeId());
         mallBizRefund.setPayTradeNo(mallBizPaymentOrder.getPayTradeNo());
-        mallBizRefund.setRefundTradeNo(snowflakeKeyManager.nextId(SnowflakeKey.MALL_BIZ_REFUND_ID).toString());
-        mallBizRefund.setPayPaymentId(mallBizPaymentOrder.getPayPaymentId());
+        mallBizRefund.setPayTradeId(mallBizPaymentOrder.getPayTradeId());
+        mallBizRefund.setCreaterName(refundCo.getUserCode());
         // 回调地址
         RtMallDynamicProperty rtMallDynamicProperty = SpringContextUtils.getBean(RtMallDynamicProperty.class);
@@ -33,6 +33,9 @@ public class RtMallDynamicProperty {
         @Value("${orderType:3}")
         private Integer orderType;
+        @Value("${version:v1}")
+        private String version;
+
         @Value("${appKey:}")
         private String appKey;
@@ -45,6 +48,9 @@ public class RtMallDynamicProperty {
         @Value("${authUrl:https://hourh5-em-shop.feiniugo.com}")
         private String authUrl;
+        @Value("${cashierResultUrl:}")
+        private String cashierResultUrl;
+
         @Value("${callbackDomain:}")
         private String callbackDomain;
@@ -80,6 +86,14 @@ public class RtMallDynamicProperty {
             this.authUrl = authUrl;
         }
+        public String getCashierResultUrl() {
+            return cashierResultUrl;
+        }
+
+        public void setCashierResultUrl(String cashierResultUrl) {
+            this.cashierResultUrl = cashierResultUrl;
+        }
+
         public Integer getOrderType() {
             return orderType;
         }
@@ -88,6 +102,14 @@ public class RtMallDynamicProperty {
             this.orderType = orderType;
         }
+        public String getVersion() {
+            return version;
+        }
+
+        public void setVersion(String version) {
+            this.version = version;
+        }
+
         public String getCompanyCode() {
             return companyCode;
         }
@@ -72,7 +72,7 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
         MallBizPayment mallBizPayment = MallBizPayment.of(mallBizOrders);
         // TODO 2025/12/30: 预支付信息 收银台地址信息
-        mallBizPayment.setPayPaymentId(IdUtil.simpleUUID());
+        mallBizPayment.setPayTradeId(IdUtil.simpleUUID());
         mallBizPayment.setCashierUrl("https://cashier.test.gszdtop.com?payTradeNo=" + mallBizPayment.getPayTradeNo());
         // save
@@ -164,7 +164,7 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
         Optional.of(bizPaymentOrders)
                 .ifPresent(paymentOrders -> {
                     paymentOrders.forEach(vo -> {
-                        vo.setPayPaymentId(mallBizPayment.getPayPaymentId());
+                        vo.setPayTradeId(mallBizPayment.getPayTradeId());
                     });
                     mallBizPaymentOrderDao.batchInsert(paymentOrders);
                 });
@@ -48,6 +48,9 @@ public class MallBizRefundServiceImpl implements MallBizRefundService {
     @Transactional(rollbackFor = {Exception.class})
     public RefundSuccessVO refund(RefundCO refundCo) {
         MallBizOrder mallBizOrder = mallBizOrderDao.getByOrderId(refundCo.getOrderId());
+        if (Objects.isNull(mallBizOrder)) {
+            throw new RtMartMallException(RtMarkErrorCode.E5004);
+        }
         MallBizRefund mallBizRefund = MallInitializeContext.getBySource(mallBizOrder.getSource()).refund(refundCo);
         return new RefundSuccessVO(mallBizRefund.getPayTradeNo(), mallBizRefund.getRefundTradeNo());
     }
 package com.diligrp.cashier.mall.service.paychannel;
-import com.diligrp.cashier.mall.type.PaymentChanel;
+import com.diligrp.cashier.pipeline.type.ChannelType;
 import org.springframework.stereotype.Component;
 /**
@@ -14,6 +14,6 @@ import org.springframework.stereotype.Component;
 public class CardPayChannel extends AbstractPayChannel {
     @Override
     public Integer getPayChannel() {
-        return PaymentChanel.PARK_CARD.getCode();
+        return ChannelType.DILIPAY.getCode();
     }
 }
 package com.diligrp.cashier.mall.service.paychannel;
-import com.diligrp.cashier.mall.type.PaymentChanel;
+import com.diligrp.cashier.pipeline.type.ChannelType;
 import org.springframework.stereotype.Component;
 /**
@@ -14,6 +14,6 @@ import org.springframework.stereotype.Component;
 public class WeChatPayChannel extends AbstractPayChannel {
     @Override
     public Integer getPayChannel() {
-        return PaymentChanel.WECHAT.getCode();
+        return ChannelType.WXPAY.getCode();
     }
 }
@@ -10,11 +10,13 @@ import com.diligrp.cashier.mall.domain.rtmall.co.RefundCO;
 import com.diligrp.cashier.mall.domain.rtmall.vo.UserInfoVO;
 import com.diligrp.cashier.mall.exception.RtMartMallException;
 import com.diligrp.cashier.mall.model.MallBizOrder;
+import com.diligrp.cashier.mall.model.MallBizPayment;
 import com.diligrp.cashier.mall.model.MallBizPaymentOrder;
 import com.diligrp.cashier.mall.model.MallBizRefund;
 import com.diligrp.cashier.mall.property.RtMallDynamicProperty;
 import com.diligrp.cashier.mall.service.biz.MallBizPaymentService;
 import com.diligrp.cashier.mall.type.PayState;
+import com.diligrp.cashier.mall.type.RefundState;
 import com.diligrp.cashier.mall.type.RtMarkErrorCode;
 import com.diligrp.cashier.shared.util.DateUtils;
 import com.diligrp.cashier.shared.util.JsonUtils;
@@ -96,13 +98,19 @@ public abstract class AbstractSourceChannel {
         MallBizOrder mallBizOrder = mallBizOrderDao.getByOrderId(refundCo.getOrderId());
         MallBizPaymentOrder mallBizPaymentOrder = getPayment(refundCo);
-        // 支付成功才能退款
-        if (ObjectUtils.notEqual(mallBizPaymentOrder.getPayState(), PayState.SUCCESS.code)) {
-            throw new RtMartMallException(RtMarkErrorCode.E5005);
-        }
-
-        // TODO 2025/12/30: 调用支付完善信息
         MallBizRefund refund = MallBizRefund.of(refundCo, mallBizOrder, mallBizPaymentOrder);
+        // 售前取消 需不需要通知支付进行取消预支付信息
+        if (ObjectUtils.notEqual(mallBizPaymentOrder.getPayState(), PayState.PENDING.code)) {
+            refund.setRefundState(RefundState.SUCCESS.code);
+        } else {
+            // 支付成功才能退款
+            if (ObjectUtils.notEqual(mallBizPaymentOrder.getPayState(), PayState.SUCCESS.code)) {
+                throw new RtMartMallException(RtMarkErrorCode.E5005);
+            }
+
+            // TODO 2025/12/30: 调用支付完善信息
+            refund.setRefundTradeId("99999999999");
+        }
         save(refund);
         return refund;
@@ -124,6 +132,16 @@ public abstract class AbstractSourceChannel {
     public abstract void userInfoChannel(UserInfoVO authLogin, RtMallDynamicProperty.AppSecretDynamicProperty userInfoVO);
     /**
+     * payCallBack
+     */
+    public abstract void payCallBack(MallBizOrder mallBizOrder, MallBizPayment mallBizPayment, MallBizPaymentOrder mallBizPaymentOrder);
+
+    /**
+     * refundCallBack
+     */
+    public abstract void refundCallBack(MallBizOrder mallBizOrder, MallBizRefund mallBizRefund);
+
+    /**
      * getPayment
      */
     private MallBizPaymentOrder getPayment(RefundCO refundCo) {
 package com.diligrp.cashier.mall.service.sourcechannel;
+import com.diligrp.cashier.mall.domain.rtmall.RtMarkBaseCO;
+import com.diligrp.cashier.mall.domain.rtmall.RtMarkMessage;
 import com.diligrp.cashier.mall.domain.rtmall.co.AuthLoginCO;
+import com.diligrp.cashier.mall.domain.rtmall.dto.HourlyPaymentCallbackDTO;
+import com.diligrp.cashier.mall.domain.rtmall.dto.HourlyRefundCallbackDTO;
 import com.diligrp.cashier.mall.domain.rtmall.vo.UserInfoVO;
+import com.diligrp.cashier.mall.model.MallBizOrder;
+import com.diligrp.cashier.mall.model.MallBizPayment;
+import com.diligrp.cashier.mall.model.MallBizPaymentOrder;
+import com.diligrp.cashier.mall.model.MallBizRefund;
 import com.diligrp.cashier.mall.property.RtMallDynamicProperty;
 import com.diligrp.cashier.mall.type.OrderSource;
+import com.diligrp.cashier.mall.util.HttpClientUtils;
 import com.diligrp.cashier.mall.util.RtMallSignMd5Utils;
+import com.diligrp.cashier.shared.util.DateUtils;
 import com.diligrp.cashier.shared.util.JsonUtils;
 import com.diligrp.cashier.shared.util.UrlParamParserUtils;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -55,6 +66,58 @@ public class RtMallChannel extends AbstractSourceChannel {
         authLogin.setCompanyCode(property.getCompanyCode());
     }
+    /**
+     * payCallBack
+     * @see https://shopex.yuque.com/hl0rrx/vlp0m4/nkwt5yrhdfzoy78s?singleDoc#RtKpF
+     * 支付回调接口
+     *
+     */
+    @Override
+    public void payCallBack(final MallBizOrder mallBizOrder,
+                            final MallBizPayment mallBizPayment,
+                            final MallBizPaymentOrder mallBizPaymentOrder) {
+        RtMallDynamicProperty.AppSecretDynamicProperty property = getProperty(mallBizOrder);
+        HourlyPaymentCallbackDTO hourlyPaymentCallback = HourlyPaymentCallbackDTO.of(mallBizPaymentOrder, property);
+        hourlyPaymentCallback.setSign(sign(hourlyPaymentCallback, property));
+        RtMarkMessage<?> message = HttpClientUtils.postJson(mallBizPayment.getPaymentCallback(), hourlyPaymentCallback, null, new TypeReference<>() {
+        }, "rt-mall");
+        log.info("payCallBack message: {}", JsonUtils.toJsonString(message));
+    }
+
+    /**
+     * refundCallBack
+     * @see https://shopex.yuque.com/hl0rrx/vlp0m4/nkwt5yrhdfzoy78s?singleDoc#RtKpF
+     * 退款回调接口
+     */
+    @Override
+    public void refundCallBack(MallBizOrder mallBizOrder, MallBizRefund mallBizRefund) {
+        RtMallDynamicProperty.AppSecretDynamicProperty property = getProperty(mallBizOrder);
+        HourlyRefundCallbackDTO hourlyRefundCallback = HourlyRefundCallbackDTO.of(mallBizOrder, mallBizRefund, property);
+        hourlyRefundCallback.setSign(sign(hourlyRefundCallback, property));
+        RtMarkMessage<?> message = HttpClientUtils.postJson(mallBizRefund.getRefundCallback(), hourlyRefundCallback, null, new TypeReference<>() {
+        }, "rt-mall");
+        log.info("refundCallBack message: {}", JsonUtils.toJsonString(message));
+    }
+
+    /**
+     * getProperty
+     */
+    private RtMallDynamicProperty.AppSecretDynamicProperty getProperty(MallBizOrder mallBizOrder) {
+        RtMallDynamicProperty.AppSecretDynamicProperty property = rtMallDynamicProperty.getBySourceAndType(mallBizOrder.getSource(), mallBizOrder.getOrderType());
+        log.info("source {} orderType {} property: {}", mallBizOrder.getSource(), mallBizOrder.getOrderType(), JsonUtils.toJsonString(property));
+        return property;
+    }
+
+    /**
+     * 计算签名
+     */
+    private String sign(RtMarkBaseCO base, RtMallDynamicProperty.AppSecretDynamicProperty property) {
+        base.setAppKey(property.getAppKey());
+        base.setVersion(property.getVersion());
+        base.setTimestamp(DateUtils.timestampInSeconds() + "");
+        return RtMallSignMd5Utils.generateSign(base, property.getAppSecret());
+    }
+
     @Override
     public Integer source() {
         return OrderSource.RT_MART.getCode();
@@ -41,7 +41,7 @@ public class RtMallSign implements SecuritySign {
         Object appKey = paramMap.get("app_key");
         if (Objects.isNull(appKey)) {
-            throw new RtMartMallException(RtMarkErrorCode.E4003);
+            throw new RtMartMallException(RtMarkErrorCode.E4001);
         }
         Object sign = paramMap.get("sign");
@@ -16,8 +16,8 @@ import java.util.stream.Collectors;
 public enum OrderState {
     NOT_PAY(0, "notpay", "未支付"),
     PAYED(1, "payed", "已支付"),
-    NOT_PAY_CANCEL(2, "notpaycancel", "未支付取消"),
-    PAYED_CANCEL(3, "payedcancel", "已支付取消"),
+    NOT_PAY_CANCEL(2, "notpaycancel", "已取消"),
+    PAYED_CANCEL(3, "payedcancel", "已退款"),
     DONE(4, "done", "订单完成"),
     CONFIRM_RECEIPT(4, "confirmreceipt", "订单完成"),
     BUYER_CONFIRM(5, "buyer_confirm", "待用户收货"),
@@ -23,7 +23,7 @@ public class SecondToDateDeserializer extends JsonDeserializer&lt;LocalDateTime&gt; {
         long timestamp = parser.getValueAsLong();
         return LocalDateTime.ofInstant(
                 Instant.ofEpochSecond(timestamp),
-                ZoneOffset.UTC
+                ZoneOffset.systemDefault()
         );
     }
 }
@@ -18,6 +18,6 @@ import java.time.ZoneOffset;
 public class DateToSecondSerializer extends JsonSerializer<LocalDateTime> {
     @Override
     public void serialize(LocalDateTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-        gen.writeNumber(value.toInstant(ZoneOffset.UTC).getEpochSecond());
+        gen.writeNumber(value.atZone(ZoneOffset.systemDefault()).toEpochSecond());
     }
 }