From 70fb67cab39b4e7098686ee202106c5a59ec99d6 Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 29 Mar 2023 16:45:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/shopping/pages/gerenzhongxin.vue | 25 ++++++++++++++- .../src/views/shopping/pages/orderDetails.vue | 31 ++++++++++++++++--- .../system/controller/SysUserController.java | 2 ++ .../org/jeecg/modules/system/vo/Grzx1.java | 3 +- .../org/jeecg/modules/system/vo/Grzx2.java | 2 ++ 5 files changed, 57 insertions(+), 6 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue index 51ea91d4..df73757e 100644 --- a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue +++ b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue @@ -214,7 +214,7 @@ height: 120px;" src="../assets/erweima.png"/>
-

总计: ￥

+

总计: ￥{{this.payTotalPrice}}

请使用支付宝扫描左图二维码进行支付

请您在15分钟内付款以免订单被取消，如有疑问，请联系客服。

订单发货后您将收到订单发货通知短信

@@ -254,6 +254,9 @@ }, current: ['allorders'],//目前打开的菜单 key:'',//当前选择的订单状态（待支付、待收货等） + ordersid:"", + goodsid:"", + payTotalPrice:"", allOrders2:[], allOrders1:[ { @@ -343,6 +346,7 @@ findgoods: "/sys/user/findgoods", getneeduser: "/getuserpersion/getneeduser", updateneeduser: "/getuserpersion/updateneeduser", + zf: "/zyorders/zyOrders/zf", }, labelCol: { span: 3 }, @@ -417,7 +421,23 @@ }); }, zhifu() { + getAction(this.url.zf,{ordersid:this.ordersid,goodsid:this.goodsid}).then((res1) => { + if (res1.success) { + this.$notification['success']({ + message: '支付成功！', + description: + '自动为您跳转个人中心中...', + }); + let that = this + setTimeout(function(){ + },2000); + this.getallgoods(); + this.visible3 = false; + }else{ + this.$message.error(res1.message); + } + }); }, passwordModalOk() { //TODO 密码修改完成 不需要刷新页面，可以把datasource中的数据更新一下 @@ -535,6 +555,9 @@ // id: item.id, // }, // }); + this.ordersid = item.id; + this.goodsid = item.goodsId; + this.payTotalPrice = item.total; this.visible3 = true }, menuChange(key){ diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue index 4101192f..f420174d 100644 --- a/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue +++ b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue @@ -153,7 +153,7 @@
返回 - 立即购买 + 立即支付
{ + if (res1.success) { + this.$notification['success']({ + message: '支付成功！', + description: + '自动为您跳转个人中心中...', + }); + let that = this + setTimeout(function(){ + that.$router.push({ + path: "/shopping/person", + query: { + // id: item.id, + }, + }); + },2000); + }else{ + this.$message.error(res1.message); + } + }); }, getdingdandh(){ getAction(this.url.getdingdandh,{ id: this.$route.query.id}).then((res) => { @@ -406,6 +427,8 @@ this.defaultPicture = this.dingdaninfo.defaultPicture; this.description=this.dingdaninfo.createTime; this.cityId = this.dingdaninfo.cityId; + this.ordersid = this.dingdaninfo.id; + this.goodsid = this.dingdaninfo.goodsId; this.visible = true; } else { console.log("+++++++++++++++++++++") diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 8eec36a2..736e8160 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -1575,6 +1575,7 @@ public class SysUserController { List orderGoodsList = orderGoodsService.list(queryWrapperogs); g2.setUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+orderGoodsList.get(0).getDefaultPicture()); g2.setName(orderGoodsList.get(0).getGoodsName()); + g2.setGoodsId(orderGoodsList.get(0).getGoodsId()); g2.setType(zyClothsStyleService.getById(orderGoodsList.get(0).getStyleId()).getStyleNames()); ZyStyleModel zyStyleModel = new ZyStyleModel(); QueryWrapper queryWrapperzsm = QueryGenerator.initQueryWrapper(zyStyleModel, req.getParameterMap()); @@ -1623,6 +1624,7 @@ public class SysUserController { queryWrapperogs.eq("orders_id",zyOrders.getId()); List orderGoodsList = orderGoodsService.list(queryWrapperogs); g1.setGoodsName(orderGoodsList.get(0).getGoodsName()); + g1.setGoodsId(orderGoodsList.get(0).getGoodsId()); g1.setStyleNames(zyClothsStyleService.getById(orderGoodsList.get(0).getStyleId()).getStyleNames()); ZyStyleModel zyStyleModel = new ZyStyleModel(); QueryWrapper queryWrapperzsm = QueryGenerator.initQueryWrapper(zyStyleModel, req.getParameterMap()); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/Grzx1.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/Grzx1.java index 919f4b77..f87bf1f6 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/Grzx1.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/Grzx1.java @@ -27,7 +27,8 @@ public class Grzx1 { private String payTotalPrice; //单价 private String unitPrice; - + //商品id + private String goodsId; //创建时间 private java.util.Date createTime; //创建人 diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/Grzx2.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/Grzx2.java index 16f5275a..a10ffbe6 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/Grzx2.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/Grzx2.java @@ -27,6 +27,8 @@ public class Grzx2 { private String price; private String material; private String total; + //商品id + private String goodsId;