TRX 1 gadu atpakaļ
vecāks
revīzija
605fab7d01

+ 1 - 0
src/main/java/com/github/microservice/models/type/DeviceType.java

@@ -7,6 +7,7 @@ import lombok.Getter;
  */
 public enum DeviceType {
     Consumer("消费机"),
+    GateWay("网关"),
     Door("门禁机"),
     GateDoor("门闸"),
     Elevator("电梯"),

+ 14 - 10
src/main/java/com/github/microservice/models/type/PaymentType.java

@@ -6,24 +6,28 @@ import lombok.Getter;
  * 支付方式
  */
 public enum PaymentType {
-    WeChat("微信", false),
-    UnionFrictionlessPay("银联无感支付", true),
-    UserWallet("个人钱包", false),
-    QrCode("微信支付", false),
-    WxQrCode("微信付款码支付", false),
-    ZfbQrCode("支付宝付款码支付", false),
-    Uni("银联", false),
+    WeChat("微信", false, "WalletMainService"),
+    UnionFrictionlessPay("银联无感支付", true, "UnionFrictionlessPayMainService"),
+    UserWallet("个人钱包", false, ""),
+    QrCode("微信支付", false, ""),
+    WxQrCode("微信付款码支付", false, ""),
+    ZfbQrCode("支付宝付款码支付", false, ""),
+    Uni("银联", false, ""),
     ;
 
     @Getter
     private String remark;
 
+    @Getter
+    private String serviceBeanName;
+
     // 支付结果是否是异步返回
     @Getter
-    private boolean payIsAsyn;
+    private boolean payIsAsync;
 
-    PaymentType(String remark, boolean payIsAsyn) {
+    PaymentType(String remark, boolean payIsAsync, String serviceBeanName) {
         this.remark = remark;
-        this.payIsAsyn = payIsAsyn;
+        this.payIsAsync = payIsAsync;
+        this.serviceBeanName = serviceBeanName;
     }
 }

+ 14 - 0
src/main/java/com/github/microservice/pay/model/OrderModel.java

@@ -0,0 +1,14 @@
+package com.github.microservice.pay.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderModel {
+    // 订单id
+    private String id;
+
+}

+ 20 - 0
src/main/java/com/github/microservice/pay/model/RequestCreateOrder.java

@@ -0,0 +1,20 @@
+package com.github.microservice.pay.model;
+
+import com.github.microservice.pay.model.create.BaseCreateOrderModel;
+import com.github.microservice.pay.type.PayProductType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RequestCreateOrder {
+
+    //支付产品类型
+    private PayProductType payProductType;
+
+    //创建订单的
+    private BaseCreateOrderModel orderModel;
+
+}

+ 24 - 0
src/main/java/com/github/microservice/pay/model/create/BaseCreateOrderModel.java

@@ -0,0 +1,24 @@
+package com.github.microservice.pay.model.create;
+
+import com.github.microservice.pay.params.BasePayParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BaseCreateOrderModel extends BasePayParam {
+
+    // 商务类型 project
+    private String businessType;
+
+    //
+    private String businessId;
+
+
+    //商品id
+    private String goodsId;
+
+
+}

+ 19 - 0
src/main/java/com/github/microservice/pay/model/create/UnionFrictionlessPayCreateOrderModel.java

@@ -0,0 +1,19 @@
+package com.github.microservice.pay.model.create;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UnionFrictionlessPayCreateOrderModel extends BaseCreateOrderModel {
+
+    // 商户号
+    private String mchntNo;
+
+
+
+
+
+}

+ 23 - 0
src/main/java/com/github/microservice/pay/params/BasePayParam.java

@@ -0,0 +1,23 @@
+package com.github.microservice.pay.params;
+
+import com.github.microservice.models.type.PaymentType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author TRX
+ * @date 2024/9/23
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BasePayParam {
+
+    @Schema(description = "支付方式")
+    private PaymentType paymentType;
+
+    @Schema(description = "项目oid")
+    private String projectOid;
+}

+ 11 - 0
src/main/java/com/github/microservice/pay/type/PayCallServiceType.java

@@ -0,0 +1,11 @@
+package com.github.microservice.pay.type;
+
+public enum PayCallServiceType {
+
+    Add,
+    Sub,
+    Query,
+    CreateOrder
+
+
+}

+ 31 - 0
src/main/java/com/github/microservice/pay/type/PayProductType.java

@@ -0,0 +1,31 @@
+package com.github.microservice.pay.type;
+
+import lombok.Getter;
+
+/**
+ * 支付方式
+ */
+public enum PayProductType {
+    WeChatWalletPay("微信充值钱包", PaymentType.WalletPay, "WeChatWalletPayService"),
+    UnionFrictionlessPay("银联无感支付", PaymentType.Frictionless, "UnionFrictionlessPayService"),
+    WeChatDirectPay("微信直营支付", PaymentType.DirectPay, "WeChatDirectPayService"),
+    ALiPayDirectPay("支付宝直营支付", PaymentType.DirectPay, "AliPayDirectPayService"),
+    ;
+
+    @Getter
+    private String remark;
+
+    // 支付结果是否是异步返回
+    @Getter
+    private PaymentType paymentType;
+
+    @Getter
+    private String service;
+
+
+    PayProductType(String remark, PaymentType paymentType, String service) {
+        this.remark = remark;
+        this.paymentType = paymentType;
+        this.service = service;
+    }
+}

+ 26 - 0
src/main/java/com/github/microservice/pay/type/PaymentType.java

@@ -0,0 +1,26 @@
+package com.github.microservice.pay.type;
+
+import lombok.Getter;
+
+/**
+ * 支付方式
+ */
+public enum PaymentType {
+
+    // 无感支付
+    Frictionless,
+
+    //钱包支付
+    WalletPay,
+
+    // 直营支付,游客可以直接用微信支付宝支付
+    DirectPay,
+
+
+    ;
+
+    @Getter
+    private String remark;
+
+
+}