feat rt_mark features

dengwei
1 parent e0137e45
Showing 32 changed files with 894 additions and 429 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/api/ManualHandlerApi.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/api/RtMallOrderPaymentApi.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/dao/MallBizOrderDao.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/dao/MallBizPaymentDao.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/dao/MallBizPaymentOrderDao.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/co/AuthLoginCO.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/co/OrderPaymentCO.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/co/RefundCO.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/co/RefundStatusCO.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/vo/RefundVO.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/MallBizOrderService.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/MallBizPaymentService.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/PayNotifyService.java
+package com.diligrp.cashier.mall.api;
+
+import com.diligrp.cashier.shared.domain.Message;
+import com.diligrp.cashier.shared.spi.IPaymentEventListener;
+import com.diligrp.cashier.shared.spi.domain.PaymentResultBO;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName ManualHandlerApi.java
+ * @author dengwei
+ * @version 1.0.0
+ * @Description ManualHandlerApi
+ * @date 2026-01-06 14:00
+ */
+@RestController
+@RequestMapping(path = "/mall/manual")
+@Validated
+public class ManualHandlerApi {
+    @Resource
+    private IPaymentEventListener paymentEventListener;
+
+    @PostMapping("/payment/event")
+    public Message<?> handlePaymentEvent(@RequestBody PaymentResultBO payment) {
+        paymentEventListener.onEvent(payment);
+        return Message.success();
+    }
+
+}
 package com.diligrp.cashier.mall.api;
 import com.diligrp.cashier.mall.domain.rtmall.RtMarkMessage;
-import com.diligrp.cashier.mall.domain.rtmall.co.OrderPaymentCO;
+import com.diligrp.cashier.mall.domain.rtmall.co.OrderCO;
 import com.diligrp.cashier.mall.domain.rtmall.co.PaymentAllocateCO;
 import com.diligrp.cashier.mall.domain.rtmall.vo.OrderSuccessVO;
+import com.diligrp.cashier.mall.service.biz.MallBizOrderService;
 import com.diligrp.cashier.mall.service.biz.MallBizPaymentService;
 import com.diligrp.cashier.mall.sign.RtMallSign;
+import com.diligrp.cashier.mall.type.OrderType;
 import com.diligrp.cashier.mall.util.RtMallValidateUtils;
 import com.diligrp.cashier.shared.annotation.ParamLogPrint;
 import com.diligrp.cashier.shared.annotation.RepeatSubmit;
@@ -20,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
 /**
  * 扫码下单接口
  * Pos扫支付码后，推送订单信息到商户，商户返回收银台链接
@@ -28,9 +32,10 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(path = {"/api/rt/mall/scan", "/rt/mall/scan"})
 @Validated
 public class RtMallOrderPaymentApi {
-
     @Resource
     private MallBizPaymentService mallBizPaymentService;
+    @Resource
+    private MallBizOrderService mallBizOrderService;
     /**
      * 扫码下单接口
@@ -41,9 +46,10 @@ public class RtMallOrderPaymentApi {
     @Sign(sign = RtMallSign.class)
     @RepeatSubmit(prefix = "order_payment_sync:", value = "#req['trade_id']", duplicationSubmit = SpelDuplicationSubmit.class)
     public RtMarkMessage<OrderSuccessVO> createOrderPayment(@Valid @RequestBody Object req) {
-        OrderPaymentCO orderPaymentCO = JsonUtils.convertValue(req, OrderPaymentCO.class);
-        RtMallValidateUtils.valid(orderPaymentCO);
-        return RtMarkMessage.success(mallBizPaymentService.createOrderPayment(orderPaymentCO));
+        OrderCO orderCo = JsonUtils.convertValue(req, OrderCO.class);
+        orderCo.setOrderType(OrderType.OFFLINE_SCAN.code);
+        RtMallValidateUtils.valid(orderCo);
+        return RtMarkMessage.success(mallBizOrderService.createOrder(List.of(orderCo)));
     }
     /**
@@ -32,4 +32,10 @@ public interface MallBizOrderDao extends MybatisMapperSupport {
     void batchInsert(@Param("list") List<MallBizOrder> mallBizOrders);
     MallBizOrder findByOrderIdAndTradeId(String orderId, String tradeId);
+
+    List<MallBizOrder> listByOrderIds(@Param("list") List<String> list, @Param("source") Integer source);
+
+    void batchUpdate(@Param("list") List<MallBizOrder> updateOrders, @Param("source") Integer source);
+
+    void updateByIds(@Param("ids") List<Long> bizOrderIds, @Param("state") Integer state);
 }
@@ -2,6 +2,7 @@ package com.diligrp.cashier.mall.dao;
 import com.diligrp.cashier.mall.model.MallBizPayment;
 import com.diligrp.cashier.shared.mybatis.MybatisMapperSupport;
+import org.apache.ibatis.annotations.Param;
 /**
  * MallBizPaymentDao
@@ -21,5 +22,7 @@ public interface MallBizPaymentDao extends MybatisMapperSupport {
     int updateByPrimaryKey(MallBizPayment record);
+    MallBizPayment getByPayTradeId(@Param("tradeId") String tradeId);
+
     MallBizPayment findByOrderIdAndTradeId(String orderId, String tradeId);
 }
 package com.diligrp.cashier.mall.dao;
+import com.diligrp.cashier.mall.model.MallBizPayment;
 import com.diligrp.cashier.mall.model.MallBizPaymentOrder;
 import com.diligrp.cashier.shared.mybatis.MybatisMapperSupport;
 import org.apache.ibatis.annotations.Param;
@@ -26,4 +27,8 @@ public interface MallBizPaymentOrderDao extends MybatisMapperSupport {
     void batchInsert(@Param("list") List<MallBizPaymentOrder> mallBizPaymentOrders);
     MallBizPaymentOrder getMallBizPaymentOrder(MallBizPaymentOrder mallBizPaymentOrder);
+
+    List<MallBizPaymentOrder> listPaymentOrderByBizPaymentId(@Param("bizPaymentId") Long bizPaymentId);
+
+    void updateByPayment(MallBizPayment mallBizPayment);
 }
@@ -33,7 +33,12 @@ public class AuthLoginCO {
     /**
      * 商户编号
      */
-    @NotBlank(message = "商户编号不能为空！")
+    @NotNull(message = "市场不能为空！")
+    private Long firmId;
+
+    /**
+     * 商户id
+     */
     private String mchId;
     /**
@@ -105,6 +110,14 @@ public class AuthLoginCO {
         this.source = source;
     }
+    public Long getFirmId() {
+        return firmId;
+    }
+
+    public void setFirmId(Long firmId) {
+        this.firmId = firmId;
+    }
+
     public String getMchId() {
         return mchId;
     }
 package com.diligrp.cashier.mall.domain.rtmall.co;
 import com.diligrp.cashier.mall.domain.rtmall.RtMarkBaseCO;
-import com.diligrp.cashier.mall.util.TimestampToLocalDateTimeDeserializer;
+import com.diligrp.cashier.shared.jackson.deserializer.SecondToDateDeserializer;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -47,7 +47,7 @@ public class OrderPaymentCO extends RtMarkBaseCO {
      * 支付单创建时间
      */
     @NotNull(message = "order_time is required")
-    @JsonDeserialize(using = TimestampToLocalDateTimeDeserializer.class)
+    @JsonDeserialize(using = SecondToDateDeserializer.class)
     private LocalDateTime orderTime;
     /**
@@ -21,6 +21,11 @@ public class RefundCO extends RtMarkBaseCO {
     private String orderId;
     /**
+     * 支付流水号
+     */
+    private String tradeId;
+
+    /**
      * 业务侧退款单号
      */
     @NotBlank(message = "refund bn is required")
@@ -57,6 +62,14 @@ public class RefundCO extends RtMarkBaseCO {
         this.orderId = orderId;
     }
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public void setTradeId(String tradeId) {
+        this.tradeId = tradeId;
+    }
+
     public String getRefundBn() {
         return refundBn;
     }
