扫码下单接口和分摊回调接口初步实现

guantingwei
1 parent 65220cfe
Showing 14 changed files with 1442 additions and 292 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/MallConfiguration.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/api/RtMallOrderPaymentApi.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/client/RtMallHttpClient.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/domain/rtmall/co/OrderPaymentCO.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/co/PaymentAllocateCO.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/vo/OrderDetailResponseVO.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/impl/MallBizOrderServiceImpl.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/MallBizPaymentServiceImpl.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/util/TimestampToLocalDateTimeDeserializer.java
cashier-mall/src/main/resources/com/diligrp/cashier/dao/mapper/MallBizOrderDao.xml
cashier-mall/src/main/resources/com/diligrp/cashier/dao/mapper/MallBizPaymentDao.xml
 package com.diligrp.cashier.mall;
+import com.diligrp.cashier.mall.client.RtMallHttpClient;
+import com.diligrp.cashier.mall.property.RtMallDynamicProperty;
 import com.diligrp.cashier.shared.mybatis.MybatisMapperSupport;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -10,4 +14,14 @@ import org.springframework.context.annotation.Configuration;
 @MapperScan(basePackages = {"com.diligrp.cashier.mall.dao"}, markerInterface = MybatisMapperSupport.class)
 public class MallConfiguration {
+    /**
+     * 创建大润发HTTP客户端
+     * 用于调用大润发订单详情接口
+     */
+    @Bean
+    public RtMallHttpClient rtMallHttpClient(@Value("${rtmall.api.url:https://em-shop.feiniugo.com/api/externalapi/scanbuy/process}") String apiUrl,
+                                             RtMallDynamicProperty rtMallDynamicProperty) {
+        RtMallDynamicProperty.AppSecretDynamicProperty config = rtMallDynamicProperty.getAppSecrets().getFirst();
+        return new RtMallHttpClient(apiUrl, config.getAppKey(), config.getAppSecret());
+    }
 }
