Merge branch 'dev/dev_xp' into dev/dev

src/main/resources/mapper/primary/PaymentInfoMapper.xml

@@ -167,11 +167,21 @@
         INSERT IGNORE INTO
                t_payment_info (order_no, transaction_id, payment_type, trade_state, payer_total,
                                     type, content, notified, payment_method, last4, hosted_invoice_url,
-                                country, city, ip_address, create_time)
+                                country, city, ip_address, promotion_code, create_time)
                VALUES (#{paymentInfo.orderNo}, #{paymentInfo.transactionId}, #{paymentInfo.paymentType},
         #{paymentInfo.tradeState}, #{paymentInfo.payerTotal},#{paymentInfo.type}, #{paymentInfo.content},
         #{paymentInfo.notified},#{paymentInfo.paymentMethod}, #{paymentInfo.last4},#{paymentInfo.hostedInvoiceUrl},
-        #{paymentInfo.country},#{paymentInfo.city},#{paymentInfo.ipAddress},#{paymentInfo.createTime});
+        #{paymentInfo.country},#{paymentInfo.city},#{paymentInfo.ipAddress},#{paymentInfo.promotionCode},#{paymentInfo.createTime});
     </insert>
 
+    <select id="selectPaidPaymentsByAccountAndPromotion" resultType="com.ai.da.mapper.primary.entity.PaymentInfo">
+        SELECT pi.*
+        FROM t_order_info oi
+                 LEFT JOIN t_payment_info pi ON oi.order_no = pi.order_no
+        WHERE oi.account_id = #{accountId}
+          AND pi.promotion_code = #{promotionCode}
+          AND pi.trade_state = 'paid'
+    </select>
+
+
 </mapper>

src/main/resources/messages_en.properties

@@ -153,6 +153,9 @@ generate.result.below.standard=The quality of the generated images currently fal
 partial.design.failed=Partial design failed, Please try again later.
 email.count.limit=Rate limit reached. Retry in 1 hour.
 model.path.cannot.be.empty=Model path cannot be empty.
+this.promotion.code.has.expired=This promotion code has expired.
+this.promotion.code.is.invalid=This promotion code is invalid.
+one.time.limit.per.customer=This code has already been redeemed. Promo codes are limited to one-time use per customer.
 
 # 可能会报异常
 # Informative:

src/main/resources/messages_zh.properties

@@ -149,6 +149,9 @@ generate.result.below.standard=当前生成的图像质量低于标准。请考
 partial.design.failed=局部设计失败。请稍后重试。
 email.count.limit=您的账号触发邮件发送频率限制，请一小时后重试。
 model.path.cannot.be.empty=模特路径不能为空
+this.promotion.code.has.expired=该促销码已过期。
+this.promotion.code.is.invalid=该促销码无效。
+one.time.limit.per.customer=该码已兑换。每个促销码每位用户仅限使用一次。
 
 # 可能会报异常
 # Informative: