diff --git a/mallinkAdmin/src/main/resources/db/migration/V20230200001__car.sql b/mallinkAdmin/src/main/resources/db/migration/V20230200001__car.sql new file mode 100644 index 000000000..909bb07f1 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V20230200001__car.sql @@ -0,0 +1,31 @@ +CREATE TABLE `wx_car_pay_order` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `parent_tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + `c_user_id` bigint(20) NOT NULL COMMENT '用户ID', + `car_number` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '车牌号', + `pay_amount` int(11) NOT NULL COMMENT '支付金额(分)', + `pay_time_start` datetime NOT NULL COMMENT '支付发起时间', + `pay_time_end` datetime NOT NULL COMMENT '支付结束时间', + `prepay_id` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信预支付交易会话标识-发模板信息使用', + `transaction_id` varchar(36) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信生成的订单号', + `pay_vendor` int(11) NOT NULL DEFAULT '0' COMMENT '支付渠道: 0-微信 1-支付宝 2-银联 ', + `pay_version` smallint(1) DEFAULT NULL COMMENT '支付版本', + `pay_order_no` varchar(36) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '支付订单号', + `pay_order_status` int(11) NOT NULL DEFAULT '0' COMMENT '支付状态: 0-支付中;1-支付成功;2-支付失败', + `pay_param` json DEFAULT NULL COMMENT '额外参数', + `fail_reason` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '支付失败原因', + `pay_end_from` smallint(2) DEFAULT NULL COMMENT '支付后结果来源(0:callback, 1:query)', + `merchant_account` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商户收款账户', + `merchant_id` int(20) NOT NULL COMMENT '商户编号', + `merchant_name` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '商户名称', + `amount` int(11) NOT NULL COMMENT '订单金额', + `free_amount` int(11) NOT NULL DEFAULT '0' COMMENT '优免金额', + `free_coupon_id` int(20) DEFAULT NULL COMMENT '优免优惠券编号', + `free_coupon_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '优免优惠券名称', + PRIMARY KEY (`id`), + UNIQUE KEY `id_UNIQUE` (`id`), + UNIQUE KEY `pay_order_no` (`pay_order_no`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='支付单表'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java new file mode 100644 index 000000000..077686885 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java @@ -0,0 +1,67 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import java.util.*; + +@TableName(value = "wx_car_pay_order") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString +public class WxCarPayOrder extends TenantEntity { + + private static final long serialVersionUID = -5094915301794376964L; + + protected Long id; + + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") + private Date createTime; + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") + private Date updateTime; + @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") + private Long cUserId; + @io.swagger.annotations.ApiModelProperty(value="车牌号",name="carNumber") + private String carNumber; + @io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount") + private Integer payAmount; + @io.swagger.annotations.ApiModelProperty(value="支付发起时间",name="payTimeStart") + private Date payTimeStart; + @io.swagger.annotations.ApiModelProperty(value="支付结束时间",name="payTimeEnd") + private Date payTimeEnd; + @io.swagger.annotations.ApiModelProperty(value="微信预支付交易会话标识",name="prepayId") + private String prepayId; + @io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId") + private String transactionId; + @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="payVendor") + private Integer payVendor; + @io.swagger.annotations.ApiModelProperty(value="支付渠道版本EnumPayVersion ",name="payVersion") + private Integer payVersion; + @io.swagger.annotations.ApiModelProperty(value="支付订单号",name="payOrderNo") + private String payOrderNo; + @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-支付中;1-支付成功;2-支付失败",name="payOrderStatus") + private Integer payOrderStatus; + @io.swagger.annotations.ApiModelProperty(value="支付额外参数",name="payParam") + private String payParam; + @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason") + private String failReason; + @io.swagger.annotations.ApiModelProperty(value="支付后结果来源(0:callback, 1:query)",name="payEndFrom") + private Integer payEndFrom; + @io.swagger.annotations.ApiModelProperty(value="商户收款账户",name="merchantAccount") + private String merchantAccount; + @io.swagger.annotations.ApiModelProperty(value="商户编号",name="merchantId") + private Long merchantId; + @io.swagger.annotations.ApiModelProperty(value="商户名称",name="merchantName") + private String merchantName; + @io.swagger.annotations.ApiModelProperty(value="订单金额(分)",name="amount") + private Integer amount; + @io.swagger.annotations.ApiModelProperty(value="优免金额(分)",name="freeAmount") + private Integer freeAmount; + @io.swagger.annotations.ApiModelProperty(value="优免券编号",name="freeCouponId") + private Long freeCouponId; + @io.swagger.annotations.ApiModelProperty(value="优免券名称",name="freeCouponName") + private String freeCouponName; + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarPayOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarPayOrderMapper.java new file mode 100644 index 000000000..d8c33135f --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarPayOrderMapper.java @@ -0,0 +1,16 @@ +package com.iformall.mapper; + +import java.util.*; + +import org.apache.ibatis.annotations.Param; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxCarPayOrder; + +public interface WxCarPayOrderMapper extends CommonMapper { + + WxCarPayOrder selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + + List findList(WxCarPayOrder wxCarPayOrder); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxCarPayOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCarPayOrderService.java new file mode 100644 index 000000000..bd71d5de9 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/WxCarPayOrderService.java @@ -0,0 +1,6 @@ +package com.iformall.service; + +public interface WxCarPayOrderService { + + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayOrderServiceImpl.java new file mode 100644 index 000000000..dfdf54994 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayOrderServiceImpl.java @@ -0,0 +1,18 @@ +package com.iformall.service.impl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.iformall.mapper.WxCarPayOrderMapper; +import com.iformall.service.WxCarPayOrderService; + +@Service +public class WxCarPayOrderServiceImpl implements WxCarPayOrderService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxCarPayOrderMapper wxCarPayOrderMapper; + + +} diff --git a/mallinkService/src/main/resources/mapper/WxCarPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCarPayOrderMapper.xml new file mode 100644 index 000000000..53406d8a9 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxCarPayOrderMapper.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`c_user_id`,`car_number`,`pay_amount`, + `pay_time_start`,`pay_time_end`,`prepay_id`,`transaction_id`,`pay_vendor`,`pay_version`,`pay_order_no`, + `pay_order_status`,`pay_param`,`fail_reason`,`pay_end_from`,`merchant_account`,`merchant_id`,`merchant_name`, + `amount`,`free_amount`,`free_coupon_id`,`free_coupon_name` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + + + and `create_time` = #{createTime} + + + + and `update_time` = #{updateTime} + + + + and `c_user_id` = #{cUserId} + + + + and `car_number` like concat('%', #{carNumber},'%') + + + + and `pay_amount` = #{payAmount} + + + + and `pay_time_start` = #{payTimeStart} + + + + and `pay_time_end` = #{payTimeEnd} + + + + and `prepay_id` like concat('%', #{prepayId},'%') + + + + and `transaction_id` like concat('%', #{transactionId},'%') + + + + and `pay_vendor` = #{payVendor} + + + + and `pay_version` = #{payVersion} + + + + and `pay_order_no` like concat('%', #{payOrderNo},'%') + + + + and `pay_order_status` = #{payOrderStatus} + + + + and `fail_reason` like concat('%', #{failReason},'%') + + + + and `merchant_account` like concat('%', #{merchantAccount},'%') + + + + and `merchant_id` = #{merchantId} + + + + and `merchant_name` like concat('%', #{merchantName},'%') + + + + and `free_coupon_id` = #{freeCouponId} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + +