feat: order payment function is ready

api/core/app_server.go

@@ -151,6 +151,7 @@ func authorizeMiddleware(s *AppServer, client *redis.Client) gin.HandlerFunc {
 			c.Request.URL.Path == "/api/sd/jobs" ||
 			strings.HasPrefix(c.Request.URL.Path, "/api/sms/") ||
 			strings.HasPrefix(c.Request.URL.Path, "/api/captcha/") ||
+			strings.HasPrefix(c.Request.URL.Path, "/api/payment/") ||
 			strings.HasPrefix(c.Request.URL.Path, "/static/") ||
 			c.Request.URL.Path == "/api/admin/config/get" {
 			c.Next()

api/core/config.go

@@ -36,7 +36,7 @@ func NewDefaultConfig() *types.AppConfig {
 		MjConfig:     types.MidJourneyConfig{Enabled: false},
 		SdConfig:     types.StableDiffusionConfig{Enabled: false, Txt2ImgJsonPath: "res/text2img.json"},
 		WeChatBot:    false,
-		AlipayConfig: types.AlipayConfig{SandBox: true},
+		AlipayConfig: types.AlipayConfig{Enabled: false},
 	}
 }
 

api/core/types/config.go

@@ -62,7 +62,6 @@ type AliYunSmsConfig struct {
 
 type AlipayConfig struct {
 	Enabled         bool   // 是否启用该服务
-	SandBox         bool   // 是否沙箱环境
 	Company         string // 公司名称
 	UserId          string // 支付宝用户 ID
 	AppId           string // 支付宝 AppID

api/handler/payment_handler.go

@@ -19,6 +19,11 @@ import (
 	"time"
 )
 
+const (
+	PayWayAlipay = "支付宝"
+	PayWayWechat = "微信支付"
+)
+
 // PaymentHandler 支付服务回调 handler
 type PaymentHandler struct {
 	BaseHandler
@@ -110,6 +115,7 @@ func (h *PaymentHandler) OrderQuery(c *gin.Context) {
 func (h *PaymentHandler) AlipayQrcode(c *gin.Context) {
 	var data struct {
 		ProductId uint `json:"product_id"`
+		UserId    int  `json:"user_id"`
 	}
 	if err := c.ShouldBindJSON(&data); err != nil {
 		resp.ERROR(c, types.InvalidArgs)
@@ -128,9 +134,10 @@ func (h *PaymentHandler) AlipayQrcode(c *gin.Context) {
 		resp.ERROR(c, "error with generate trade no: "+err.Error())
 		return
 	}
-	user, err := utils.GetLoginUser(c, h.db)
+	var user model.User
-	if err != nil {
+	res = h.db.First(&user, data.UserId)
-		resp.NotAuth(c)
+	if res.Error != nil {
+		resp.ERROR(c, "Invalid user ID")
 		return
 	}
 
@@ -150,6 +157,7 @@ func (h *PaymentHandler) AlipayQrcode(c *gin.Context) {
 		Subject:   product.Name,
 		Amount:    product.Price - product.Discount,
 		Status:    types.OrderNotPaid,
+		PayWay:    PayWayAlipay,
 		Remark:    utils.JsonEncode(remark),
 	}
 	res = h.db.Create(&order)
@@ -229,6 +237,7 @@ func (h *PaymentHandler) AlipayNotify(c *gin.Context) {
 			user.ExpiredTime = time.Now().AddDate(0, 0, remark.Days).Unix()
 		}
 		user.Vip = true
+
 	} else if !user.Vip { // 充值点卡的非 VIP 用户
 		user.ExpiredTime = time.Now().AddDate(0, 0, 30).Unix()
 	}

api/main.go

@@ -33,7 +33,7 @@ import (
 
 var logger = logger2.GetLogger()
 
-//go:embed res/ip2region.xdb
+//go:embed res
 var xdbFS embed.FS
 
 // AppLifecycle 应用程序生命周期

api/service/payment/alipay_service.go

@@ -28,7 +28,7 @@ func NewAlipayService(appConfig *types.AppConfig) (*AlipayService, error) {
 		return nil, fmt.Errorf("error with read App Private key: %v", err)
 	}
 
-	xClient, err := alipay.New(config.AppId, priKey, !config.SandBox)
+	xClient, err := alipay.New(config.AppId, priKey, false)
 	if err != nil {
 		return nil, fmt.Errorf("error with initialize alipay service: %v", err)
 	}

api/store/model/order.go

@@ -17,5 +17,6 @@ type Order struct {
 	Status    types.OrderStatus
 	Remark    string
 	PayTime   int64
+	PayWay    string // 支付方式
 	DeletedAt gorm.DeletedAt
 }

api/store/vo/order.go

@@ -14,5 +14,6 @@ type Order struct {
 	Amount    float64           `json:"amount"`
 	Status    types.OrderStatus `json:"status"`
 	PayTime   int64             `json:"pay_time"`
+	PayWay    string            `json:"pay_way"`
 	Remark    types.OrderRemark `json:"remark"`
 }

web/src/views/Member.vue

@@ -14,7 +14,7 @@
 
       <ItemList :items="list" v-if="list.length > 0" :gap="30" :width="250">
         <template #default="scope">
-          <div class="product-item" :style="{width: scope.width+'px'}" @click="pay(scope.item)">
+          <div class="product-item" :style="{width: scope.width+'px'}" @click="orderPay(scope.item)">
             <div class="image-container">
               <el-image :src="vipImg" fit="cover"/>
             </div>
@@ -42,6 +42,32 @@
     </div>
 
     <login-dialog :show="showLoginDialog" @hide="showLoginDialog = false"/>
+
+    <el-dialog
+        v-model="showPayDialog"
+        :close-on-click-modal="false"
+        :show-close="true"
+        :width="400"
+        title="用户登录">
+      <div class="pay-container">
+        <div class="pay-qrcode">
+          <el-image :src="qrcode"/>
+        </div>
+
+        <div class="tip success" v-if="text !== ''">
+          <el-icon>
+            <SuccessFilled/>
+          </el-icon>
+          <span class="text">{{ text }}</span>
+        </div>
+        <div class="tip" v-else>
+          <el-icon>
+            <InfoFilled/>
+          </el-icon>
+          <span class="text">请打开手机支付宝扫码支付</span>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -50,7 +76,7 @@ import {nextTick, onMounted, ref} from "vue"
 import {ElMessage} from "element-plus";
 import {httpGet, httpPost} from "@/utils/http";
 import ItemList from "@/components/ItemList.vue";
-import {Delete, Plus} from "@element-plus/icons-vue";
+import {Delete, InfoFilled, Plus, SuccessFilled} from "@element-plus/icons-vue";
 import LoginDialog from "@/components/LoginDialog.vue";
 import {checkSession} from "@/action/session";
 import {arrayContains, removeArrayItem, substr} from "@/utils/libs";
@@ -59,8 +85,13 @@ import router from "@/router";
 const listBoxHeight = window.innerHeight - 97
 const list = ref([])
 const showLoginDialog = ref(false)
+const showPayDialog = ref(false)
 const elements = ref(null)
 const vipImg = ref("/images/vip.png")
+const qrcode = ref("")
+const amount = ref(0)
+const discount = ref(0)
+const text = ref("")
 onMounted(() => {
   httpGet("/api/product/list").then((res) => {
     list.value = res.data
@@ -69,14 +100,39 @@ onMounted(() => {
   })
 })
 
-const pay = (row) => {
+const orderPay = (row) => {
   checkSession().then(user => {
     console.log(row)
-  }).catch(() => {
+    httpPost("/api/payment/alipay/qrcode", {product_id: row.id, user_id: user.id}).then(res => {
+      console.log(res)
+      showPayDialog.value = true
+      qrcode.value = res.data['image']
+      queryOrder(res.data['order_no'])
+    }).catch(e => {
+      ElMessage.error("生成支付订单失败：" + e.message)
+    })
+  }).catch(e => {
+    console.log(e)
     showLoginDialog.value = true
   })
 }
 
+const queryOrder = (orderNo) => {
+  httpPost("/api/payment/query", {order_no: orderNo}).then(res => {
+    if (res.data.status === 1) {
+      text.value = "扫码成功，请在手机上进行支付！"
+      queryOrder(orderNo)
+    } else if (res.data.status === 2) {
+      text.value = "支付成功，正在刷新页面"
+      setTimeout(() => location.reload(), 500)
+    } else {
+      queryOrder(orderNo)
+    }
+  }).catch(e => {
+    ElMessage.error("查询支付状态失败：" + e.message)
+  })
+}
+
 </script>
 
 <style lang="stylus">
@@ -85,6 +141,42 @@ const pay = (row) => {
   background-color: #282c34;
   height 100vh
 
+  .el-dialog {
+    .el-dialog__body {
+      padding-top 0
+
+      .pay-container {
+        .pay-qrcode {
+          display flex
+          justify-content center
+
+          .el-image {
+            width 360px;
+            height 360px;
+          }
+        }
+
+        .tip {
+          display flex
+          justify-content center
+
+          .el-icon {
+            font-size 24px
+          }
+
+          .text {
+            font-size: 16px
+            margin-left 10px
+          }
+        }
+
+        .tip.success {
+          color #07c160
+        }
+      }
+    }
+  }
+
   .title {
     text-align center
     background-color #25272d

web/src/views/admin/Order.vue

@@ -38,6 +38,7 @@
             <el-tag v-else>未支付</el-tag>
           </template>
         </el-table-column>
+        <el-table-column prop="pay_way" label="支付方式"/>
 
         <el-table-column label="操作" width="180">
           <template #default="scope">

web/src/views/admin/SysConfig.vue

@@ -12,6 +12,9 @@
         <el-form-item label="注册赠送对话次数" prop="user_init_calls">
           <el-input v-model.number="system['user_init_calls']" placeholder="新用户注册赠送对话次数"/>
         </el-form-item>
+        <el-form-item label="VIP每月对话次数" prop="vip_month_calls">
+          <el-input v-model.number="system['vip_month_calls']" placeholder="VIP用户每月赠送对话次数"/>
+        </el-form-item>
         <el-form-item label="注册赠送绘图次数" prop="init_img_calls">
           <el-input v-model.number="system['init_img_calls']" placeholder="新用户注册赠送绘图次数"/>
         </el-form-item>