Merge branch 'master' of http://182.92.169.222:3000/yu/CostumingPlatform

ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue

@@ -214,7 +214,7 @@
                 height: 120px;" src="../assets/erweima.png"/>
         </div>
         <div class="r" style="width:290px">
-          <p class="f_16 c_4B">总计: ￥</p>
+          <p class="f_16 c_4B">总计: ￥{{this.payTotalPrice}}</p>
           <p class="f_14 c_4B">请使用支付宝扫描左图二维码进行支付</p>
           <p class="f_14 c_4B">请您在15分钟内付款以免订单被取消，如有疑问，请联系客服。</p>
           <p class="f_14 c_4B">订单发货后您将收到订单发货通知短信</p>
@@ -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){

ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue

@@ -153,7 +153,7 @@
         </div>
         <div class="btn">
           <router-link to="/shopping/person" class="c_fff f_16" style="margin-right: 30px">返回</router-link>
-          <a @click="ljgm" class="c_fff f_16">立即购买</a>
+          <a @click="ljgm" class="c_fff f_16" v-if="this.model.pay==='0'">立即支付</a>
         </div>
         <a-modal
           title="发票申请"
@@ -295,6 +295,8 @@
         visible2:false,
         visible3:false,
         cityId:"",
+        ordersid:"",
+        goodsid:"",
         description:"",
         defaultPicture:"",
         current:0,//目前步骤条在第几步
@@ -326,8 +328,8 @@
         url: {
           list: "/starehouse/starehouse/list",
           getdingdandh: "/sys/user/getdingdandh",
-          getdingdaninfo: "/sys/user/getdingdaninfo"
-
+          getdingdaninfo: "/sys/user/getdingdaninfo",
+          zf: "/zyorders/zyOrders/zf",
         },
       };
     },
@@ -381,7 +383,26 @@
         this.visible3 = true
       },
       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(){
+              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("+++++++++++++++++++++")

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -1575,6 +1575,7 @@ public class SysUserController {
             List<OrderGoods> 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<ZyStyleModel> queryWrapperzsm = QueryGenerator.initQueryWrapper(zyStyleModel, req.getParameterMap());
@@ -1623,6 +1624,7 @@ public class SysUserController {
         queryWrapperogs.eq("orders_id",zyOrders.getId());
         List<OrderGoods> 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<ZyStyleModel> queryWrapperzsm = QueryGenerator.initQueryWrapper(zyStyleModel, req.getParameterMap());

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;
     //创建人

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;