+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.PaymentAllocateCO;
+import com.diligrp.cashier.mall.domain.rtmall.vo.OrderSuccessVO;
+import com.diligrp.cashier.mall.service.biz.MallBizPaymentService;
+import com.diligrp.cashier.mall.sign.RtMallSign;
+import com.diligrp.cashier.mall.util.RtMallValidateUtils;
+import com.diligrp.cashier.shared.annotation.ParamLogPrint;
+import com.diligrp.cashier.shared.annotation.RepeatSubmit;
+import com.diligrp.cashier.shared.annotation.Sign;
+import com.diligrp.cashier.shared.handler.duplication.SpelDuplicationSubmit;
+import com.diligrp.cashier.shared.util.JsonUtils;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+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;
+
+/**
+ * 扫码下单接口
+ * Pos扫支付码后，推送订单信息到商户，商户返回收银台链接
+ */
+@RestController
+@RequestMapping(path = {"/api/rt/mall/scan", "/rt/mall/scan"})
+@Validated
+public class RtMallOrderPaymentApi {
+
+    @Resource
+    private MallBizPaymentService mallBizPaymentService;
+
+    /**
+     * 扫码下单接口
+     * Pos扫支付码后，推送订单信息到商户，商户返回收银台链接
+     */
+    @PostMapping("/order/v1")
+    @ParamLogPrint(outPrint = true)
+    @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));
+    }
+
+    /**
+     * 支付分摊回调接口
+     * POS完成支付分摊后，调用此接口通知商户商品信息已就绪
+     */
+    @PostMapping("/status/callback")
+    @ParamLogPrint(outPrint = true)
+    @Sign(sign = RtMallSign.class)
+    @RepeatSubmit(prefix = "payment_allocate_callback:", value = {
+            "#req['trade_list'].![trade_id].![#root + #this]",}, duplicationSubmit = SpelDuplicationSubmit.class)
+    public RtMarkMessage<?> handlePaymentAllocate(@Valid @RequestBody Object req) {
+        PaymentAllocateCO allocateCO = JsonUtils.convertValue(req, PaymentAllocateCO.class);
+        RtMallValidateUtils.valid(allocateCO);
+        mallBizPaymentService.handlePaymentAllocate(allocateCO);
+        return RtMarkMessage.success();
+    }
+}
+package com.diligrp.cashier.mall.client;
+
+import com.diligrp.cashier.mall.domain.rtmall.vo.OrderDetailResponseVO;
+import com.diligrp.cashier.mall.exception.RtMartMallException;
+import com.diligrp.cashier.mall.util.HttpClientUtils;
+import com.diligrp.cashier.mall.util.RtMallSignMd5Utils;
+import com.diligrp.cashier.mall.type.RtMarkErrorCode;
+import com.diligrp.cashier.shared.util.JsonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 大润发HTTP客户端
+ * 调用大润发订单详情接口
+ */
+public class RtMallHttpClient {
+    private static final Logger log = LoggerFactory.getLogger(RtMallHttpClient.class);
+
+    private final String apiUrl;
+    private final String appKey;
+    private final String appSecret;
+
+    public RtMallHttpClient(String apiUrl, String appKey, String appSecret) {
+        this.apiUrl = apiUrl;
+        this.appKey = appKey;
+        this.appSecret = appSecret;
+    }
+
+    /**
+     * 查询订单详情
+     *
+     * @param orderId 订单号
+     * @param tradeId 支付流水号
+     * @param userCode 会员编号
+     * @return 订单详情
+     */
+    public OrderDetailResponseVO getOrderDetail(String orderId, String tradeId, String userCode) {
+        log.info("调用大润发订单详情接口: order_id={}, trade_id={}, user_code={}", orderId, tradeId, userCode);
+
+        //构建请求参数
+        Map<String, Object> params = new HashMap<>();
+        params.put("app_key", appKey);
+        params.put("version", "v1");
+        params.put("timestamp", System.currentTimeMillis() / 1000);
+        params.put("method", "scanbuy.order.detail");
+        params.put("user_code", userCode);
+        params.put("order_id", orderId);
+        params.put("trade_id", tradeId);
+
+        //生成签名
+        String sign = RtMallSignMd5Utils.generateSign(params, appSecret);
+        params.put("sign", sign);
+
+        //发送HTTP请求
+        String responseBody = HttpClientUtils.postJson(apiUrl, params, null, "大润发订单详情");
+
+        //解析响应
+        OrderDetailResponseVO detailResponse = JsonUtils.fromJsonString(responseBody, OrderDetailResponseVO.class);
+        if (detailResponse == null) {
+            log.error("解析大润发响应失败");
+            throw new RtMartMallException(RtMarkErrorCode.E4004);
+        }
+
+        //检查响应状态
+        if (!"success".equals(detailResponse.getResult()) || !"E0000".equals(detailResponse.getCode())) {
+            log.error("调用大润发订单详情接口失败: code={}, msg={}",
+                    detailResponse.getCode(), detailResponse.getMsg());
+            throw new RtMartMallException(detailResponse.getCode(), detailResponse.getMsg());
+        }
+
+        log.info("订单详情查询成功: order_id={}, item_count={}", orderId,
+                detailResponse.getData() != null && detailResponse.getData().getItemList() != null
+                        ? detailResponse.getData().getItemList().size() : 0);
+
+        return detailResponse;
+    }
+}
@@ -30,4 +30,6 @@ public interface MallBizOrderDao extends MybatisMapperSupport {
     MallBizOrder getByOrderId(@Param("orderId") String orderId);
     void batchInsert(@Param("list") List<MallBizOrder> mallBizOrders);
+
+    MallBizOrder findByOrderIdAndTradeId(String orderId, String tradeId);
 }
@@ -20,4 +20,6 @@ public interface MallBizPaymentDao extends MybatisMapperSupport {
     int updateByPrimaryKeySelective(MallBizPayment record);
     int updateByPrimaryKey(MallBizPayment record);
+
+    MallBizPayment findByOrderIdAndTradeId(String orderId, String tradeId);
 }