@@ -18,6 +18,11 @@ public class RefundStatusCO extends RtMarkBaseCO {
     private String orderId;
     /**
+     * 支付流水号
+     */
+    private String tradeId;
+
+    /**
      * 业务侧退款单号
      */
     @NotBlank(message = "refund bn is required")
@@ -43,6 +48,14 @@ public class RefundStatusCO extends RtMarkBaseCO {
         this.orderId = orderId;
     }
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public void setTradeId(String tradeId) {
+        this.tradeId = tradeId;
+    }
+
     public String getUserCode() {
         return userCode;
     }
@@ -5,8 +5,8 @@ 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.diligrp.cashier.trade.type.TradeState;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.time.LocalDateTime;
@@ -73,7 +73,7 @@ public class HourlyRefundCallbackDTO extends RtMarkBaseCO {
         dto.setRefundBn(mallBizRefund.getRefundBn());
         dto.setRefundId(mallBizRefund.getRefundTradeId());
         dto.setPayFee(mallBizRefund.getRefundFee());
-        if (Objects.equals(mallBizRefund.getRefundState(), RefundState.SUCCESS.code)) {
+        if (Objects.equals(mallBizRefund.getRefundState(), TradeState.SUCCESS.getCode())) {
             dto.setRefundStatus("SUCCESS");
         } else {
             dto.setRefundStatus("ERROR");
@@ -27,6 +27,7 @@ public class RefundVO {
     /**
      * 退款状态
+     * @see com.diligrp.cashier.trade.type.TradeState
      */
     private Integer refundStatus;
@@ -29,6 +29,6 @@ public class MallExceptionHandler {
     @ExceptionHandler(Exception.class)
     public RtMarkMessage<?> exception(Exception ex) {
         LOG.warn("exception", ex);
-        return RtMarkMessage.failure(RtMarkErrorCode.E5000.getCode());
+        return RtMarkMessage.failure(RtMarkErrorCode.E5000.getCode(), RtMarkErrorCode.E5000.getMessage());
     }
 }
@@ -49,6 +49,11 @@ public class MallBizOrder extends BaseDO {
     private String channel;
     /**
+     * 市场id
+     */
+    private Long firmId;
+
+    /**
      * 商户ID
      */
     private String mchId;
@@ -179,6 +184,14 @@ public class MallBizOrder extends BaseDO {
         this.channel = channel;
     }
+    public Long getFirmId() {
+        return firmId;
+    }
+
+    public void setFirmId(Long firmId) {
+        this.firmId = firmId;
+    }
+
     public String getMchId() {
         return mchId;
     }
@@ -346,6 +359,7 @@ public class MallBizOrder extends BaseDO {
                     mallBizOrder.setId(snowflakeKeyManager.nextId(SnowflakeKey.MALL_BIZ_ORDER_ID));
                     mallBizOrder.setOrderNo(snowflakeKeyManager.nextId(SnowflakeKey.MALL_BIZ_ORDER_ID).toString());
+                    mallBizOrder.setOrderExpire(Optional.ofNullable(orderCo.getOrderExpire()).orElse(10));
                     BeanUtils.copyProperties(authLogin, mallBizOrder);
                     // 订单地址
@@ -2,14 +2,16 @@ package com.diligrp.cashier.mall.model;
 import com.diligrp.cashier.mall.domain.rtmall.vo.OrderPaymentVO;
 import com.diligrp.cashier.mall.property.RtMallDynamicProperty;
-import com.diligrp.cashier.mall.type.PayState;
+import com.diligrp.cashier.mall.type.OrderType;
 import com.diligrp.cashier.mall.util.MallSnowflakeKeyManager;
 import com.diligrp.cashier.shared.domain.BaseDO;
+import com.diligrp.cashier.shared.spi.domain.PaymentResultBO;
 import com.diligrp.cashier.shared.util.SpringContextUtils;
 import com.diligrp.cashier.trade.type.SnowflakeKey;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 /**
@@ -39,11 +41,21 @@ public class MallBizPayment extends BaseDO {
     private String tradeId;
     /**
+     * 用户code
+     */
+    private String userCode;
+
+    /**
      * dili交易流水号
      */
     private String payTradeId;
     /**
+     * 市场id
+     */
+    private Long firmId;
+
+    /**
      * 商户code
      */
     private String mchId;
@@ -85,7 +97,7 @@ public class MallBizPayment extends BaseDO {
     /**
      * 支付状态
-     * @see PayState
+     * @see com.diligrp.cashier.trade.type.TradeState
      */
     private Integer payState;
@@ -107,7 +119,12 @@ public class MallBizPayment extends BaseDO {
     private String cashierUrl;
     /**
-     * 支付回调url
+     * 三方支付成功回调页面
+     */
+    private String cashierResultUrl;
+
+    /**
+     * 支付成功回调外部url
      */
     private String paymentCallback;
@@ -136,7 +153,9 @@ public class MallBizPayment extends BaseDO {
         mallBizPayment.setBizOrderId(mallBizOrder.stream().map(vo -> vo.getId().toString()).collect(Collectors.joining(",")));
         mallBizPayment.setOrderId(mallBizOrder.stream().map(MallBizOrder::getOrderId).collect(Collectors.joining(",")));
         mallBizPayment.setTradeId(mallBizOrder.stream().flatMap(vo -> vo.getMallBizPaymentOrders().stream().map(MallBizPaymentOrder::getTradeId)).collect(Collectors.joining(",")));
+        mallBizPayment.setFirmId(mallBizOrder.getFirst().getFirmId());
         mallBizPayment.setMchId(mallBizOrder.getFirst().getMchId());
+        mallBizPayment.setUserCode(mallBizOrder.getFirst().getUserCode());
         long sum = mallBizOrder.stream().flatMap(vo -> vo.getMallBizPaymentOrders().stream().map(MallBizPaymentOrder::getPayFee)).mapToLong(vo -> vo).sum();
         mallBizPayment.setPayFee(sum);
@@ -146,6 +165,11 @@ public class MallBizPayment extends BaseDO {
         RtMallDynamicProperty.AppSecretDynamicProperty property = rtMallDynamicProperty.getBySourceAndType(mallBizOrder.getFirst().getSource(), mallBizOrder.getFirst().getOrderType());
         mallBizPayment.setPaymentCallback(property.getCallbackDomain());
+        // 大润发只支持一个订单单独结算 后期如何支持多订单组合支付
+        if (Objects.equals(mallBizOrder.getFirst().getOrderType(), OrderType.MINI_PROGRAM.code)) {
+            mallBizPayment.setCashierResultUrl(String.format(property.getCashierResultUrl(), mallBizOrder.getFirst().getOrderId()));
+        }
+
         // 完善mall_biz_payment_order
         List<MallBizPaymentOrder> bizPaymentOrders = mallBizOrder.stream()
                 .flatMap(vo -> vo.getMallBizPaymentOrders().stream())
@@ -189,6 +213,14 @@ public class MallBizPayment extends BaseDO {
         this.tradeId = tradeId;
     }
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
     public String getPayTradeId() {
         return payTradeId;
     }
@@ -197,6 +229,14 @@ public class MallBizPayment extends BaseDO {
         this.payTradeId = payTradeId;
     }
+    public Long getFirmId() {
+        return firmId;
+    }
+
+    public void setFirmId(Long firmId) {
+        this.firmId = firmId;
+    }
+
     public String getMchId() {
         return mchId;
     }
@@ -293,6 +333,14 @@ public class MallBizPayment extends BaseDO {
         this.cashierUrl = cashierUrl;
     }
+    public String getCashierResultUrl() {
+        return cashierResultUrl;
+    }
+
+    public void setCashierResultUrl(String cashierResultUrl) {
+        this.cashierResultUrl = cashierResultUrl;
+    }
+
     public String getPaymentCallback() {
         return paymentCallback;
     }
@@ -322,4 +370,18 @@ public class MallBizPayment extends BaseDO {
         orderPaymentVO.setTransactionId(payTradeId);
         return orderPaymentVO;
     }
+
+    /**
+     * payCallBack
+     */
+    public void payCallBack(PaymentResultBO event) {
+        this.setPayState(event.getState());
+        this.setPayTime(event.getWhen());
+        // TODO 2026/1/6: 先固定
+        this.setUsername("人工");
+        this.setExt(event.getPayerId());
+        this.setChannelId(event.getOutPayType());
+
+        // TODO 2026/1/6: 其它信息
+    }
 }
 package com.diligrp.cashier.mall.model;
 import com.diligrp.cashier.mall.domain.rtmall.vo.OrderPaymentVO;
+import com.diligrp.cashier.mall.type.PayState;
 import com.diligrp.cashier.shared.domain.BaseDO;
+import com.diligrp.cashier.trade.type.TradeState;
 import java.time.LocalDateTime;
@@ -47,7 +49,7 @@ public class MallBizPaymentOrder extends BaseDO {
     /**
      * 支付状态
-     * @see com.diligrp.cashier.mall.type.PayState
+     * @see TradeState
      */
     private Integer payState;
@@ -143,7 +145,7 @@ public class MallBizPaymentOrder extends BaseDO {
     public OrderPaymentVO ofOrderPaymentVO() {
         OrderPaymentVO orderPaymentVO = new OrderPaymentVO();
         orderPaymentVO.setOutTradeNo(payTradeNo);
-        orderPaymentVO.setPayStatus(payState);
+        orderPaymentVO.setPayStatus(PayState.convertState(payState));
         orderPaymentVO.setPayFee(payFee);
         orderPaymentVO.setPayTime(payTime);
         orderPaymentVO.setTransactionId(payTradeId);
@@ -3,7 +3,7 @@ package com.diligrp.cashier.mall.model;
 import com.diligrp.cashier.mall.domain.rtmall.co.RefundCO;
 import com.diligrp.cashier.mall.domain.rtmall.vo.RefundVO;
 import com.diligrp.cashier.mall.property.RtMallDynamicProperty;
-import com.diligrp.cashier.mall.type.RefundState;
+import com.diligrp.cashier.mall.type.PayState;
 import com.diligrp.cashier.mall.util.MallSnowflakeKeyManager;
 import com.diligrp.cashier.shared.domain.BaseDO;
 import com.diligrp.cashier.shared.util.SpringContextUtils;
@@ -46,6 +46,17 @@ public class MallBizRefund extends BaseDO {
     private String tradeId;
     /**
+     * 市场id
+     */
+    private Long firmId;
+
+    /**
+     * 商户code
+     */
+    private String mchId;
+
+
+    /**
      * dili退款流水号
      */
     private String refundTradeId;
@@ -92,7 +103,7 @@ public class MallBizRefund extends BaseDO {
     /**
      * 退款状态
-     * @see RefundState
+     * @see com.diligrp.cashier.trade.type.TradeState
      */
     private Integer refundState;
@@ -161,6 +172,23 @@ public class MallBizRefund extends BaseDO {
         this.tradeId = tradeId;
     }
+    public Long getFirmId() {
+        return firmId;
+    }
+
+    public void setFirmId(Long firmId) {
+        this.firmId = firmId;
+    }
+
+    public String getMchId() {
+        return mchId;
+    }
+
+    public void setMchId(String mchId) {
+        this.mchId = mchId;
+    }
+
+
     public String getRefundTradeId() {
         return refundTradeId;
     }
@@ -293,6 +321,8 @@ public class MallBizRefund extends BaseDO {
         BeanUtils.copyProperties(refundCo, mallBizRefund);
         mallBizRefund.setOrderId(mallBizOrder.getOrderId());
+        mallBizRefund.setFirmId(mallBizOrder.getFirmId());
+        mallBizRefund.setMchId(mallBizOrder.getMchId());
         mallBizRefund.setRefundTradeNo(snowflakeKeyManager.nextId(SnowflakeKey.MALL_BIZ_REFUND_ID).toString());
         mallBizRefund.setTradeId(mallBizPaymentOrder.getTradeId());
         mallBizRefund.setPayTradeNo(mallBizPaymentOrder.getPayTradeNo());
@@ -326,7 +356,7 @@ public class MallBizRefund extends BaseDO {
         refundVO.setOutRefundNo(this.getRefundTradeNo());
         refundVO.setOutTradeNo(this.getPayTradeNo());
         refundVO.setRefundFee(this.getRefundFee());
-        refundVO.setRefundStatus(this.getRefundState());
+        refundVO.setRefundStatus(PayState.convertState(this.getRefundState()));
         refundVO.setRefundTime(this.getRefundTime());
         refundVO.setRefuseReason(this.getRefuseReason());
         return refundVO;
@@ -30,6 +30,9 @@ public class RtMallDynamicProperty {
         @Value("${source:1}")
         private Integer source;
+        @Value("${mchId:}")
+        private String mchId;
+
         @Value("${orderType:3}")
         private Integer orderType;
@@ -62,6 +65,14 @@ public class RtMallDynamicProperty {
             this.source = source;
         }
+        public String getMchId() {
+            return mchId;
+        }
+
+        public void setMchId(String mchId) {
+            this.mchId = mchId;
+        }
+
         public String getAppKey() {
             return appKey;
         }
@@ -37,4 +37,11 @@ public interface MallBizOrderService {
      * getByOrderId
      */
     MallBizOrder getByOrderId(String orderId);
+
+    /**
+     * 通过业务获取订单ID
+     *
+     * @param bizOrderId 商务订单ID
+     */
+    MallBizOrder getById(Long bizOrderId);
 }
@@ -6,18 +6,23 @@ import com.diligrp.cashier.mall.domain.rtmall.vo.OrderSuccessVO;
 import com.diligrp.cashier.mall.model.MallBizPayment;
 import com.diligrp.cashier.mall.model.MallBizPaymentOrder;
+import java.util.List;
+
 /**
  * @ClassName MallBizPaymentService.java
  * @author dengwei
  * @version 1.0.0
  * @Description MallBizPaymentService
- * @date 2025-12-26 14:46
  */
 public interface MallBizPaymentService {
     void save(MallBizPayment mallBizPayment);
     MallBizPaymentOrder paymentOrderInfo(MallBizPaymentOrder mallBizPaymentOrder);
+    MallBizPayment getByPayTradeId(String tradeId);
+
+    List<MallBizPaymentOrder> listPaymentOrderByBizPaymentId(Long bizPaymentId);
+
     /**
      * 扫码下单接口
      * Pos扫支付码后，推送订单信息到商户，商户返回收银台链接
@@ -34,4 +39,6 @@ public interface MallBizPaymentService {
      * @param allocateCO 分摊回调请求
      */
     void handlePaymentAllocate(PaymentAllocateCO allocateCO);
+
+    void updateByPay(MallBizPayment mallBizPayment);
 }
 package com.diligrp.cashier.mall.service.biz;
+import com.diligrp.cashier.shared.spi.IPaymentEventListener;
+
 /**
  * @ClassName PayNotifyService.java
  * @author dengwei
  * @version 1.0.0
  * @Description PayNotifyService
  */
-public interface PayNotifyService {
+public interface PayNotifyService extends IPaymentEventListener {
 }
 package com.diligrp.cashier.mall.service.biz.impl;
-import cn.hutool.core.util.IdUtil;
 import com.diligrp.cashier.mall.MallConstants;
 import com.diligrp.cashier.mall.dao.MallBizOrderAddressDao;
 import com.diligrp.cashier.mall.dao.MallBizOrderDao;
@@ -19,8 +18,12 @@ import com.diligrp.cashier.mall.service.biz.MallBizOrderService;
 import com.diligrp.cashier.mall.service.biz.MallBizPaymentService;
 import com.diligrp.cashier.mall.type.OrderState;
 import com.diligrp.cashier.mall.type.RtMarkErrorCode;
+import com.diligrp.cashier.shared.spi.ICashierDeskManager;
+import com.diligrp.cashier.shared.spi.domain.CashierOrderBO;
+import com.diligrp.cashier.shared.spi.domain.PaymentUrlBO;
 import com.diligrp.cashier.shared.util.JsonUtils;
 import jakarta.annotation.Resource;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -29,8 +32,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 /**
  * @ClassName MallBizOrderServiceImpl.java
@@ -55,6 +60,8 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
     private MallBizOrderAddressDao mallBizOrderAddressDao;
     @Resource
     private MallBizOrderItemDao mallBizOrderItemDao;
+    @Resource
+    private ICashierDeskManager cashierDeskManager;
     /**
      * createOrder
@@ -71,8 +78,8 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
         // payment
         MallBizPayment mallBizPayment = MallBizPayment.of(mallBizOrders);
-        // TODO 2025/12/30: 预支付信息 收银台地址信息
-        mallBizPayment.setCashierUrl("https://cashier.test.gszdtop.com?payTradeNo=" + mallBizPayment.getPayTradeNo());
+        // 预支付信息 收银台地址信息
+        submitOrder(mallBizPayment, mallBizOrders);
         // save
         commonCreate(mallBizOrders, mallBizPayment);
@@ -137,16 +144,18 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
      */
     public void commonCreate(final List<MallBizOrder> mallBizOrders,
                              final MallBizPayment mallBizPayment) {
-        // order
-        Optional.of(mallBizOrders)
-                .ifPresent(mallBizOrderDao::batchInsert);
-
-        // mall_biz_order_address
-        List<MallBizOrderAddress> mallBizOrderAddresses = mallBizOrders.stream().map(MallBizOrder::getMallBizOrderAddress).toList();
-        Optional.of(mallBizOrderAddresses)
-                .ifPresent(mallBizOrderAddress -> {
-                    mallBizOrderAddressDao.batchInsert(mallBizOrderAddress);
-                });
+        if (CollectionUtils.isEmpty(mallBizOrders)) {
+            return;
+        }
+
+        // order - 扫码购存在相同订单重复扫码下单接口
+        List<MallBizOrder> existOrders = mallBizOrderDao.listByOrderIds(mallBizOrders.stream().map(MallBizOrder::getOrderId).toList(), mallBizOrders.getFirst().getSource());
+
+        // save
+        batchInsert(mallBizOrders, existOrders);
+
+        // update
+        batchUpdate(mallBizOrders, existOrders);
         // mall_biz_order_item
         List<MallBizOrderItem> orderItems = mallBizOrders.stream().flatMap(vo -> vo.getMallBizOrderItems().stream()).toList();
@@ -181,4 +190,71 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
         }
         return mallBizOrder;
     }
+
+    @Override
+    public MallBizOrder getById(Long bizOrderId) {
+        MallBizOrder mallBizOrder = mallBizOrderDao.selectByPrimaryKey(bizOrderId);
+        if (Objects.isNull(mallBizOrder)) {
+            throw new RtMartMallException(RtMarkErrorCode.E5004);
+        }
+        return mallBizOrder;
+    }
+
+
+    /**
+     * batchInsert
+     */
+    private void batchInsert(List<MallBizOrder> mallBizOrders,
+                             List<MallBizOrder> existOrders) {
+        List<String> existOrderIds = existOrders.stream().map(MallBizOrder::getOrderId).toList();
+
+        List<MallBizOrder> saveOrders = mallBizOrders.stream().filter(vo -> !existOrderIds.contains(vo.getOrderId())).toList();
+        if (CollectionUtils.isNotEmpty(saveOrders)) {
+            mallBizOrderDao.batchInsert(saveOrders);
+
+            // mall_biz_order_address
+            List<MallBizOrderAddress> mallBizOrderAddresses = mallBizOrders.stream().map(MallBizOrder::getMallBizOrderAddress).toList();
+            Optional.of(mallBizOrderAddresses)
+                    .ifPresent(mallBizOrderAddress -> {
+                        mallBizOrderAddressDao.batchInsert(mallBizOrderAddress);
+                    });
+        }
+    }
+
+    /**
+     * batchUpdate
+     */
+    private void batchUpdate(final List<MallBizOrder> mallBizOrders,
+                             final List<MallBizOrder> existOrders) {
+        List<String> existOrderIds = existOrders.stream().map(MallBizOrder::getOrderId).toList();
+
+        List<MallBizOrder> updateOrders = mallBizOrders.stream().filter(vo -> existOrderIds.contains(vo.getOrderId())).toList();
+        if (CollectionUtils.isNotEmpty(updateOrders)) {
+            mallBizOrderDao.batchUpdate(updateOrders, mallBizOrders.getFirst().getSource());
+        }
+    }
+
+    /**
+     * submitOrder
+     */
+    private void submitOrder(final MallBizPayment mallBizPayment,
+                             final List<MallBizOrder> mallBizOrders) {
+        CashierOrderBO cashierOrderBO = new CashierOrderBO();
+        cashierOrderBO.setMchId(Long.valueOf(mallBizPayment.getMchId()));
+        cashierOrderBO.setUserId(mallBizPayment.getUserCode());
+        cashierOrderBO.setCashierType(2);
+        cashierOrderBO.setGoods("大润发支付");
+        cashierOrderBO.setAmount(mallBizPayment.getPayFee());
+        cashierOrderBO.setOutTradeNo(mallBizPayment.getPayTradeNo());
+        // 支付成功跳转页面
+        cashierOrderBO.setRedirectUrl(mallBizPayment.getCashierResultUrl());
+        cashierOrderBO.setDescription("大润发在线支付");
+        cashierOrderBO.setAttach("大润发在线支付");
+        cashierOrderBO.setTimeout(mallBizOrders.getFirst().getOrderExpire() * 1000);
+        PaymentUrlBO paymentUrlBO = cashierDeskManager.submitOrder(cashierOrderBO);
+        Optional.ofNullable(paymentUrlBO).ifPresent(vo -> {
+            mallBizPayment.setCashierUrl(vo.paymentUrl());
+            mallBizPayment.setPayTradeId(vo.tradeId());
+        });
+    }
 }
@@ -6,6 +6,7 @@ import com.diligrp.cashier.mall.dao.MallBizOrderDao;
 import com.diligrp.cashier.mall.dao.MallBizOrderItemDao;
 import com.diligrp.cashier.mall.dao.MallBizPaymentDao;
 import com.diligrp.cashier.mall.dao.MallBizPaymentOrderDao;
+import com.diligrp.cashier.mall.exception.RtMartMallException;
 import com.diligrp.cashier.mall.domain.rtmall.co.AuthLoginCO;
 import com.diligrp.cashier.mall.domain.rtmall.co.OrderInfoCO;
 import com.diligrp.cashier.mall.domain.rtmall.co.OrderPaymentCO;
@@ -21,6 +22,7 @@ import com.diligrp.cashier.mall.model.MallBizPaymentOrder;
 import com.diligrp.cashier.mall.property.MallDynamicProperty;
 import com.diligrp.cashier.mall.property.RtMallDynamicProperty;
 import com.diligrp.cashier.mall.service.biz.MallBizPaymentService;
+import com.diligrp.cashier.mall.type.RtMarkErrorCode;
 import com.diligrp.cashier.mall.type.OrderState;
 import com.diligrp.cashier.mall.type.PayState;
 import com.diligrp.cashier.mall.type.RtMarkErrorCode;
@@ -37,6 +39,9 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -87,6 +92,26 @@ public class MallBizPaymentServiceImpl implements MallBizPaymentService {
     }
     /**
+     * getByPayTradeId
+     */
+    @Override
+    public MallBizPayment getByPayTradeId(String tradeId) {
+        MallBizPayment mallBizPayment = mallBizPaymentDao.getByPayTradeId(tradeId);
+        if (Objects.isNull(mallBizPayment)) {
+            throw new RtMartMallException(RtMarkErrorCode.E5004);
+        }
+        return mallBizPayment;
+    }
+
+    /**
+     * getMallBizPaymentOrderByBizPaymentId
+     */
+    @Override
+    public List<MallBizPaymentOrder> listPaymentOrderByBizPaymentId(Long bizPaymentId) {
+        return mallBizPaymentOrderDao.listPaymentOrderByBizPaymentId(bizPaymentId);
+    }
+
+    /**
      * 扫码下单接口
      * Pos扫支付码后，推送订单信息到商户，商户返回收银台链接
      * 创建订单（商品为空，待分摊后同步）+ 支付记录
@@ -225,6 +250,15 @@ public class MallBizPaymentServiceImpl implements MallBizPaymentService {
     }
     /**
+     * updateByPayment
+     */
+    @Override
+    public void updateByPay(MallBizPayment mallBizPayment) {
+        mallBizPaymentDao.updateByPrimaryKeySelective(mallBizPayment);
+        mallBizPaymentOrderDao.updateByPayment(mallBizPayment);
+    }
+
+    /**
      * 处理单个支付流水的分摊通知
      * 1. 调用大润发订单详情接口获取商品信息
      * 2. 更新订单状态
 package com.diligrp.cashier.mall.service.biz.impl;
+import com.diligrp.cashier.mall.context.MallInitializeContext;
+import com.diligrp.cashier.mall.model.MallBizOrder;
+import com.diligrp.cashier.mall.model.MallBizPayment;
+import com.diligrp.cashier.mall.service.biz.MallBizOrderService;
+import com.diligrp.cashier.mall.service.biz.MallBizPaymentService;
 import com.diligrp.cashier.mall.service.biz.PayNotifyService;
+import com.diligrp.cashier.shared.annotation.ParamLogPrint;
+import com.diligrp.cashier.shared.spi.domain.PaymentResultBO;
+import com.diligrp.cashier.shared.spi.domain.RefundResultBO;
+import jakarta.annotation.Resource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 /**
@@ -12,4 +23,36 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class PayNotifyServiceImpl implements PayNotifyService {
+    private static final Logger log = LoggerFactory.getLogger(PayNotifyServiceImpl.class);
+
+    @Resource
+    private MallBizOrderService mallBizOrderService;
+    @Resource
+    private MallBizPaymentService mallBizPaymentService;
+
+    /**
+     * onEvent
+     * 支付成功回调
+     */
+    @Override
+    @ParamLogPrint(desc = "PaymentResultBO")
+    public void onEvent(PaymentResultBO event) {
+        String tradeId = event.getTradeId();
+        MallBizPayment mallBizPayment = mallBizPaymentService.getByPayTradeId(tradeId);
+
+        Long bizOrderId = Long.valueOf(mallBizPayment.getBizOrderId().split(",")[0]);
+        MallBizOrder mallBizOrder = mallBizOrderService.getById(bizOrderId);
+
+        MallInitializeContext.getBySource(mallBizOrder.getSource()).paymentOnEvent(event, mallBizPayment);
+    }
+
+    /**
+     * onEvent
+     * 退款成功回调
+     */
+    @Override
+    @ParamLogPrint(desc = "RefundResultBO")
+    public void onEvent(RefundResultBO event) {
+
+    }
 }
@@ -16,8 +16,8 @@ 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.spi.domain.PaymentResultBO;
 import com.diligrp.cashier.shared.util.DateUtils;
 import com.diligrp.cashier.shared.util.JsonUtils;
 import jakarta.annotation.Resource;
@@ -27,6 +27,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -101,7 +103,7 @@ public abstract class AbstractSourceChannel {
         MallBizRefund refund = MallBizRefund.of(refundCo, mallBizOrder, mallBizPaymentOrder);
         // 售前取消 需不需要通知支付进行取消预支付信息
         if (ObjectUtils.notEqual(mallBizPaymentOrder.getPayState(), PayState.PENDING.code)) {
-            refund.setRefundState(RefundState.SUCCESS.code);
+            refund.setRefundState(PayState.SUCCESS.code);
         } else {
             // 支付成功才能退款
             if (ObjectUtils.notEqual(mallBizPaymentOrder.getPayState(), PayState.SUCCESS.code)) {
@@ -117,6 +119,25 @@ public abstract class AbstractSourceChannel {
     }
     /**
+     * paymentOnEvent
+     * 支付成功回调
+     */
+    @Transactional(rollbackFor = {Exception.class})
+    public void paymentOnEvent(PaymentResultBO event, MallBizPayment mallBizPayment) {
+        log.info("paymentOnEvent event: {} mallBizPayment: {}", JsonUtils.toJsonString(event), JsonUtils.toJsonString(mallBizPayment));
+        // update mall_biz_order
+        List<Long> bizOrderIds = Arrays.stream(mallBizPayment.getBizOrderId().split(",")).map(Long::valueOf).toList();
+        mallBizOrderDao.updateByIds(bizOrderIds, PayState.SUCCESS.code);
+
+        // update mall_biz_payment
+        mallBizPayment.payCallBack(event);
+        mallBizPaymentService.updateByPay(mallBizPayment);
+
+        // notify other channel
+        payCallBack(event, mallBizPayment);
+    }
+
+    /**
      * 渠道
      */
     public abstract Integer source();
@@ -134,7 +155,7 @@ public abstract class AbstractSourceChannel {
     /**
      * payCallBack
      */
-    public abstract void payCallBack(MallBizOrder mallBizOrder, MallBizPayment mallBizPayment, MallBizPaymentOrder mallBizPaymentOrder);
+    public abstract void payCallBack(PaymentResultBO event, MallBizPayment mallBizPayment);
     /**
      * refundCallBack
@@ -14,14 +14,17 @@ 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.spi.domain.PaymentResultBO;
 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.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
+import java.util.List;
 import java.util.Map;
 /**
@@ -40,6 +43,7 @@ public class RtMallChannel extends AbstractSourceChannel {
     public String authUrl(AuthLoginCO authLogin, String token, long timestamp) {
         RtMallDynamicProperty.AppSecretDynamicProperty property = rtMallDynamicProperty.getBySourceAndType(authLogin.getSource(), authLogin.getOrderType());
         log.info("authUrl property: {}", JsonUtils.toJsonString(property));
+        authLogin.setMchId(property.getMchId());
         // 替换参数
         String authUrl = property.getAuthUrl();
@@ -68,19 +72,38 @@ public class RtMallChannel extends AbstractSourceChannel {
     /**
      * payCallBack
+     */
+    @Override
+    public void payCallBack(PaymentResultBO event, MallBizPayment mallBizPayment) {
+        Long bizOrderId = Long.valueOf(mallBizPayment.getBizOrderId().split(",")[0]);
+        MallBizOrder mallBizOrder = mallBizOrderDao.selectByPrimaryKey(bizOrderId);
+
+        List<MallBizPaymentOrder> mallBizPaymentOrders = mallBizPaymentService.listPaymentOrderByBizPaymentId(mallBizPayment.getId());
+        if (CollectionUtils.isNotEmpty(mallBizPaymentOrders)) {
+            payCallBack(mallBizOrder, mallBizPayment, mallBizPaymentOrders.get(0));
+        }
+    }
+
+    /**
+     * 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");
+        RtMarkMessage<?> message = null;
+        try {
+            message = HttpClientUtils.postJson(mallBizPayment.getPaymentCallback(), hourlyPaymentCallback, null, new TypeReference<>() {
+            }, "rt-mall");
+        } catch (Exception e) {
+            // 失败-前期未考虑重试 人工补偿重试！！
+            log.warn("payCallBack failed: {}", JsonUtils.toJsonString(hourlyPaymentCallback), e);
+        }
         log.info("payCallBack message: {}", JsonUtils.toJsonString(message));
     }
 package com.diligrp.cashier.mall.type;
+import com.diligrp.cashier.mall.exception.RtMartMallException;
+import com.diligrp.cashier.trade.type.TradeState;
+
+import java.util.Arrays;
+import java.util.Objects;
+
 /**
  * @ClassName PayStatus.java
  * @author dengwei
@@ -8,17 +14,19 @@ package com.diligrp.cashier.mall.type;
  * @date 2025-12-26 11:01
  */
 public enum PayState {
-    PENDING(0, "待支付"),
-    SUCCESS(1, "成功"),
-    FAILED(2, "失败"),
+    PENDING(0, "待支付", TradeState.PENDING),
+    SUCCESS(1, "成功", TradeState.SUCCESS),
+    FAILED(2, "失败", TradeState.FAILED),
     ;
     public final int code;
     public final String description;
+    public final TradeState tradeState;
-    PayState(int code, String description) {
+    PayState(int code, String description, TradeState tradeState) {
         this.code = code;
         this.description = description;
+        this.tradeState = tradeState;
     }
     public int getCode() {
@@ -28,4 +36,18 @@ public enum PayState {
     public String getDescription() {
         return description;
     }
+
+    public TradeState getTradeState() {
+        return tradeState;
+    }
+
+    /**
+     * 根据支付返回code转换为三方业务系统code
+     */
+    public static Integer convertState(Integer tradeState) {
+        return Arrays.stream(values()).filter(vo -> Objects.equals(tradeState, vo.getTradeState().getCode()))
+                .map(PayState::getCode)
+                .findFirst()
+                .orElseThrow(() -> new RtMartMallException(RtMarkErrorCode.E5003));
+    }
 }
-package com.diligrp.cashier.mall.type;
-
-/**
- * @ClassName RefundStatus.java
- * @author dengwei
- * @version 1.0.0
- * @Description RefundStatus
- * @date 2025-12-26 11:08
- */
-public enum RefundState {
-    PENDING(0, "待退款"),
-    SUCCESS(1, "成功"),
-    FAILED(2, "失败"),
-    ;
-
-    public final int code;
-    public final String description;
-
-    RefundState(int code, String description) {
-        this.code = code;
-        this.description = description;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-}
-package com.diligrp.cashier.mall.util;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-
-import java.io.IOException;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-
-/**
- * 时间戳转LocalDateTime
- */
-public class TimestampToLocalDateTimeDeserializer extends JsonDeserializer<LocalDateTime> {
-    @Override
-    public LocalDateTime deserialize(JsonParser p, DeserializationContext ctx)
-            throws IOException {
-        long epochSecond = p.getLongValue();
-
-        return LocalDateTime.ofInstant(
-                Instant.ofEpochSecond(epochSecond),
-                ZoneId.systemDefault());
-    }
-}
@@ -7,6 +7,7 @@
     <result column="order_id" jdbcType="VARCHAR" property="orderId" />
     <result column="trade_id" jdbcType="VARCHAR" property="tradeId" />
     <result column="channel" jdbcType="VARCHAR" property="channel" />
+    <result column="firm_id" jdbcType="VARCHAR" property="firmId" />
     <result column="mch_id" jdbcType="VARCHAR" property="mchId" />
     <result column="source" jdbcType="TINYINT" property="source" />
     <result column="order_type" jdbcType="TINYINT" property="orderType" />
@@ -28,7 +29,7 @@
     <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, order_no, order_id, trade_id, channel, mch_id, source, order_type, user_code,
+    id, order_no, order_id, trade_id, channel, firm_id, mch_id, source, order_type, user_code,
     username, company_code, shop_code, shop_name, total_amount, freight_fee, discount_fee, state,
     rtmart_state, order_time, order_expire, version, created_time, modifier_name, modified_time
   </sql>
@@ -263,15 +264,9 @@
       <if test="orderExpire != null">
         order_expire = #{orderExpire,jdbcType=INTEGER},
       </if>
-      <if test="createdTime != null">
-        created_time = #{createdTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="modifierName != null">
         modifier_name = #{modifierName,jdbcType=VARCHAR},
       </if>
-      <if test="modifiedTime != null">
-        modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
-      </if>
       version = version + 1,
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -305,7 +300,7 @@
     <insert id="batchInsert">
         insert into mall_biz_order (id, order_no, order_id,
-                                    trade_id, channel, mch_id,
+                                    trade_id, channel, firm_id, mch_id,
                                     source, order_type, user_code,
                                     username, company_code, shop_code,
                                     shop_name, total_amount, freight_fee,
@@ -317,6 +312,7 @@
             #{item.orderId,jdbcType=VARCHAR},
             #{item.tradeId,jdbcType=VARCHAR},
             #{item.channel,jdbcType=VARCHAR},
+            #{item.firmId,jdbcType=VARCHAR},
             #{item.mchId,jdbcType=VARCHAR},
             #{item.source,jdbcType=TINYINT},
             #{item.orderType,jdbcType=TINYINT},
@@ -391,4 +387,41 @@
         and trade_id = #{tradeId,jdbcType=VARCHAR}
         limit 1
     </select>
+
+    <select id="listByOrderIds" resultType="com.diligrp.cashier.mall.model.MallBizOrder">
+        select <include refid="Base_Column_List"/>
+        from mall_biz_order
+        where order_id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and source = #{source}
+    </select>
+
+    <update id="batchUpdate">
+        update mall_biz_order
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="total_amount = case" suffix="end,">
+                <foreach collection="list" item="item" index="index">
+                    when id = #{item.id} then total_amount +  #{item.totalAmount}
+                </foreach>
+            </trim>
+        </trim>
+        <where>
+            and id in
+            <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+                #{item.id}
+            </foreach>
+            and source = #{source}
+        </where>
+    </update>
+
+    <update id="updateByIds">
+        update mall_biz_order
+        set state = #{state}
+        where id in
+        <foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
 </mapper>
 <?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.cashier.mall.dao.MallBizPaymentDao">
-  <resultMap id="BaseResultMap" type="com.diligrp.cashier.mall.model.MallBizPayment">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="pay_trade_no" jdbcType="VARCHAR" property="payTradeNo" />
-    <result column="biz_order_id" jdbcType="BIGINT" property="bizOrderId" />
-    <result column="order_id" jdbcType="VARCHAR" property="orderId" />
-    <result column="trade_id" jdbcType="VARCHAR" property="tradeId" />
-    <result column="pay_trade_id" jdbcType="VARCHAR" property="payTradeId" />
-    <result column="mch_id" jdbcType="VARCHAR" property="mchId" />
-    <result column="card_no" jdbcType="VARCHAR" property="cardNo" />
-    <result column="username" jdbcType="VARCHAR" property="username" />
-    <result column="user_id" jdbcType="BIGINT" property="userId" />
-    <result column="account_id" jdbcType="BIGINT" property="accountId" />
-    <result column="fund_account_id" jdbcType="BIGINT" property="fundAccountId" />
-    <result column="pay_fee" jdbcType="BIGINT" property="payFee" />
-    <result column="pay_state" jdbcType="TINYINT" property="payState" />
-    <result column="pay_time" jdbcType="TIMESTAMP" property="payTime" />
-    <result column="channel_id" jdbcType="TINYINT" property="channelId" />
-    <result column="cashier_url" jdbcType="VARCHAR" property="cashierUrl" />
-    <result column="payment_callback" jdbcType="VARCHAR" property="paymentCallback" />
-    <result column="version" jdbcType="INTEGER" property="version" />
-    <result column="created_time" jdbcType="TIMESTAMP" property="createdTime" />
-    <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    id, pay_trade_no, biz_order_id, order_id, trade_id, pay_trade_id, mch_id, card_no,
-    username, user_id, account_id, fund_account_id, pay_fee, pay_state, pay_time, channel_id,
-    cashier_url, payment_callback, version, created_time, modified_time
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from mall_biz_payment
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <select id="findByOrderIdAndTradeId" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from mall_biz_payment
-    where order_id = #{orderId,jdbcType=VARCHAR}
-      and trade_id = #{tradeId,jdbcType=VARCHAR}
-    limit 1
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from mall_biz_payment
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <insert id="insert" parameterType="com.diligrp.cashier.mall.model.MallBizPayment">
-    insert into mall_biz_payment (id, pay_trade_no, biz_order_id,
-      order_id, trade_id, pay_trade_id,
-      mch_id, card_no, username,
-      user_id, account_id, fund_account_id,
-      pay_fee, pay_state, pay_time,
-      channel_id, cashier_url, payment_callback,
-      version, created_time, modified_time
-      )
-    values (#{id,jdbcType=BIGINT}, #{payTradeNo,jdbcType=VARCHAR}, #{bizOrderId,jdbcType=BIGINT},
-      #{orderId,jdbcType=VARCHAR}, #{tradeId,jdbcType=VARCHAR}, #{payTradeId,jdbcType=VARCHAR},
-      #{mchId,jdbcType=VARCHAR}, #{cardNo,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR},
-      #{userId,jdbcType=BIGINT}, #{accountId,jdbcType=BIGINT}, #{fundAccountId,jdbcType=BIGINT},
-      #{payFee,jdbcType=BIGINT}, #{payState,jdbcType=TINYINT}, #{payTime,jdbcType=TIMESTAMP},
-      #{channelId,jdbcType=TINYINT}, #{cashierUrl,jdbcType=VARCHAR}, #{paymentCallback,jdbcType=VARCHAR},
-      #{version,jdbcType=INTEGER}, #{createdTime,jdbcType=TIMESTAMP}, #{modifiedTime,jdbcType=TIMESTAMP}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.diligrp.cashier.mall.model.MallBizPayment">
-    insert into mall_biz_payment
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="payTradeNo != null">
-        pay_trade_no,
-      </if>
-      <if test="bizOrderId != null">
-        biz_order_id,
-      </if>
-      <if test="orderId != null">
-        order_id,
-      </if>
-      <if test="tradeId != null">
-        trade_id,
-      </if>
-      <if test="payTradeId != null">
-        pay_trade_id,
-      </if>
-      <if test="mchId != null">
-        mch_id,
-      </if>
-      <if test="cardNo != null">
-        card_no,
-      </if>
-      <if test="username != null">
-        username,
-      </if>
-      <if test="userId != null">
-        user_id,
-      </if>
-      <if test="accountId != null">
-        account_id,
-      </if>
-      <if test="fundAccountId != null">
-        fund_account_id,
-      </if>
-      <if test="payFee != null">
-        pay_fee,
-      </if>
-      <if test="payState != null">
-        pay_state,
-      </if>
-      <if test="payTime != null">
-        pay_time,
-      </if>
-      <if test="channelId != null">
-        channel_id,
-      </if>
-      <if test="cashierUrl != null">
-        cashier_url,
-      </if>
-      <if test="paymentCallback != null">
-        payment_callback,
-      </if>
-      <if test="version != null">
-        version,
-      </if>
-      <if test="createdTime != null">
-        created_time,
-      </if>
-      <if test="modifiedTime != null">
-        modified_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="payTradeNo != null">
-        #{payTradeNo,jdbcType=VARCHAR},
-      </if>
-      <if test="bizOrderId != null">
-        #{bizOrderId,jdbcType=BIGINT},
-      </if>
-      <if test="orderId != null">
-        #{orderId,jdbcType=VARCHAR},
-      </if>
-      <if test="tradeId != null">
-        #{tradeId,jdbcType=VARCHAR},
-      </if>
-      <if test="payTradeId != null">
-        #{payTradeId,jdbcType=VARCHAR},
-      </if>
-      <if test="mchId != null">
-        #{mchId,jdbcType=VARCHAR},
-      </if>
-      <if test="cardNo != null">
-        #{cardNo,jdbcType=VARCHAR},
-      </if>
-      <if test="username != null">
-        #{username,jdbcType=VARCHAR},
-      </if>
-      <if test="userId != null">
-        #{userId,jdbcType=BIGINT},
-      </if>
-      <if test="accountId != null">
-        #{accountId,jdbcType=BIGINT},
-      </if>
-      <if test="fundAccountId != null">
-        #{fundAccountId,jdbcType=BIGINT},
-      </if>
-      <if test="payFee != null">
-        #{payFee,jdbcType=BIGINT},
-      </if>
-      <if test="payState != null">
-        #{payState,jdbcType=TINYINT},
-      </if>
-      <if test="payTime != null">
-        #{payTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="channelId != null">
-        #{channelId,jdbcType=TINYINT},
-      </if>
-      <if test="cashierUrl != null">
-        #{cashierUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="paymentCallback != null">
-        #{paymentCallback,jdbcType=VARCHAR},
-      </if>
-      <if test="version != null">
-        #{version,jdbcType=INTEGER},
-      </if>
-      <if test="createdTime != null">
-        #{createdTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="modifiedTime != null">
-        #{modifiedTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.diligrp.cashier.mall.model.MallBizPayment">
-    update mall_biz_payment
-    <set>
-      <if test="payTradeNo != null">
-        pay_trade_no = #{payTradeNo,jdbcType=VARCHAR},
-      </if>
-      <if test="bizOrderId != null">
-        biz_order_id = #{bizOrderId,jdbcType=BIGINT},
-      </if>
-      <if test="orderId != null">
-        order_id = #{orderId,jdbcType=VARCHAR},
-      </if>
-      <if test="tradeId != null">
-        trade_id = #{tradeId,jdbcType=VARCHAR},
-      </if>
-      <if test="payTradeId != null">
-        pay_trade_id = #{payTradeId,jdbcType=VARCHAR},
-      </if>
-      <if test="mchId != null">
-        mch_id = #{mchId,jdbcType=VARCHAR},
-      </if>
-      <if test="cardNo != null">
-        card_no = #{cardNo,jdbcType=VARCHAR},
-      </if>
-      <if test="username != null">
-        username = #{username,jdbcType=VARCHAR},
-      </if>
-      <if test="userId != null">
-        user_id = #{userId,jdbcType=BIGINT},
-      </if>
-      <if test="accountId != null">
-        account_id = #{accountId,jdbcType=BIGINT},
-      </if>
-      <if test="fundAccountId != null">
-        fund_account_id = #{fundAccountId,jdbcType=BIGINT},
-      </if>
-      <if test="payFee != null">
-        pay_fee = #{payFee,jdbcType=BIGINT},
-      </if>
-      <if test="payState != null">
-        pay_state = #{payState,jdbcType=TINYINT},
-      </if>
-      <if test="payTime != null">
-        pay_time = #{payTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="channelId != null">
-        channel_id = #{channelId,jdbcType=TINYINT},
-      </if>
-      <if test="cashierUrl != null">
-        cashier_url = #{cashierUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="paymentCallback != null">
-        payment_callback = #{paymentCallback,jdbcType=VARCHAR},
-      </if>
-      <if test="version != null">
-        version = #{version,jdbcType=INTEGER},
-      </if>
-      <if test="createdTime != null">
-        created_time = #{createdTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="modifiedTime != null">
-        modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.diligrp.cashier.mall.model.MallBizPayment">
-    update mall_biz_payment
-    set pay_trade_no = #{payTradeNo,jdbcType=VARCHAR},
-      biz_order_id = #{bizOrderId,jdbcType=BIGINT},
-      order_id = #{orderId,jdbcType=VARCHAR},
-      trade_id = #{tradeId,jdbcType=VARCHAR},
-      pay_trade_id = #{payTradeId,jdbcType=VARCHAR},
-      mch_id = #{mchId,jdbcType=VARCHAR},
-      card_no = #{cardNo,jdbcType=VARCHAR},
-      username = #{username,jdbcType=VARCHAR},
-      user_id = #{userId,jdbcType=BIGINT},
-      account_id = #{accountId,jdbcType=BIGINT},
-      fund_account_id = #{fundAccountId,jdbcType=BIGINT},
-      pay_fee = #{payFee,jdbcType=BIGINT},
-      pay_state = #{payState,jdbcType=TINYINT},
-      pay_time = #{payTime,jdbcType=TIMESTAMP},
-      channel_id = #{channelId,jdbcType=TINYINT},
-      cashier_url = #{cashierUrl,jdbcType=VARCHAR},
-      payment_callback = #{paymentCallback,jdbcType=VARCHAR},
-      version = #{version,jdbcType=INTEGER},
-      created_time = #{createdTime,jdbcType=TIMESTAMP},
-      modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
+    <resultMap id="BaseResultMap" type="com.diligrp.cashier.mall.model.MallBizPayment">
+        <id column="id" jdbcType="BIGINT" property="id" />
+        <result column="pay_trade_no" jdbcType="VARCHAR" property="payTradeNo" />
+        <result column="biz_order_id" jdbcType="VARCHAR" property="bizOrderId" />
+        <result column="order_id" jdbcType="VARCHAR" property="orderId" />
+        <result column="trade_id" jdbcType="VARCHAR" property="tradeId" />
+        <result column="user_code" jdbcType="VARCHAR" property="userCode" />
+        <result column="pay_trade_id" jdbcType="VARCHAR" property="payTradeId" />
+        <result column="firm_id" jdbcType="VARCHAR" property="firmId" />
+        <result column="mch_id" jdbcType="VARCHAR" property="mchId" />
+        <result column="card_no" jdbcType="VARCHAR" property="cardNo" />
+        <result column="username" jdbcType="VARCHAR" property="username" />
+        <result column="user_id" jdbcType="BIGINT" property="userId" />
+        <result column="account_id" jdbcType="BIGINT" property="accountId" />
+        <result column="fund_account_id" jdbcType="BIGINT" property="fundAccountId" />
+        <result column="open_id" jdbcType="VARCHAR" property="openId" />
+        <result column="pay_fee" jdbcType="BIGINT" property="payFee" />
+        <result column="pay_state" jdbcType="TINYINT" property="payState" />
+        <result column="pay_time" jdbcType="TIMESTAMP" property="payTime" />
+        <result column="channel_id" jdbcType="TINYINT" property="channelId" />
+        <result column="cashier_url" jdbcType="VARCHAR" property="cashierUrl" />
+        <result column="payment_callback" jdbcType="VARCHAR" property="paymentCallback" />
+        <result column="version" jdbcType="INTEGER" property="version" />
+        <result column="created_time" jdbcType="TIMESTAMP" property="createdTime" />
+        <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
+    </resultMap>
+    <sql id="Base_Column_List">
+        id, pay_trade_no, biz_order_id, order_id, trade_id, pay_trade_id, firm_id, mch_id, card_no,
+    username, user_id, account_id, fund_account_id, open_id, pay_fee, pay_state, pay_time,
+    channel_id, cashier_url, payment_callback, version, created_time, modified_time
+    </sql>
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from mall_biz_payment
+        where id = #{id,jdbcType=BIGINT}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete
+        from mall_biz_payment
+        where id = #{id,jdbcType=BIGINT}
+    </delete>
+    <insert id="insert" parameterType="com.diligrp.cashier.mall.model.MallBizPayment">
+        insert into mall_biz_payment (id, pay_trade_no, biz_order_id,
+                                      order_id, trade_id, pay_trade_id,
+                                      firm_id, mch_id, card_no, username,
+                                      user_id, account_id, fund_account_id,
+                                      open_id, pay_fee, pay_state,
+                                      pay_time, channel_id, cashier_url,
+                                      payment_callback, version, created_time,
+                                      modified_time)
+        values (#{id,jdbcType=BIGINT}, #{payTradeNo,jdbcType=VARCHAR}, #{bizOrderId,jdbcType=VARCHAR},
+                #{orderId,jdbcType=VARCHAR}, #{tradeId,jdbcType=VARCHAR}, #{payTradeId,jdbcType=VARCHAR},
+                #{firmId,jdbcType=VARCHAR}, #{mchId,jdbcType=VARCHAR}, #{cardNo,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR},
+                #{userId,jdbcType=BIGINT}, #{accountId,jdbcType=BIGINT}, #{fundAccountId,jdbcType=BIGINT},
+                #{openId,jdbcType=VARCHAR}, #{payFee,jdbcType=BIGINT}, #{payState,jdbcType=TINYINT},
+                #{payTime,jdbcType=TIMESTAMP}, #{channelId,jdbcType=TINYINT}, #{cashierUrl,jdbcType=VARCHAR},
+                #{paymentCallback,jdbcType=VARCHAR}, #{version,jdbcType=INTEGER}, #{createdTime,jdbcType=TIMESTAMP},
+                #{modifiedTime,jdbcType=TIMESTAMP})
+    </insert>
+    <insert id="insertSelective" parameterType="com.diligrp.cashier.mall.model.MallBizPayment">
+        insert into mall_biz_payment
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="payTradeNo != null">
+                pay_trade_no,
+            </if>
+            <if test="bizOrderId != null">
+                biz_order_id,
+            </if>
+            <if test="orderId != null">
+                order_id,
+            </if>
+            <if test="tradeId != null">
+                trade_id,
+            </if>
+            <if test="userCode != null">
+                user_code,
+            </if>
+            <if test="payTradeId != null">
+                pay_trade_id,
+            </if>
+            <if test="firmId != null">
+                firm_id,
+            </if>
+            <if test="mchId != null">
+                mch_id,
+            </if>
+            <if test="cardNo != null">
+                card_no,
+            </if>
+            <if test="username != null">
+                username,
+            </if>
+            <if test="userId != null">
+                user_id,
+            </if>
+            <if test="accountId != null">
+                account_id,
+            </if>
+            <if test="fundAccountId != null">
+                fund_account_id,
+            </if>
+            <if test="openId != null">
+                open_id,
+            </if>
+            <if test="payFee != null">
+                pay_fee,
+            </if>
+            <if test="payState != null">
+                pay_state,
+            </if>
+            <if test="payTime != null">
+                pay_time,
+            </if>
+            <if test="channelId != null">
+                channel_id,
+            </if>
+            <if test="cashierUrl != null">
+                cashier_url,
+            </if>
+            <if test="paymentCallback != null">
+                payment_callback,
+            </if>
+            <if test="version != null">
+                version,
+            </if>
+            <if test="createdTime != null">
+                created_time,
+            </if>
+            <if test="modifiedTime != null">
+                modified_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=BIGINT},
+            </if>
+            <if test="payTradeNo != null">
+                #{payTradeNo,jdbcType=VARCHAR},
+            </if>
+            <if test="bizOrderId != null">
+                #{bizOrderId,jdbcType=VARCHAR},
+            </if>
+            <if test="orderId != null">
+                #{orderId,jdbcType=VARCHAR},
+            </if>
+            <if test="tradeId != null">
+                #{tradeId,jdbcType=VARCHAR},
+            </if>
+            <if test="userCode != null">
+                #{userCode,jdbcType=VARCHAR},
+            </if>
+            <if test="payTradeId != null">
+                #{payTradeId,jdbcType=VARCHAR},
+            </if>
+            <if test="firmId != null">
+                #{firmId,jdbcType=VARCHAR},
+            </if>
+            <if test="mchId != null">
+                #{mchId,jdbcType=VARCHAR},
+            </if>
+            <if test="cardNo != null">
+                #{cardNo,jdbcType=VARCHAR},
+            </if>
+            <if test="username != null">
+                #{username,jdbcType=VARCHAR},
+            </if>
+            <if test="userId != null">
+                #{userId,jdbcType=BIGINT},
+            </if>
+            <if test="accountId != null">
+                #{accountId,jdbcType=BIGINT},
+            </if>
+            <if test="fundAccountId != null">
+                #{fundAccountId,jdbcType=BIGINT},
+            </if>
+            <if test="openId != null">
+                #{openId,jdbcType=VARCHAR},
+            </if>
+            <if test="payFee != null">
+                #{payFee,jdbcType=BIGINT},
+            </if>
+            <if test="payState != null">
+                #{payState,jdbcType=TINYINT},
+            </if>
+            <if test="payTime != null">
+                #{payTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="channelId != null">
+                #{channelId,jdbcType=TINYINT},
+            </if>
+            <if test="cashierUrl != null">
+                #{cashierUrl,jdbcType=VARCHAR},
+            </if>
+            <if test="paymentCallback != null">
+                #{paymentCallback,jdbcType=VARCHAR},
+            </if>
+            <if test="version != null">
+                #{version,jdbcType=INTEGER},
+            </if>
+            <if test="createdTime != null">
+                #{createdTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="modifiedTime != null">
+                #{modifiedTime,jdbcType=TIMESTAMP},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.diligrp.cashier.mall.model.MallBizPayment">
+        update mall_biz_payment
+        <set>
+            <if test="payTradeNo != null">
+                pay_trade_no = #{payTradeNo,jdbcType=VARCHAR},
+            </if>
+            <if test="bizOrderId != null">
+                biz_order_id = #{bizOrderId,jdbcType=VARCHAR},
+            </if>
+            <if test="orderId != null">
+                order_id = #{orderId,jdbcType=VARCHAR},
+            </if>
+            <if test="tradeId != null">
+                trade_id = #{tradeId,jdbcType=VARCHAR},
+            </if>
+            <if test="payTradeId != null">
+                pay_trade_id = #{payTradeId,jdbcType=VARCHAR},
+            </if>
+            <if test="firmId != null">
+                firm_id = #{firmId,jdbcType=VARCHAR},
+            </if>
+            <if test="mchId != null">
+                mch_id = #{mchId,jdbcType=VARCHAR},
+            </if>
+            <if test="cardNo != null">
+                card_no = #{cardNo,jdbcType=VARCHAR},
+            </if>
+            <if test="username != null">
+                username = #{username,jdbcType=VARCHAR},
+            </if>
+            <if test="userId != null">
+                user_id = #{userId,jdbcType=BIGINT},
+            </if>
+            <if test="accountId != null">
+                account_id = #{accountId,jdbcType=BIGINT},
+            </if>
+            <if test="fundAccountId != null">
+                fund_account_id = #{fundAccountId,jdbcType=BIGINT},
+            </if>
+            <if test="openId != null">
+                open_id = #{openId,jdbcType=VARCHAR},
+            </if>
+            <if test="payFee != null">
+                pay_fee = #{payFee,jdbcType=BIGINT},
+            </if>
+            <if test="payState != null">
+                pay_state = #{payState,jdbcType=TINYINT},
+            </if>
+            <if test="payTime != null">
+                pay_time = #{payTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="channelId != null">
+                channel_id = #{channelId,jdbcType=TINYINT},
+            </if>
+            <if test="cashierUrl != null">
+                cashier_url = #{cashierUrl,jdbcType=VARCHAR},
+            </if>
+            <if test="paymentCallback != null">
+                payment_callback = #{paymentCallback,jdbcType=VARCHAR},
+            </if>
+            version = version + 1,
+        </set>
+        where id = #{id}
+        and version = #{version}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.diligrp.cashier.mall.model.MallBizPayment">
+        update mall_biz_payment
+        set pay_trade_no = #{payTradeNo,jdbcType=VARCHAR},
+            biz_order_id = #{bizOrderId,jdbcType=VARCHAR},
+            order_id = #{orderId,jdbcType=VARCHAR},
+            trade_id = #{tradeId,jdbcType=VARCHAR},
+            pay_trade_id = #{payTradeId,jdbcType=VARCHAR},
+            firm_id = #{firmId,jdbcType=VARCHAR},
+            mch_id = #{mchId,jdbcType=VARCHAR},
+            card_no = #{cardNo,jdbcType=VARCHAR},
+            username = #{username,jdbcType=VARCHAR},
+            user_id = #{userId,jdbcType=BIGINT},
+            account_id = #{accountId,jdbcType=BIGINT},
+            fund_account_id = #{fundAccountId,jdbcType=BIGINT},
+            open_id = #{openId,jdbcType=VARCHAR},
+            pay_fee = #{payFee,jdbcType=BIGINT},
+            pay_state = #{payState,jdbcType=TINYINT},
+            pay_time = #{payTime,jdbcType=TIMESTAMP},
+            channel_id = #{channelId,jdbcType=TINYINT},
+            cashier_url = #{cashierUrl,jdbcType=VARCHAR},
+            payment_callback = #{paymentCallback,jdbcType=VARCHAR},
+            version = #{version,jdbcType=INTEGER},
+            created_time = #{createdTime,jdbcType=TIMESTAMP},
+            modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
+        where id = #{id,jdbcType=BIGINT}
+    </update>
+
+    <select id="getByPayTradeId" resultType="com.diligrp.cashier.mall.model.MallBizPayment">
+        select
+        <include refid="Base_Column_List" />
+        from mall_biz_payment
+        where pay_trade_id = #{tradeId,jdbcType=VARCHAR}
+    </select>
+
 </mapper>
@@ -8,13 +8,13 @@
     <result column="biz_order_id" jdbcType="BIGINT" property="bizOrderId" />
     <result column="order_id" jdbcType="VARCHAR" property="orderId" />
     <result column="trade_id" jdbcType="VARCHAR" property="tradeId" />
-    <result column="pay_payment_id" jdbcType="VARCHAR" property="payPaymentId" />
+    <result column="pay_trade_id" jdbcType="VARCHAR" property="payTradeId" />
     <result column="pay_status" jdbcType="INTEGER" property="payState" />
     <result column="pay_fee" jdbcType="BIGINT" property="payFee" />
     <result column="pay_time" jdbcType="TIMESTAMP" property="payTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, biz_payment_id, pay_trade_no, biz_order_id, order_id, trade_id, pay_payment_id,
+    id, biz_payment_id, pay_trade_no, biz_order_id, order_id, trade_id, pay_trade_id,
     pay_state, pay_fee, pay_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -30,11 +30,11 @@
   <insert id="insert" parameterType="com.diligrp.cashier.mall.model.MallBizPaymentOrder">
     insert into mall_biz_payment_order (id, biz_payment_id, pay_trade_no,
       biz_order_id, order_id, trade_id,
-      pay_payment_id, pay_fee, pay_time
+      pay_trade_id, pay_fee, pay_time
       )
     values (#{id,jdbcType=BIGINT}, #{bizPaymentId,jdbcType=BIGINT}, #{payTradeNo,jdbcType=VARCHAR},
       #{bizOrderId,jdbcType=BIGINT}, #{orderId,jdbcType=VARCHAR}, #{tradeId,jdbcType=VARCHAR},
-      #{payPaymentId,jdbcType=VARCHAR}, #{payFee,jdbcType=BIGINT}, #{payTime,jdbcType=TIMESTAMP}
+      #{payTradeId,jdbcType=VARCHAR}, #{payFee,jdbcType=BIGINT}, #{payTime,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.diligrp.cashier.mall.model.MallBizPaymentOrder">
@@ -58,8 +58,8 @@
       <if test="tradeId != null">
         trade_id,
       </if>
-      <if test="payPaymentId != null">
-        pay_payment_id,
+      <if test="payTradeId != null">
+        pay_trade_id,
       </if>
       <if test="payFee != null">
         pay_fee,
@@ -87,8 +87,8 @@
       <if test="tradeId != null">
         #{tradeId,jdbcType=VARCHAR},
       </if>
-      <if test="payPaymentId != null">
-        #{payPaymentId,jdbcType=VARCHAR},
+      <if test="payTradeId != null">
+        #{payTradeId,jdbcType=VARCHAR},
       </if>
       <if test="payFee != null">
         #{payFee,jdbcType=BIGINT},
@@ -116,8 +116,8 @@
       <if test="tradeId != null">
         trade_id = #{tradeId,jdbcType=VARCHAR},
       </if>
-      <if test="payPaymentId != null">
-        pay_payment_id = #{payPaymentId,jdbcType=VARCHAR},
+      <if test="payTradeId != null">
+        pay_trade_id = #{payTradeId,jdbcType=VARCHAR},
       </if>
       <if test="payFee != null">
         pay_fee = #{payFee,jdbcType=BIGINT},
@@ -135,22 +135,21 @@
       biz_order_id = #{bizOrderId,jdbcType=BIGINT},
       order_id = #{orderId,jdbcType=VARCHAR},
       trade_id = #{tradeId,jdbcType=VARCHAR},
-      pay_payment_id = #{payPaymentId,jdbcType=VARCHAR},
+      pay_trade_id = #{payTradeId,jdbcType=VARCHAR},
       pay_fee = #{payFee,jdbcType=BIGINT},
       pay_time = #{payTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
   </update>
-
     <insert id="batchInsert" parameterType="java.util.List">
       insert into mall_biz_payment_order (id, biz_payment_id, pay_trade_no,
         biz_order_id, order_id, trade_id,
-        pay_payment_id, pay_fee, pay_time
+        pay_trade_id, pay_fee, pay_time
         )
       values
       <foreach collection="list" item="item" index="index" separator=",">
         (#{item.id,jdbcType=BIGINT}, #{item.bizPaymentId,jdbcType=BIGINT}, #{item.payTradeNo,jdbcType=VARCHAR},
           #{item.bizOrderId,jdbcType=BIGINT}, #{item.orderId,jdbcType=VARCHAR}, #{item.tradeId,jdbcType=VARCHAR},
-          #{item.payPaymentId,jdbcType=VARCHAR}, #{item.payFee,jdbcType=BIGINT}, #{item.payTime,jdbcType=TIMESTAMP}
+          #{item.payTradeId,jdbcType=VARCHAR}, #{item.payFee,jdbcType=BIGINT}, #{item.payTime,jdbcType=TIMESTAMP}
           )
       </foreach>
     </insert>
@@ -166,4 +165,21 @@
             </if>
         </where>
     </select>
+
+    <select id="listPaymentOrderByBizPaymentId"
+            resultType="com.diligrp.cashier.mall.model.MallBizPaymentOrder">
+        select
+        <include refid="Base_Column_List" />
+        from mall_biz_payment_order
+        where biz_payment_id = #{bizPaymentId}
+    </select>
+
+    <update id="updateByPayment">
+        update mall_biz_payment_order
+        set
+        pay_state = #{payState},
+        pay_time = #{payTime}
+        where biz_payment_id = #{id}
+    </update>
+
 </mapper>
@@ -8,8 +8,10 @@
     <result column="refund_bn" jdbcType="VARCHAR" property="refundBn" />
     <result column="order_id" jdbcType="VARCHAR" property="orderId" />
     <result column="trade_id" jdbcType="VARCHAR" property="tradeId" />
-    <result column="refund_payment_id" jdbcType="VARCHAR" property="refundPaymentId" />
-    <result column="pay_payment_id" jdbcType="VARCHAR" property="payPaymentId" />
+    <result column="firm_id" jdbcType="VARCHAR" property="firmId" />
+    <result column="mch_id" jdbcType="VARCHAR" property="mchId" />
+    <result column="refund_trade_id" jdbcType="VARCHAR" property="refundTradeId" />
+    <result column="pay_trade_id" jdbcType="VARCHAR" property="payTradeId" />
     <result column="refund_card_no" jdbcType="VARCHAR" property="refundCardNo" />
     <result column="refund_user_id" jdbcType="BIGINT" property="refundUserId" />
     <result column="refund_username" jdbcType="VARCHAR" property="refundUsername" />
@@ -26,8 +28,8 @@
     <result column="refuse_reason" jdbcType="VARCHAR" property="refuseReason" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, refund_trade_no, pay_trade_no, refund_bn, order_id, trade_id, refund_payment_id,
-    pay_payment_id, refund_card_no, refund_user_id, refund_username, refund_account_id,
+    id, refund_trade_no, pay_trade_no, refund_bn, order_id, trade_id, refund_trade_id,
+    pay_trade_id, refund_card_no, refund_user_id, refund_username, refund_account_id,
     refund_time, refund_fee, freight_fee, refund_state, refund_reason, refund_callback,
     version, creater_name, created_time, refuse_reason
   </sql>
@@ -44,7 +46,7 @@
   <insert id="insert" parameterType="com.diligrp.cashier.mall.model.MallBizRefund">
     insert into mall_biz_refund (id, refund_trade_no, pay_trade_no,
       refund_bn, order_id, trade_id,
-      refund_payment_id, pay_payment_id, refund_card_no,
+      refund_trade_id, pay_trade_id, refund_card_no,
       refund_user_id, refund_username, refund_account_id,
       refund_time, refund_fee, freight_fee,
       refund_state, refund_reason, refund_callback,
@@ -52,7 +54,7 @@
       refuse_reason)
     values (#{id,jdbcType=BIGINT}, #{refundTradeNo,jdbcType=VARCHAR}, #{payTradeNo,jdbcType=VARCHAR},
       #{refundBn,jdbcType=VARCHAR}, #{orderId,jdbcType=VARCHAR}, #{tradeId,jdbcType=VARCHAR},
-      #{refundPaymentId,jdbcType=VARCHAR}, #{payPaymentId,jdbcType=VARCHAR}, #{refundCardNo,jdbcType=VARCHAR},
+      #{refundTradeId,jdbcType=VARCHAR}, #{payTradeId,jdbcType=VARCHAR}, #{refundCardNo,jdbcType=VARCHAR},
       #{refundUserId,jdbcType=BIGINT}, #{refundUsername,jdbcType=VARCHAR}, #{refundAccountId,jdbcType=BIGINT},
       #{refundTime,jdbcType=TIMESTAMP}, #{refundFee,jdbcType=BIGINT}, #{freightFee,jdbcType=BIGINT},
       #{refundState,jdbcType=TINYINT}, #{refundReason,jdbcType=VARCHAR}, #{refundCallback,jdbcType=VARCHAR},
@@ -81,11 +83,11 @@
       <if test="tradeId != null">
         trade_id,
       </if>
-      <if test="refundPaymentId != null">
-        refund_payment_id,
+      <if test="refundTradeId != null">
+        refund_trade_id,
       </if>
-      <if test="payPaymentId != null">
-        pay_payment_id,
+      <if test="payTradeId != null">
+        pay_trade_id,
       </if>
       <if test="refundCardNo != null">
         refund_card_no,
@@ -149,11 +151,11 @@
       <if test="tradeId != null">
         #{tradeId,jdbcType=VARCHAR},
       </if>
-      <if test="refundPaymentId != null">
-        #{refundPaymentId,jdbcType=VARCHAR},
+      <if test="refundTradeId != null">
+        #{refundTradeId,jdbcType=VARCHAR},
       </if>
-      <if test="payPaymentId != null">
-        #{payPaymentId,jdbcType=VARCHAR},
+      <if test="payTradeId != null">
+        #{payTradeId,jdbcType=VARCHAR},
       </if>
       <if test="refundCardNo != null">
         #{refundCardNo,jdbcType=VARCHAR},
@@ -217,11 +219,11 @@
       <if test="tradeId != null">
         trade_id = #{tradeId,jdbcType=VARCHAR},
       </if>
-      <if test="refundPaymentId != null">
-        refund_payment_id = #{refundPaymentId,jdbcType=VARCHAR},
+      <if test="refundTradeId != null">
+        refund_trade_id = #{refundTradeId,jdbcType=VARCHAR},
       </if>
-      <if test="payPaymentId != null">
-        pay_payment_id = #{payPaymentId,jdbcType=VARCHAR},
+      <if test="payTradeId != null">
+        pay_trade_id = #{payTradeId,jdbcType=VARCHAR},
       </if>
       <if test="refundCardNo != null">
         refund_card_no = #{refundCardNo,jdbcType=VARCHAR},
@@ -275,8 +277,8 @@
       refund_bn = #{refundBn,jdbcType=VARCHAR},
       order_id = #{orderId,jdbcType=VARCHAR},
       trade_id = #{tradeId,jdbcType=VARCHAR},
-      refund_payment_id = #{refundPaymentId,jdbcType=VARCHAR},
-      pay_payment_id = #{payPaymentId,jdbcType=VARCHAR},
+      refund_trade_id = #{refundTradeId,jdbcType=VARCHAR},
+      pay_trade_id = #{payTradeId,jdbcType=VARCHAR},
       refund_card_no = #{refundCardNo,jdbcType=VARCHAR},
       refund_user_id = #{refundUserId,jdbcType=BIGINT},
       refund_username = #{refundUsername,jdbcType=VARCHAR},