diff --git a/mobile-web/src/page/pay/index.vue b/mobile-web/src/page/pay/index.vue index 7678f1327..dfbc95611 100644 --- a/mobile-web/src/page/pay/index.vue +++ b/mobile-web/src/page/pay/index.vue @@ -20,6 +20,7 @@ return { appId: this.$route.query.appId, orderId: this.$route.query.orderId, + returnUrl: this.$route.query.returnUrl, transaction: {}, } }, @@ -34,13 +35,27 @@ methods: { submit(payChannel) { let that = this; - debugger; submitTransaction(this.appId, this.orderId, payChannel).then(data => { pingpp.createPayment(data.invokeResponse, function(result, err) { - debugger; - console.log(result); - console.log(err.msg); - console.log(err.extra); + if (result === 'success') { + Dialog.alert({ + title: '系统提示', + message: '支付成功', + beforeClose: function (action, done) { + // 关闭弹窗 + done(); + // 跳转到我的优惠劵 + that.$router.push(decodeURI(that.returnUrl)); + } + }); + } else { + // console.log(err.msg); + // console.log(err.extra); + Dialog.alert({ + title: '系统提示', + message: '支付失败:' + err.msg, + }); + } }); }); } diff --git a/mobile-web/src/page/user/order/list.vue b/mobile-web/src/page/user/order/list.vue index a8505e3ff..c11a4abc8 100644 --- a/mobile-web/src/page/user/order/list.vue +++ b/mobile-web/src/page/user/order/list.vue @@ -63,7 +63,7 @@ }, methods: { goPay(itemId) { - this.$router.push('/pay?appId=POd4RC6a&orderId=' + itemId); + this.$router.push('/pay?appId=POd4RC6a&orderId=' + itemId + '&returnUrl=' + encodeURI('/user/order/info/' + itemId)); }, onTabChange(index) { diff --git a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionBO.java b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionBO.java index a1803089c..c48900d92 100644 --- a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionBO.java +++ b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionBO.java @@ -3,6 +3,7 @@ package cn.iocoder.mall.pay.api.bo; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Date; /** @@ -10,7 +11,7 @@ import java.util.Date; */ @Data @Accessors(chain = true) -public class PayTransactionBO { +public class PayTransactionBO implements Serializable { /** * 编号,自增 diff --git a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionSubmitBO.java b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionSubmitBO.java index affad3d1e..6d2277533 100644 --- a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionSubmitBO.java +++ b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionSubmitBO.java @@ -3,12 +3,14 @@ package cn.iocoder.mall.pay.api.bo; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 支付交易提交结果 BO */ @Data @Accessors(chain = true) -public class PayTransactionSubmitBO { +public class PayTransactionSubmitBO implements Serializable { /** * 支付交易拓展单编号