+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.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+import java.time.LocalDateTime;
+
+/**
+ * 扫码下单支付CO
+ */
+public class OrderPaymentCO extends RtMarkBaseCO {
+
+    /**
+     * 中台订单号
+     */
+    @NotBlank(message = "order_id is required")
+    private String orderId;
+
+    /**
+     * 中台支付流水号
+     */
+    @NotBlank(message = "trade_id is required")
+    private String tradeId;
+
+    /**
+     * 会员编号
+     */
+    @NotBlank(message = "user_code is required")
+    private String userCode;
+
+    /**
+     * 企业组编号
+     */
+    @NotBlank(message = "company_code is required")
+    private String companyCode;
+
+    /**
+     * 应付金额
+     */
+    @NotNull(message = "total_amount is required")
+    private Long totalAmount;
+
+    /**
+     * 支付单创建时间
+     */
+    @NotNull(message = "order_time is required")
+    @JsonDeserialize(using = TimestampToLocalDateTimeDeserializer.class)
+    private LocalDateTime orderTime;
+
+    /**
+     * 支付单类型: 1 线下扫码购，2 接口扫码购
+     */
+    @NotNull(message = "order_type is required")
+    private Integer orderType;
+
+    /**
+     * 门店编号
+     */
+    @NotBlank(message = "shop_code is required")
+    private String shopCode;
+
+    /**
+     * 门店名称
+     */
+    @NotBlank(message = "shop_name is required")
+    private String shopName;
+
+    /**
+     * 动态码,order_type=2时必填
+     */
+    private String dynamicCode;
+
+
+    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 getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public Long getTotalAmount() {
+        return totalAmount;
+    }
+
+    public void setTotalAmount(Long totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
+    public LocalDateTime getOrderTime() {
+        return orderTime;
+    }
+
+    public void setOrderTime(LocalDateTime orderTime) {
+        this.orderTime = orderTime;
+    }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
+    public String getShopCode() {
+        return shopCode;
+    }
+
+    public void setShopCode(String shopCode) {
+        this.shopCode = shopCode;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getDynamicCode() {
+        return dynamicCode;
+    }
+
+    public void setDynamicCode(String dynamicCode) {
+        this.dynamicCode = dynamicCode;
+    }
+}
+package com.diligrp.cashier.mall.domain.rtmall.co;
+
+import com.diligrp.cashier.mall.domain.rtmall.RtMarkBaseCO;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+
+import java.util.List;
+
+/**
+ * 支付分摊回调请求对象
+ * POS完成支付分摊后，调用此接口通知商户
+ */
+public class PaymentAllocateCO extends RtMarkBaseCO {
+    /**
+     * 支付流水列表
+     */
+    @NotEmpty(message = "trade_list is required")
+    @Valid
+    private List<TradeInfo> tradeList;
+
+    public List<TradeInfo> getTradeList() {
+        return tradeList;
+    }
+
+    public void setTradeList(List<TradeInfo> tradeList) {
+        this.tradeList = tradeList;
+    }
+
+    /**
+     * 支付流水信息
+     */
+    public static class TradeInfo {
+        /**
+         * 订单号
+         */
+        @JsonProperty("order_id")
+        @NotEmpty(message = "order_id is required")
+        private String orderId;
+
+        /**
+         * 支付流水号
+         */
+        @JsonProperty("trade_id")
+        @NotEmpty(message = "trade_id is required")
+        private String tradeId;
+
+        /**
+         * 会员编号
+         */
+        @JsonProperty("user_code")
+        @NotEmpty(message = "user_code is required")
+        private String userCode;
+
+        /**
+         * 企业组编号
+         */
+        @JsonProperty("company_code")
+        @NotEmpty(message = "company_code is required")
+        private String companyCode;
+
+        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 getUserCode() {
+            return userCode;
+        }
+
+        public void setUserCode(String userCode) {
+            this.userCode = userCode;
+        }
+
+        public String getCompanyCode() {
+            return companyCode;
+        }
+
+        public void setCompanyCode(String companyCode) {
+            this.companyCode = companyCode;
+        }
+    }
+}
+package com.diligrp.cashier.mall.domain.rtmall.vo;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+import java.util.List;
+
+/**
+ * 大润发订单详情接口响应
+ */
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class OrderDetailResponseVO {
+    /**
+     * 接口状态
+     */
+    private String result;
+
+    /**
+     * 状态码
+     */
+    private String code;
+
+    /**
+     * 状态描述
+     */
+    private String msg;
+
+    /**
+     * 返回数据
+     */
+    private OrderDetailData data;
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public OrderDetailData getData() {
+        return data;
+    }
+
+    public void setData(OrderDetailData data) {
+        this.data = data;
+    }
+
+    /**
+     * 订单详情数据
+     */
+    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+    public static class OrderDetailData {
+        /**
+         * 订单号
+         */
+        private String orderId;
+
+        /**
+         * 支付流水号
+         */
+        private String tradeId;
+
+        /**
+         * 店铺编号
+         */
+        private String shopCode;
+
+        /**
+         * 店铺名称
+         */
+        private String shopName;
+
+        /**
+         * 订单金额（分）
+         */
+        private Long totalAmount;
+
+        /**
+         * 会员手机号
+         */
+        private String mobile;
+
+        /**
+         * 商户会员编号
+         */
+        private String userCode;
+
+        /**
+         * 订单状态
+         */
+        private String orderStatus;
+
+        /**
+         * 订单创建时间
+         */
+        private String createTime;
+
+        /**
+         * 订单修改时间
+         */
+        private String updateTime;
+
+        /**
+         * 支付流水号
+         */
+        private String transactionId;
+
+        /**
+         * 支付状态
+         */
+        private String payStatus;
+
+        /**
+         * 商品列表
+         */
+        private List<OrderItem> itemList;
+
+        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 getShopCode() {
+            return shopCode;
+        }
+
+        public void setShopCode(String shopCode) {
+            this.shopCode = shopCode;
+        }
+
+        public String getShopName() {
+            return shopName;
+        }
+
+        public void setShopName(String shopName) {
+            this.shopName = shopName;
+        }
+
+        public Long getTotalAmount() {
+            return totalAmount;
+        }
+
+        public void setTotalAmount(Long totalAmount) {
+            this.totalAmount = totalAmount;
+        }
+
+        public String getMobile() {
+            return mobile;
+        }
+
+        public void setMobile(String mobile) {
+            this.mobile = mobile;
+        }
+
+        public String getUserCode() {
+            return userCode;
+        }
+
+        public void setUserCode(String userCode) {
+            this.userCode = userCode;
+        }
+
+        public String getOrderStatus() {
+            return orderStatus;
+        }
+
+        public void setOrderStatus(String orderStatus) {
+            this.orderStatus = orderStatus;
+        }
+
+        public String getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(String createTime) {
+            this.createTime = createTime;
+        }
+
+        public String getUpdateTime() {
+            return updateTime;
+        }
+
+        public void setUpdateTime(String updateTime) {
+            this.updateTime = updateTime;
+        }
+
+        public String getTransactionId() {
+            return transactionId;
+        }
+
+        public void setTransactionId(String transactionId) {
+            this.transactionId = transactionId;
+        }
+
+        public String getPayStatus() {
+            return payStatus;
+        }
+
+        public void setPayStatus(String payStatus) {
+            this.payStatus = payStatus;
+        }
+
+        public List<OrderItem> getItemList() {
+            return itemList;
+        }
+
+        public void setItemList(List<OrderItem> itemList) {
+            this.itemList = itemList;
+        }
+    }
+
+    /**
+     * 订单商品项
+     */
+    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+    public static class OrderItem {
+        /**
+         * 子订单ID
+         */
+        private String subOrderId;
+
+        /**
+         * SKU编号
+         */
+        private String itemBn;
+
+        /**
+         * 品名
+         */
+        private String itemName;
+
+        /**
+         * 商品金额（分）
+         */
+        private Long amount;
+
+        /**
+         * 税则分类编码
+         */
+        private String taxCategoryCode;
+
+        /**
+         * 销项税率
+         */
+        private String taxOutputRate;
+
+        /**
+         * 税则分类名称
+         */
+        private String taxCategoryName;
+
+        /**
+         * 税则分类简称
+         */
+        private String taxCategoryShortName;
+
+        /**
+         * 是否纯称重品（0=否，1=是）
+         */
+        private Integer isWeight;
+
+        /**
+         * 商品数量（纯称重品时单位为kg）
+         */
+        private Double num;
+
+        public String getSubOrderId() {
+            return subOrderId;
+        }
+
+        public void setSubOrderId(String subOrderId) {
+            this.subOrderId = subOrderId;
+        }
+
+        public String getItemBn() {
+            return itemBn;
+        }
+
+        public void setItemBn(String itemBn) {
+            this.itemBn = itemBn;
+        }
+
+        public String getItemName() {
+            return itemName;
+        }
+
+        public void setItemName(String itemName) {
+            this.itemName = itemName;
+        }
+
+        public Long getAmount() {
+            return amount;
+        }
+
+        public void setAmount(Long amount) {
+            this.amount = amount;
+        }
+
+        public String getTaxCategoryCode() {
+            return taxCategoryCode;
+        }
+
+        public void setTaxCategoryCode(String taxCategoryCode) {
+            this.taxCategoryCode = taxCategoryCode;
+        }
+
+        public String getTaxOutputRate() {
+            return taxOutputRate;
+        }
+
+        public void setTaxOutputRate(String taxOutputRate) {
+            this.taxOutputRate = taxOutputRate;
+        }
+
+        public String getTaxCategoryName() {
+            return taxCategoryName;
+        }
+
+        public void setTaxCategoryName(String taxCategoryName) {
+            this.taxCategoryName = taxCategoryName;
+        }
+
+        public String getTaxCategoryShortName() {
+            return taxCategoryShortName;
+        }
+
+        public void setTaxCategoryShortName(String taxCategoryShortName) {
+            this.taxCategoryShortName = taxCategoryShortName;
+        }
+
+        public Integer getIsWeight() {
+            return isWeight;
+        }
+
+        public void setIsWeight(Integer isWeight) {
+            this.isWeight = isWeight;
+        }
+
+        public Double getNum() {
+            return num;
+        }
+
+        public void setNum(Double num) {
+            this.num = num;
+        }
+    }
+}
 package com.diligrp.cashier.mall.service.biz;
+import com.diligrp.cashier.mall.domain.rtmall.co.OrderPaymentCO;
+import com.diligrp.cashier.mall.domain.rtmall.co.PaymentAllocateCO;
+import com.diligrp.cashier.mall.domain.rtmall.vo.OrderSuccessVO;
 import com.diligrp.cashier.mall.model.MallBizPayment;
 import com.diligrp.cashier.mall.model.MallBizPaymentOrder;
@@ -14,4 +17,21 @@ public interface MallBizPaymentService {
     void save(MallBizPayment mallBizPayment);
     MallBizPaymentOrder paymentOrderInfo(MallBizPaymentOrder mallBizPaymentOrder);
+
+    /**
+     * 扫码下单接口
+     * Pos扫支付码后，推送订单信息到商户，商户返回收银台链接
+     *
+     * @param orderPaymentCO 扫码下单请求
+     * @return 商户支付单号和收银台链接
+     */
+    OrderSuccessVO createOrderPayment(OrderPaymentCO orderPaymentCO);
+
+    /**
+     * 支付分摊回调接口
+     * POS完成支付分摊后，调用此接口通知商户商品信息已就绪
+     *
+     * @param allocateCO 分摊回调请求
+     */
+    void handlePaymentAllocate(PaymentAllocateCO allocateCO);
 }
@@ -72,7 +72,6 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
         MallBizPayment mallBizPayment = MallBizPayment.of(mallBizOrders);
         // TODO 2025/12/30: 预支付信息 收银台地址信息
-        mallBizPayment.setPayTradeId(IdUtil.simpleUUID());
         mallBizPayment.setCashierUrl("https://cashier.test.gszdtop.com?payTradeNo=" + mallBizPayment.getPayTradeNo());
         // save
 package com.diligrp.cashier.mall.service.biz.impl;
+import com.diligrp.cashier.mall.MallConstants;
+import com.diligrp.cashier.mall.client.RtMallHttpClient;
+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.domain.rtmall.co.AuthLoginCO;
 import com.diligrp.cashier.mall.domain.rtmall.co.OrderInfoCO;
+import com.diligrp.cashier.mall.domain.rtmall.co.OrderPaymentCO;
+import com.diligrp.cashier.mall.domain.rtmall.co.PaymentAllocateCO;
+import com.diligrp.cashier.mall.domain.rtmall.vo.OrderDetailResponseVO;
 import com.diligrp.cashier.mall.domain.rtmall.vo.OrderPaymentVO;
+import com.diligrp.cashier.mall.domain.rtmall.vo.OrderSuccessVO;
+import com.diligrp.cashier.mall.exception.RtMartMallException;
+import com.diligrp.cashier.mall.model.MallBizOrder;
+import com.diligrp.cashier.mall.model.MallBizOrderItem;
 import com.diligrp.cashier.mall.model.MallBizPayment;
 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.OrderState;
+import com.diligrp.cashier.mall.type.PayState;
+import com.diligrp.cashier.mall.type.RtMarkErrorCode;
+import com.diligrp.cashier.mall.util.MallSnowflakeKeyManager;
+import com.diligrp.cashier.shared.util.JsonUtils;
+import com.diligrp.cashier.shared.util.SpringContextUtils;
+import com.diligrp.cashier.trade.type.SnowflakeKey;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * @ClassName MallBizPaymentServiceImpl.java
  * @author dengwei
@@ -29,6 +56,16 @@ public class MallBizPaymentServiceImpl implements MallBizPaymentService {
     private MallBizPaymentDao mallBizPaymentDao;
     @Resource
     private MallBizPaymentOrderDao mallBizPaymentOrderDao;
+    @Resource
+    private MallSnowflakeKeyManager mallSnowflakeKeyManager;
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+    @Resource
+    private RtMallHttpClient rtMallHttpClient;
+    @Resource
+    private MallBizOrderDao mallBizOrderDao;
+    @Resource
+    private MallBizOrderItemDao mallBizOrderItemDao;
     /**
      * save
@@ -48,4 +85,282 @@ public class MallBizPaymentServiceImpl implements MallBizPaymentService {
     public MallBizPaymentOrder paymentOrderInfo(MallBizPaymentOrder mallBizPaymentOrder) {
         return mallBizPaymentOrderDao.getMallBizPaymentOrder(mallBizPaymentOrder);
     }
+
+    /**
+     * 扫码下单接口
+     * Pos扫支付码后，推送订单信息到商户，商户返回收银台链接
+     * 创建订单（商品为空，待分摊后同步）+ 支付记录
+     *
+     * @param co 扫码下单请求
+     * @return 支付单号和收银台链接
+     */
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public OrderSuccessVO createOrderPayment(OrderPaymentCO co) {
+        log.info("开始处理扫码下单请求, order_id={}, trade_id={}, order_type={}",
+                co.getOrderId(), co.getTradeId(), co.getOrderType());
+
+        //获取用户信息
+        AuthLoginCO authLogin = getAuthLogin(co.getUserCode());
+
+        //创建订单（商品列表为空，待分摊后同步）
+        MallBizOrder order = buildOrderFromCO(co, authLogin);
+
+        //创建支付记录
+        MallBizPayment payment = buildPaymentFromCO(co, order);
+
+        //保存订单和支付记录
+        try {
+            mallBizOrderDao.insertSelective(order);
+            mallBizPaymentDao.insertSelective(payment);
+            log.info("扫码下单保存成功, order_no={}, out_trade_no={}, trade_id={}",
+                    order.getOrderNo(), payment.getPayTradeNo(), co.getTradeId());
+        } catch (DuplicateKeyException e) {
+            // 如果 order_id+trade_id 已存在，返回错误
+            log.warn("扫码下单重复请求, trade_id={}", co.getTradeId());
+            throw new RtMartMallException(RtMarkErrorCode.E4003);
+        }
+
+        //返回结果
+        log.info("扫码下单处理完成, out_trade_no={}, cashier_url={}", payment.getPayTradeNo(), payment.getCashierUrl());
+        return new OrderSuccessVO(payment.getPayTradeNo(), payment.getCashierUrl());
+    }
+
+    /**
+     * 获取用户登录信息
+     */
+    private AuthLoginCO getAuthLogin(String userCode) {
+        Object cache = redisTemplate.opsForValue().get(MallConstants.MALL_USER_INFO + userCode);
+        if (Objects.isNull(cache)) {
+            throw new RtMartMallException(RtMarkErrorCode.E5001);
+        }
+        AuthLoginCO authLogin = JsonUtils.fromJsonString(Objects.requireNonNull(cache).toString(), AuthLoginCO.class);
+        log.info("获取用户登录信息: userCode={}, username={}", userCode, authLogin.getUsername());
+        return authLogin;
+    }
+
+    /**
+     * 构建扫码订单（商品为空，待分摊后同步）
+     */
+    private MallBizOrder buildOrderFromCO(OrderPaymentCO co, AuthLoginCO authLogin) {
+        MallBizOrder order = new MallBizOrder();
+        order.setId(mallSnowflakeKeyManager.nextId(SnowflakeKey.MALL_BIZ_ORDER_ID));
+        order.setOrderNo(mallSnowflakeKeyManager.nextId(SnowflakeKey.MALL_BIZ_ORDER_ID).toString());
+        order.setOrderId(co.getOrderId());
+        order.setTradeId(co.getTradeId());
+        order.setOrderType(co.getOrderType());
+        order.setUserCode(co.getUserCode());
+        order.setCompanyCode(co.getCompanyCode());
+        order.setShopCode(co.getShopCode());
+        order.setShopName(co.getShopName());
+        order.setTotalAmount(co.getTotalAmount());
+        order.setOrderTime(co.getOrderTime());
+        order.setOrderExpire(60); // 默认订单有效期60分钟
+        order.setState(OrderState.NOT_PAY.getCode()); // 初始状态：未支付
+
+        //从用户信息中获取
+        order.setUsername(authLogin.getUsername());
+        order.setMchId(authLogin.getMchId());
+        order.setChannel(authLogin.getChannel());
+        order.setSource(authLogin.getSource());
+
+        //商品信息暂时为空，等待分摊后同步
+        order.setMallBizOrderItems(null);
+        order.setMallBizOrderAddress(null);
+        order.setFreightFee(0L); // 扫码下单无运费
+
+        return order;
+    }
+
+    /**
+     * 构建支付记录
+     */
+    private MallBizPayment buildPaymentFromCO(OrderPaymentCO co, MallBizOrder order) {
+        MallBizPayment payment = new MallBizPayment();
+        payment.setId(mallSnowflakeKeyManager.nextId(SnowflakeKey.MALL_BIZ_PAYMENT_ID));
+        payment.setPayTradeNo(mallSnowflakeKeyManager.nextId(SnowflakeKey.MALL_BIZ_PAYMENT_ID).toString());
+        payment.setBizOrderId(order.getId().toString()); // 关联订单
+        payment.setOrderId(co.getOrderId());
+        payment.setTradeId(co.getTradeId());
+        payment.setPayFee(co.getTotalAmount());
+        payment.setPayState(PayState.PENDING.getCode());
+        payment.setMchId(order.getMchId());
+
+        //获取大润发配置，设置回调地址
+        RtMallDynamicProperty rtMallDynamicProperty = SpringContextUtils.getBean(RtMallDynamicProperty.class);
+        RtMallDynamicProperty.AppSecretDynamicProperty property =
+                rtMallDynamicProperty.getBySourceAndType(order.getSource(), order.getOrderType());
+        payment.setPaymentCallback(property.getCallbackDomain());
+
+        //根据 order_type 决定是否生成收银台URL
+        if (co.getOrderType() == 2) {
+            //接口扫码购：生成收银台链接
+            String cashierUrl = SpringContextUtils.getBean(MallDynamicProperty.class).getUrl();
+            if (!cashierUrl.endsWith("/")) {
+                cashierUrl = cashierUrl + "/";
+            }
+            payment.setCashierUrl(cashierUrl + "?payTradeNo=" + payment.getPayTradeNo());
+        }
+
+
+        return payment;
+    }
+
+    /**
+     * 支付分摊回调接口
+     * POS完成支付分摊后，调用此接口通知商户商品信息已就绪
+     *
+     * @param allocateCO 分摊回调请求
+     */
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public void handlePaymentAllocate(PaymentAllocateCO allocateCO) {
+        log.info("收到支付分摊回调通知, trade_count={}", allocateCO.getTradeList().size());
+
+        for (PaymentAllocateCO.TradeInfo trade : allocateCO.getTradeList()) {
+            handleSingleTradeAllocate(trade);
+        }
+
+        log.info("支付分摊回调处理完成");
+    }
+
+    /**
+     * 处理单个支付流水的分摊通知
+     * 1. 调用大润发订单详情接口获取商品信息
+     * 2. 更新订单状态
+     * 3. 插入商品明细
+     */
+    private void handleSingleTradeAllocate(PaymentAllocateCO.TradeInfo trade) {
+        log.info("处理支付分摊: order_id={}, trade_id={}, user_code={}",
+                trade.getOrderId(), trade.getTradeId(), trade.getUserCode());
+
+        //调用大润发订单详情接口
+        OrderDetailResponseVO detailResponse = rtMallHttpClient.getOrderDetail(
+                trade.getOrderId(),
+                trade.getTradeId(),
+                trade.getUserCode()
+        );
+
+        OrderDetailResponseVO.OrderDetailData orderDetail = detailResponse.getData();
+        if (orderDetail == null || orderDetail.getItemList() == null || orderDetail.getItemList().isEmpty()) {
+            log.warn("订单详情中没有商品信息: order_id={}", trade.getOrderId());
+            return;
+        }
+
+        //查询订单
+        MallBizOrder order = mallBizOrderDao.findByOrderIdAndTradeId(trade.getOrderId(), trade.getTradeId());
+        if (order == null) {
+            log.error("找不到订单: order_id={}, trade_id={}", trade.getOrderId(), trade.getTradeId());
+            throw new RtMartMallException(RtMarkErrorCode.E5000);
+        }
+
+        //更新订单状态
+        updateOrderState(order, orderDetail);
+
+        //更新支付记录
+        updatePaymentInfo(trade.getOrderId(), trade.getTradeId(), orderDetail);
+
+        //插入商品明细
+        insertOrderItems(order, orderDetail.getItemList());
+
+        log.info("支付分摊处理成功: trade_id={}, item_count={}", trade.getTradeId(), orderDetail.getItemList().size());
+    }
+
+    /**
+     * 更新支付记录
+     */
+    private void updatePaymentInfo(String orderId, String tradeId, OrderDetailResponseVO.OrderDetailData orderDetail) {
+        //查询支付记录
+        MallBizPayment payment = mallBizPaymentDao.findByOrderIdAndTradeId(orderId, tradeId);
+        if (payment == null) {
+            log.error("找不到支付记录: order_id={}, trade_id={}", orderId, tradeId);
+            throw new RtMartMallException(RtMarkErrorCode.E5000);
+        }
+
+        //更新交易流水号
+        if (orderDetail.getTransactionId() != null && !orderDetail.getTransactionId().equals(payment.getPayTradeId())) {
+            payment.setPayTradeId(orderDetail.getTransactionId());
+            mallBizPaymentDao.updateByPrimaryKeySelective(payment);
+            log.info("支付记录已更新: trade_id={}, pay_payment_id={}", tradeId, orderDetail.getTransactionId());
+        }
+    }
+
+    /**
+     * 更新订单状态
+     */
+    private void updateOrderState(MallBizOrder order, OrderDetailResponseVO.OrderDetailData orderDetail) {
+        Integer newState = mapOrderState(orderDetail.getOrderStatus());
+        if (newState != null && !newState.equals(order.getState())) {
+            order.setState(newState);
+            mallBizOrderDao.updateByPrimaryKeySelective(order);
+            log.info("订单状态已更新: order_id={}, old_state={}, new_state={}",
+                    order.getOrderId(), order.getState(), newState);
+        }
+    }
+
+    /**
+     * 大润发状态 -> 本系统状态
+     */
+    private Integer mapOrderState(String rtMallStatus) {
+        if (rtMallStatus == null) {
+            return null;
+        }
+        return switch (rtMallStatus) {
+            case "DONE" -> OrderState.PAYED.getCode(); // 订单分摊完成 -> 已支付
+            case "PAYED" -> OrderState.PAYED.getCode(); // 已支付
+            case "NOTPAY" -> OrderState.NOT_PAY.getCode(); // 未支付
+            case "CANCEL" -> OrderState.NOT_PAY_CANCEL.getCode(); // 已取消
+            default -> null;
+        };
+    }
+
+    /**
+     * 插入商品明细
+     */
+    private void insertOrderItems(MallBizOrder order, List<OrderDetailResponseVO.OrderItem> items) {
+        List<MallBizOrderItem> orderItems = new ArrayList<>();
+
+        for (OrderDetailResponseVO.OrderItem item : items) {
+            MallBizOrderItem orderItem = new MallBizOrderItem();
+            orderItem.setId(mallSnowflakeKeyManager.nextId(SnowflakeKey.MALL_BIZ_ORDER_ID));
+            orderItem.setBizOrderId(order.getId());
+            orderItem.setOrderId(order.getOrderId());
+            orderItem.setSubOrderId(item.getSubOrderId() != null ? Long.parseLong(item.getSubOrderId()) : null);
+            orderItem.setShopCode(order.getShopCode());
+            orderItem.setShopName(order.getShopName());
+            orderItem.setItemBn(item.getItemBn());
+            orderItem.setItemName(item.getItemName());
+            orderItem.setAmount(item.getAmount());
+            orderItem.setTaxOutputRate(item.getTaxOutputRate());
+            orderItem.setTaxClassificationCode(item.getTaxCategoryCode());
+            orderItem.setTaxClassificationName(item.getTaxCategoryName());
+
+            if (item.getNum() != null && item.getNum() > 0) {
+                //判断是否为纯称重品
+                if (item.getIsWeight() == 1) {
+                    //纯称重品：num单位为kg，转换为克存储（*1000）
+                    orderItem.setNum((int) (item.getNum() * 1000));
+                    //单价 = 金额 / 重量（kg），单位：分/kg
+                    orderItem.setPrice((long) (item.getAmount() / item.getNum()));
+                } else {
+                    //非称重品：num为件数，直接转为Integer
+                    orderItem.setNum(item.getNum().intValue());
+                    //单价 = 金额 / 件数，单位：分/件
+                    orderItem.setPrice((long) (item.getAmount() / item.getNum()));
+                }
+            } else {
+                //数量为空或0时，设置默认值
+                orderItem.setNum(0);
+                orderItem.setPrice(0L);
+            }
+
+            orderItems.add(orderItem);
+        }
+
+        // 批量插入商品明细
+        if (!orderItems.isEmpty()) {
+            mallBizOrderItemDao.batchInsert(orderItems);
+            log.info("商品明细插入成功: order_id={}, count={}", order.getOrderId(), orderItems.size());
+        }
+    }
 }
+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());
+    }
+}
@@ -383,4 +383,12 @@
         </if>
         and version = #{version}
     </update>
+    <select id="findByOrderIdAndTradeId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from mall_biz_order
+        where order_id = #{orderId,jdbcType=VARCHAR}
+        and trade_id = #{tradeId,jdbcType=VARCHAR}
+        limit 1
+    </select>
 </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="VARCHAR" 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="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_payment_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_payment_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}, #{payPaymentId,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="payPaymentId != null">
-                pay_payment_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="payPaymentId != null">
-                #{payPaymentId,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="payPaymentId != null">
-                pay_payment_id = #{payPaymentId,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>
-            <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=VARCHAR},
-            order_id = #{orderId,jdbcType=VARCHAR},
-            trade_id = #{tradeId,jdbcType=VARCHAR},
-            pay_payment_id = #{payPaymentId,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>
+  <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_payment_id" jdbcType="VARCHAR" property="payPaymentId" />
+    <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_payment_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_payment_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}, #{payPaymentId,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="payPaymentId != null">
+        pay_payment_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="payPaymentId != null">
+        #{payPaymentId,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="payPaymentId != null">
+        pay_payment_id = #{payPaymentId,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_payment_id = #{payPaymentId,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>
 </mapper>