From 01eb0f9544997636d666f0b3f7c9f497aabf25bf Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Thu, 16 Mar 2023 09:25:25 +0800
Subject: [PATCH 1/5] 1

---
 ant-design-vue-jeecg/src/config/router.config.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ant-design-vue-jeecg/src/config/router.config.js b/ant-design-vue-jeecg/src/config/router.config.js
index b360df4f..bb2c6cab 100644
--- a/ant-design-vue-jeecg/src/config/router.config.js
+++ b/ant-design-vue-jeecg/src/config/router.config.js
@@ -672,4 +672,8 @@ export const constantRouterMap = [
     path: '/shopping/billDetail',//这里是你需要设置新窗口打开的页面的路径s
     component: () => import('@/views/shopping/components/billDetail'),
   },
+  {
+    path: '/shopping/ClothDetail1',//这里是你需要设置新窗口打开的页面的路径s
+    component: () => import('@/views/shopping/pages/clothDetail1'),
+  },
 ]

From 3940fa206fcb5f3065433499e012a5e6f78ac646 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Thu, 16 Mar 2023 09:32:57 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/shopping/pages/chengyi.vue      | 117 +---
 .../src/views/shopping/pages/clothDetail.vue  |   5 +
 .../src/views/shopping/pages/clothDetail1.vue |  21 +-
 .../src/views/shopping/pages/placeOrder.vue   | 558 ++++++++++++------
 .../src/views/shopping/shopHome.vue           |  36 +-
 .../org/jeecg/config/shiro/ShiroConfig.java   |   6 +
 .../zygoods/controller/ZyGoodsController.java |  48 ++
 .../controller/ZyOrdersController.java        | 338 ++++++++++-
 .../modules/demo/zyorders/entity/Dz.java      |  51 ++
 9 files changed, 908 insertions(+), 272 deletions(-)
 create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/entity/Dz.java

diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/chengyi.vue b/ant-design-vue-jeecg/src/views/shopping/pages/chengyi.vue
index 8369464e..b7a79afd 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/chengyi.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/chengyi.vue
@@ -75,6 +75,7 @@
 </template>
 <script>
   import Header from '../components/Header/HeaderView'
+  import { httpAction, getAction } from '@/api/manage'
   let compareDown = function (prop) {
     return function (obj1, obj2) {
       var val1 = obj1[prop];
@@ -106,89 +107,12 @@
     components: {Header},
     data() {
       return {
+        url: {
+          cd: "/zygoods/zyGoods/cd",
+          cylxlist: "/zygoods/zyGoods/cylxlist",
+        },
         // 右侧展示衣服数据
-        clothsList: [
-          {
-            id: 1,
-            imgUrl: require("../assets/cloth.png"),
-            currentPrice: 199,
-            historicalPrice: 799,
-            title: "HOODIE 运动长袖连帽卫衣套头衫",
-            heat: 3100,
-          },
-          {
-            id: 2,
-            imgUrl: require("../assets/cloth.png"),
-            currentPrice: 299,
-            historicalPrice: 799,
-            title: "HOODIE 运动长袖连帽卫衣套头衫",
-            heat: 3200,
-          },
-          {
-            id: 3,
-            imgUrl: require("../assets/cloth.png"),
-            currentPrice: 399,
-            historicalPrice: 799,
-            title: "HOODIE 运动长袖连帽卫衣套头衫",
-            heat: 3300,
-          },
-          {
-            id: 4,
-            imgUrl: require("../assets/cloth.png"),
-            currentPrice: 499,
-            historicalPrice: 799,
-            title: "HOODIE 运动长袖连帽卫衣套头衫",
-            heat: 3400,
-          },
-          {
-            id: 5,
-            imgUrl: require("../assets/cloth.png"),
-            currentPrice: 599,
-            historicalPrice: 799,
-            title: "HOODIE 运动长袖连帽卫衣套头衫",
-            heat: 3500,
-          },
-          {
-            id: 6,
-            imgUrl: require("../assets/cloth.png"),
-            currentPrice: 699,
-            historicalPrice: 799,
-            title: "HOODIE 运动长袖连帽卫衣套头衫",
-            heat: 3600,
-          },
-          {
-            id: 7,
-            imgUrl: require("../assets/cloth.png"),
-            currentPrice: 599,
-            historicalPrice: 799,
-            title: "HOODIE 运动长袖连帽卫衣套头衫",
-            heat: 3700,
-          },
-          {
-            id: 8,
-            imgUrl: require("../assets/cloth.png"),
-            currentPrice: 599,
-            historicalPrice: 799,
-            title: "HOODIE 运动长袖连帽卫衣套头衫",
-            heat: 3800,
-          },
-          {
-            id: 9,
-            imgUrl: require("../assets/cloth.png"),
-            currentPrice: 599,
-            historicalPrice: 799,
-            title: "HOODIE 运动长袖连帽卫衣套头衫",
-            heat: 3900,
-          },
-          {
-            id: 10,
-            imgUrl: require("../assets/cloth.png"),
-            currentPrice: 599,
-            historicalPrice: 799,
-            title: "HOODIE 运动长袖连帽卫衣套头衫",
-            heat:4000,
-          },
-        ],
+        clothsList: [],
         // 菜单数据
         typeData: [
           {
@@ -419,10 +343,17 @@
         this.findIndex(indexPath)
         //这里更改右边显示衣服的数据,通过this.current.id查
         // this.clothsList
+        getAction(this.url.cylxlist,{typeid:indexPath[1]}).then((res1) => {
+          if (res1.success) {
+            this.clothsList = res1.result;
+          }else{
+            this.$message.error(res1.message);
+          }
+        });
       },
       clothDetails(item) {
         this.$router.push({
-          path: "/shopping/ClothDetail",
+          path: "/shopping/ClothDetail1",
           query: { id: item.id, title: item.title ,name:this.current.name,parentName:this.current.parrentName},
         });
       },
@@ -443,9 +374,23 @@
       }
     },
     mounted() {
-      this.current.name =  this.typeData[0].childrens[0].name
-      this.current.id =  this.typeData[0].childrens[0].id
-      this.current.parrentName =  this.typeData[0].name
+      getAction(this.url.cd).then((res) => {
+        if (res.success) {
+          this.typeData = res.result;
+          this.current.name =  res.result[0].childrens[0].name
+          this.current.id =  res.result[0].childrens[0].id
+          this.current.parrentName =  res.result[0].name
+          getAction(this.url.cylxlist,{typeid:res.result[0].childrens[0].id}).then((res1) => {
+            if (res1.success) {
+              this.clothsList = res1.result;
+            }else{
+              this.$message.error(res1.message);
+            }
+          });
+        }else{
+          this.$message.error(res.message);
+        }
+      });
     }
   }
 </script>
diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail.vue b/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail.vue
index e52de488..fd9171b5 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail.vue
@@ -293,6 +293,11 @@
           path: "/shopping/placeOrder",
           query: {
             // id: item.id,//传参
+            goodsid:this.$route.query.id,
+            size : this.size,
+            title :this.$route.query.title,
+            name :this.$route.query.name,
+            parentName : this.$route.query.parentName,
           },
         });
       }
diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail1.vue b/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail1.vue
index 3d266d19..b735aad3 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail1.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail1.vue
@@ -1,5 +1,5 @@
 <template>
-<!--  服装详情页-->
+  <!--  服装详情页-->
   <div class="clothDetails">
     <Header fontColor="#000"></Header>
     <div class="jz menu d-flex">
@@ -27,7 +27,7 @@
         <a-carousel arrows dots-class="slick-dots slick-thumb" >
           <template slot="customPaging" slot-scope="props" >
             <a  v-for="(item,index) in baseUrl" :key="index">
-  <!--            <img v-for="(item,index) in baseUrl" :key="index" :src="item" />-->
+              <!--            <img v-for="(item,index) in baseUrl" :key="index" :src="item" />-->
               <img :src="item" />
             </a>
           </template>
@@ -73,8 +73,8 @@
           </span>
         </el-dialog>
         <div class="sizeDiv">
-<!--        <div class="sizeDiv d-flex" id="sizeDiv">-->
-<!--          <span class="item f_16" v-for="(item,index) in sizeList" :key="index" @click="chooseSize(item,index)">{{item.size}}</span>-->
+          <!--        <div class="sizeDiv d-flex" id="sizeDiv">-->
+          <!--          <span class="item f_16" v-for="(item,index) in sizeList" :key="index" @click="chooseSize(item,index)">{{item.size}}</span>-->
           <el-radio-group v-model="size" size="small" @change="sizeChange">
             <el-radio-button v-for="(item,index) in sizeList"  :key="index" :label="item.size" :disabled="!item.flag" ></el-radio-button>
           </el-radio-group>
@@ -293,6 +293,11 @@
           path: "/shopping/placeOrder",
           query: {
             // id: item.id,//传参
+            goodsid:this.$route.query.id,
+            size : this.size,
+            title :this.$route.query.title,
+            name :this.$route.query.name,
+            parentName : this.$route.query.parentName,
           },
         });
       }
@@ -500,10 +505,10 @@
     }
     .selected{
       .title{
-      border-left: 5px solid #746957;
-      height: 40px;
-      line-height: 40px;
-      padding-left: 25px;
+        border-left: 5px solid #746957;
+        height: 40px;
+        line-height: 40px;
+        padding-left: 25px;
         margin-bottom: 50px;
       }
       .selectedCloth{
diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/placeOrder.vue b/ant-design-vue-jeecg/src/views/shopping/pages/placeOrder.vue
index 4052f89c..1fdb0ae5 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/placeOrder.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/placeOrder.vue
@@ -1,23 +1,23 @@
 <template>
-<!--  订单详情-->
+  <!--  订单详情-->
   <div class="placeOrder">
     <Header fontColor="#000"></Header>
     <div style="padding-top: 88px"></div>
     <div class="orderMain">
       <div class="jz">
-<!--        <el-breadcrumb class="breadcrumb" separator="/">-->
-<!--          <el-breadcrumb-item :to="{ path: '/shopping/person' }">个人中心</el-breadcrumb-item>-->
-<!--          <el-breadcrumb-item :to="{ path: '/shopping/person' }">全部订单</el-breadcrumb-item>-->
-<!--          <el-breadcrumb-item>订单详情</el-breadcrumb-item>-->
-<!--        </el-breadcrumb>-->
+        <!--        <el-breadcrumb class="breadcrumb" separator="/">-->
+        <!--          <el-breadcrumb-item :to="{ path: '/shopping/person' }">个人中心</el-breadcrumb-item>-->
+        <!--          <el-breadcrumb-item :to="{ path: '/shopping/person' }">全部订单</el-breadcrumb-item>-->
+        <!--          <el-breadcrumb-item>订单详情</el-breadcrumb-item>-->
+        <!--        </el-breadcrumb>-->
         <div class="d-flex">
           <div class="l">
             <div class="card">
               <p class="f_24">待支付</p>
-<!--              <p class="f_24" v-if="!this.model.pay">待支付</p>-->
-<!--              <p class="f_24" v-if="!this.model.receipt && this.model.pay">待收货</p>-->
-<!--              <p class="f_24" v-if="this.model.receipt">已完成</p>-->
-<!--              <a class="c_333 f_12" v-if="this.model.receipt">查看发票详情</a>-->
+              <!--              <p class="f_24" v-if="!this.model.pay">待支付</p>-->
+              <!--              <p class="f_24" v-if="!this.model.receipt && this.model.pay">待收货</p>-->
+              <!--              <p class="f_24" v-if="this.model.receipt">已完成</p>-->
+              <!--              <a class="c_333 f_12" v-if="this.model.receipt">查看发票详情</a>-->
             </div>
             <div class="steps">
               <a-steps direction="vertical" size="small" :current="current">
@@ -62,34 +62,36 @@
                 <a-button
                   class="defaultAddr"
                   style="padding-top: 10px;word-wrap: break-word;
+
                   overflow-wrap: break-word;
                   white-space: normal;
                   height: auto;
                   margin-bottom:10px;
                   text-align:left;
-                  overflow: hidden;" v-for="(item,index) in addrList" :key="index" @click="chooseAddr(item)" >
-                  <p class="text">{{item.addr1}}</p>
-                  <p class="text">{{item.addr2}}</p>
-                  <p class="text d-flex"><span>463000</span><span v-if="item.flag">默认地址</span></p>
+                  overflow: hidden;"  >
+                  <j-area-linkage disabled type="cascader" v-model="defaultAddr.addr1" placeholder="请选择省市区"/>
+                  <p class="text f_12">{{defaultAddr.addr2}}</p>
+                  <p class="text d-flex f_14"><span>{{defaultAddr.postCode}}</span><span v-if="defaultAddr.flag">默认地址</span></p>
                 </a-button>
-<!--                <p class="headline">已发货</p>-->
-<!--                <p class="text">您的订单已经发出。</p>-->
-<!--                <p class="headline">尊享免费配送，您的物流单号：</p>-->
-<!--                <p class="text">4263882788397</p>-->
+                <a-button  @click="showModal">选择其他地址</a-button>
               </div>
               <div class="orderList ">
                 <div class="item d-flex">
                   <div class="img">
-                    <img src="../assets/cloth001.png">
+                    <img :src="tp">
                   </div>
                   <div class="info">
-                    <p class="f_14 c_333 headline">商品名商品名商品名商品名商品</p>
-                    <p class="d-flex">款式：<span>衬衫</span></p>
-                    <p class="d-flex">尺码：<span>XXL</span></p>
-                    <p class="d-flex">主辅料：<span>主料1，辅料2，辅料3，辅料4，辅料5，辅料6</span></p>
+                    <p class="f_14 c_333 headline">{{this.dingdaninfo.goodsName}}</p>
+                    <p class="d-flex">款式：<span>{{this.dingdaninfo.styleNames}}</span></p>
+                    <p class="d-flex">尺码：<span>{{this.dingdaninfo.modelNumber}}</span></p>
+                    <p class="d-flex">主辅料：<span>{{this.dingdaninfo.name}}</span></p>
                   </div>
                   <div class="right d-flex f_14 c_333">
-                    <span>1</span><span>2478</span><span>2478</span>
+                    <span>
+                      <el-input-number style="width: 80px" controls-position="right" size="mini" v-model="dingdaninfo.num" @change="handleChange" :min="1"></el-input-number>
+                    </span>
+                    <span>{{this.dingdaninfo.price}}</span>
+                    <span>{{this.dingdaninfo.total}}</span>
                   </div>
                 </div>
               </div>
@@ -98,39 +100,157 @@
               <p class="d-flex">
                 <span class="leftSide  f_20" style="font-weight:500">购买人</span>
                 <span class="midst  f_16">小记</span>
-                <span class="rightSide  f_16"  style="font-weight:500">4,956</span>
+                <span class="rightSide  f_16"  style="font-weight:500">{{this.dingdaninfo.total}}</span>
               </p>
               <p class="d-flex">
-                <span class="leftSide  f_18">王贰</span>
+                <span class="leftSide  f_18">{{this.dingdaninfo.buyer}}</span>
                 <span class="midst  f_16">运费总计</span>
-                <span class="rightSide  f_16" style="font-weight:500">0</span>
+                <span class="rightSide  f_16" style="font-weight:500">{{this.dingdaninfo.fare}}</span>
               </p>
               <p class="d-flex">
                 <span class="leftSide"></span>
                 <span class="midst  f_20"  style="font-weight:600">总计</span>
-                <span class="rightSide  f_20" style="font-weight:600">4,956</span>
+                <span class="rightSide  f_20" style="font-weight:600">{{this.dingdaninfo.all}}</span>
               </p>
             </div>
           </div>
         </div>
         <div class="btn">
           <a  class="c_fff f_16" @click="handleBack">返回</a>
-          <a  class="c_fff f_16">提交</a>
+          <a  class="c_fff f_16" @click="tj()">提交</a>
         </div>
       </div>
     </div>
+    <a-modal :width="800" v-model="visible" title="选择其他地址" @ok="handleOk" @cancel="handleCancel">
+      <a-radio-group v-model="value" @change="onChange">
+        <a-radio :style="radioStyle"  v-for="(item,index) in formInline" :key="index" :value="item.id">
+          <div style="display: flex;align-items: center">
+            <j-area-linkage type="cascader" v-model="item.addr1" placeholder="请选择省市区" style="margin-right: 20px"/>
+            <span style="margin-right: 20px;word-wrap: break-word;
+                  overflow-wrap: break-word;
+                  white-space: normal;">{{item.addr2}}</span><span>{{item.postCode}}</span>
+          </div>
+
+        </a-radio>
+      </a-radio-group>
+    </a-modal>
+    <a-modal v-model="visible2"  class="toPay">
+      <template slot="title">
+        <div class="c_1B f_20" style="text-align: center;padding: 5px;font-weight: 500">支付宝支付</div>
+      </template>
+      <div class="d-flex"
+           style="
+            width: 450px;
+            padding: 30px 10px;
+            margin: 0 auto;">
+        <div class="l"
+             style="
+                width: 120px;
+                height: 120px;
+                background-color: grey;
+                margin-right: 20px;" @click="zhifu">
+
+        </div>
+        <div class="r" style="width:290px">
+          <p class="f_16 c_4B">总计: ￥{{this.dingdaninfo.all}}</p>
+          <p class="f_14 c_4B">请使用支付宝扫描左图二维码进行支付</p>
+          <p class="f_14 c_4B">请您在15分钟内付款以免订单被取消，如有疑问，请联系客服。</p>
+          <p class="f_14 c_4B">订单发货后您将收到订单发货通知短信</p>
+        </div>
+      </div>
+      <template slot="footer">
+        <div class="d-flex" style="justify-content: center;align-items:center">
+          <a-button style="margin-right: 30px;border:none;font-size: 12px">手机不在身边？ 登录账号付款</a-button>
+          <a-button style="font-size: 12px"   size="small" @click="handleCancel">
+            返回
+          </a-button>
+        </div>
+
+      </template>
+    </a-modal>
     <Footer></Footer>
+
   </div>
 </template>
 <script>
   import Header from "../components/Header/HeaderView";
   import Footer from "../components/Footer/FooterView"
+  import { httpAction, getAction } from '@/api/manage'
   export default {
     name: "placeOrder",
     components: { Header,Footer },
     data() {
       return {
+        url: {
+          xd: "/zyorders/zyOrders/xd",
+          dzlist: "/zyorders/zyOrders/dzlist",
+          TJorder: "/zyorders/zyOrders/TJorder",
+          zf: "/zyorders/zyOrders/zf",
+        },
+        ordersid:"",
+        tp:"../assets/cloth001.png",
+        dingdaninfo:{
+          orderNum:111111,
+          createTime:'2022-08-19',
+          goodsName:'男士职业正装外套',
+          styleNames:'test01',
+          modelNumber:'S',
+          name:'白色素面布',
+          typeName:'有纺树脂衬',
+          num:1,
+          price:2478,
+          total:2478,
+          buyer:'张三',
+          fare:0,//运费
+          all:0//合计
+        },//订单信息
+        value: 1,//弹窗选择的地址id
+        radioAddr:{
+
+        },//弹窗选择的地址
+        radioStyle: {
+          display: 'flex',
+          alignItems:'center'
+        },
         current:0,//目前步骤条在第几步
+        visible:false,//地址弹窗是否显示
+        visible2:false,//支付弹窗是否显示
+        // 全部地址列表
+        formInline: [
+          {
+            id:134325,
+            user: false,
+            addr1:'210521',
+            addr2:'黄淮学院南校区学府花园26号楼弹窗1',
+            postCode:'463800',
+            flag:false//是否默认地址
+          },
+          {
+            id:2432,
+            user: false,
+            addr1:'210521',
+            addr2:'黄淮学院南校区学府花园26号楼弹窗2',
+            postCode:'463800',
+            flag:false
+          },
+          {
+            id:324345,
+            user: false,
+            addr1:'210521',
+            addr2:'黄淮学院南校区学府花园26号楼弹窗3',
+            postCode:'463800',
+            flag:false
+
+          },
+          {
+            id:424365,
+            user: false,
+            addr1:'210521',
+            addr2:'黄淮学院南校区学府花园26号楼弹窗4',
+            postCode:'463800',
+            flag:false
+          },
+        ],
         model:{
           id:'',//订单id
           orderNum:'1111111',//订单编号
@@ -138,37 +258,107 @@
           pay:false,//是否已支付
           // receipt:false
         },
-        addrList:[//地址列表
-          {
-            id:1,
-            addr1:'河南省 驻马店市 驿城区',
-            addr2:'黄淮学院南校区学府花园26号楼3602',
-            flag:true//是否默认地址
-          },
-          {
-            id:2,
-            addr1:'河南省 驻马店市 驿城区',
-            addr2:'黄淮学院南校区学府花园26号楼3601',
-            flag:false
-          }
-        ]
+        // 默认展示地址
+        defaultAddr:{
+          id:'1',
+          addr1:'210521',
+          addr2:'黄淮学院南校区学府花园26号楼默认1',
+          flag:true,//是否默认地址
+          postCode:'463800',
+        },
       };
     },
     methods:{
-      chooseAddr(item){
-        console.log(item)
+      tj(){
+        getAction(this.url.TJorder,{OrdersNum:this.model.orderNum,goodsid:this.$route.query.goodsid,goodsNum:this.dingdaninfo.num}).then((res1) => {
+          if (res1.success) {
+            this.ordersid = res1.result;
+            //console.log(res1.result)
+            this.visible2 = true;
+          }else{
+            this.$message.error(res1.message);
+          }
+        });
+      },
+      zhifu() {
+        getAction(this.url.zf,{ordersid:this.ordersid,goodsid:this.$route.query.goodsid}).then((res1) => {
+          if (res1.success) {
+            this.$notification['success']({
+              message: '支付成功！',
+              description:
+                '自动为您跳转首页中...',
+            });
+            let that = this
+            setTimeout(function(){
+              that.$router.push({
+                path: "/shopping/shopHome",
+                query: {
+                  // id: item.id,
+                },
+              });
+            },2000);
+          }else{
+            this.$message.error(res1.message);
+          }
+        });
+      },
+      handleChange(value) {
+        this.dingdaninfo.total = this.dingdaninfo.price*value
+        this.dingdaninfo.all = this.dingdaninfo.total + this.dingdaninfo.fare
+      },
+      onChange(e) {
+        this.radioAddr = this.formInline.find(object => object.id == e.target.value)
+        this.value = e.target.value
+      },
+      showModal() {
+        this.visible = true;
+      },
+      handleOk(e) {
+        this.visible = false;
+        if(JSON.stringify(this.radioAddr) !== "{}"){
+          this.defaultAddr = this.radioAddr
+        }
+      },
+      handleCancel(e) {
+        this.visible = false;
+        this.visible2 = false;
       },
       handleBack(){
         this.$router.push({
           path: "/shopping/ClothDetail",
-          query: {
-            // id: item.id,
-          },
+          query: { id: this.$route.query.goodsid, title: this.$route.query.title ,name:this.$route.query.name,parentName:this.$route.query.parentName},
         });
       }
     },
     mounted() {
-
+      this.dingdaninfo.all = this.dingdaninfo.total + this.dingdaninfo.fare;
+      getAction(this.url.dzlist).then((res) => {
+        if (res.success) {
+          //console.log(res.result);
+          this.formInline = res.result;
+        }else{
+          this.$message.error(res.message);
+        }
+      });
+      getAction(this.url.xd,{goodsid:this.$route.query.goodsid}).then((res1) => {
+        if (res1.success) {
+          //console.log(res1.result)
+          this.model.orderTime = res1.result.dqsj;
+          this.model.orderNum = res1.result.orderNum;
+          this.defaultAddr = res1.result.address;
+          this.dingdaninfo.buyer = res1.result.gmr;
+          this.dingdaninfo.goodsName = res1.result.spmc;
+          this.dingdaninfo.styleNames=res1.result.spks;
+          this.dingdaninfo.modelNumber=this.$route.query.size;
+          this.dingdaninfo.name=res1.result.zfl;
+          this.dingdaninfo.price=res1.result.spjg;
+          this.tp=res1.result.sptp;
+          this.dingdaninfo.total = res1.result.spjg;
+          this.dingdaninfo.all = res1.result.spjg;
+        }else{
+          this.$message.error(res1.message);
+        }
+      });
     },
   };
 </script>
@@ -179,156 +369,180 @@
 </style>
 <style lang="less" scoped>
   @import '../assets/common.css';
-.orderMain{
-  background: #F6F6F6;
-  padding-bottom: 100px;
-  padding-top: 50px;
-  .jz{
-    .breadcrumb{
-      padding-top: 50px;
-      padding-bottom: 50px;
+  .j-area-linkage /deep/ .area-select{
+    background-color: #fff;
+    border: none;
+    span{
+      padding-left: 0;
+      font-size: 12px;
+      color:#313131;
+      cursor:auto;
+      font-weight: 500;
+    }
+    i{
+      display: none;
     }
-    .d-flex{
-      justify-content: space-between;
-      .l{
-        width: 300px;
-        .card{
+  }
+  .ant-radio-group /deep/ .area-cascader-wrap{
+    height:40px;
+    .area-select{
+      height: 40px;
+      .area-selected-trigger{
+        height: 40px;line-height:40px;
+        padding: 0;
+      }
+    }
+  }
+  .orderMain{
+    background: #F6F6F6;
+    padding-bottom: 100px;
+    padding-top: 50px;
+    .jz{
+      .breadcrumb{
+        padding-top: 50px;
+        padding-bottom: 50px;
+      }
+      .d-flex{
+        justify-content: space-between;
+        .l{
           width: 300px;
-          height: 157px;
-          background: #FFFFFF;
-          margin-bottom: 20px;
-          text-align: center;
-          padding-top: 40px;
-          .f_24{
-            color: #C8A985;
+          .card{
+            width: 300px;
+            height: 157px;
+            background: #FFFFFF;
             margin-bottom: 20px;
-          }
-          .f_12{
-            padding: 5px 14px;
-            border: 1px solid #333333;
-          }
-        }
-        .steps{
-          width: 300px;
-          height: 736px;
-          background: #FFFFFF;
-          padding: 32px 55px;
-        }
-      }
-      .r{
-        width: 1110px;
-        height: 913px;
-        background: #FFFFFF;
-        padding: 54px 48px;
-        .title{
-          padding-bottom: 15px;
-          border-bottom: 1px solid #DADADA;
-          .line{
-            margin-left: 10px;
-            margin-right: 10px;
-          }
-          .right{
-            width: 25%;
-            span{
+            text-align: center;
+            padding-top: 40px;
+            .f_24{
               color: #C8A985;
+              margin-bottom: 20px;
+            }
+            .f_12{
+              padding: 5px 14px;
+              border: 1px solid #333333;
             }
           }
-        }
-        .orderDiv{
-          padding-bottom: 20px;
-          border-bottom: 1px solid #DADADA;
-          .orderAddr{
-          width: 25%;
-          color: #333;
-          font-size: 16px;
-          p{
-            margin-bottom: 10px;
-          }
-          .headline{
-            font-weight: 500;
-            color: #C8A985;
-            margin-top: 30px;
-          }
-          .text{
-            font-weight: 400;
+          .steps{
+            width: 300px;
+            /*height: 736px;*/
+            background: #FFFFFF;
+            padding: 32px 55px;
           }
         }
-        .orderList{
-          width: 75%;
-          .item{
-            padding-top: 30px;
+        .r{
+          width: 1110px;
+          /*height: 913px;*/
+          background: #FFFFFF;
+          padding: 54px 48px;
+          .title{
+            padding-bottom: 15px;
             border-bottom: 1px solid #DADADA;
-            &:last-of-type{
-              border: none;
+            .line{
+              margin-left: 10px;
+              margin-right: 10px;
             }
-            .img{
-              width: 23.33%;
-              img{
-                width: 180px;
-                height: 180px;
+            .right{
+              width: 25%;
+              span{
+                color: #C8A985;
               }
             }
-            .info{
-              width: 43.33%;
-              padding-right: 15px;
+          }
+          .orderDiv{
+            padding-bottom: 20px;
+            border-bottom: 1px solid #DADADA;
+            .orderAddr{
+              width: 25%;
+              color: #333;
+              font-size: 16px;
+              p{
+                margin-bottom: 10px;
+              }
               .headline{
                 font-weight: 500;
+                color: #C8A985;
+                margin-top: 30px;
               }
-              p{
-                span{
-                  margin-left: 10px;
-                  display: inline-block;
-                  width: 75%;
-                }
+              .text{
+                font-weight: 400;
               }
             }
-            .right{
-              width: 33.33%;
-              font-weight: 500;
-            }
-          }
+            .orderList{
+              width: 75%;
+              .item{
+                padding-top: 30px;
+                border-bottom: 1px solid #DADADA;
+                &:last-of-type{
+                  border: none;
+                }
+                .img{
+                  width: 23.33%;
+                  img{
+                    width: 180px;
+                    height: 180px;
+                  }
+                }
+                .info{
+                  width: 43.33%;
+                  padding-right: 15px;
+                  .headline{
+                    font-weight: 500;
+                  }
+                  p{
+                    span{
+                      margin-left: 10px;
+                      display: inline-block;
+                      width: 75%;
+                    }
+                  }
+                }
+                .right{
+                  width: 33.33%;
+                  font-weight: 500;
+                }
+              }
 
 
-        }}
-        .heji{
-          padding: 30px 20px;
-          p{
-            span{
-              width: 20%;
-              color: #333;
-            }
-            .leftSide{
-              text-align: left;
+            }}
+          .heji{
+            padding: 30px 20px;
+            p{
+              span{
+                width: 20%;
+                color: #333;
+              }
+              .leftSide{
+                text-align: left;
 
-            }
-            .midst{
-              text-align: center;
+              }
+              .midst{
+                text-align: center;
 
-            }
-            .rightSide{
-              text-align: right;
+              }
+              .rightSide{
+                text-align: right;
 
+              }
             }
           }
         }
       }
     }
+    .btn{
+      a{
+        display: inline-block;
+        width: 284px;
+        height: 56px;
+        background: #1B1B1B;
+        line-height: 56px;
+        margin-right: 20px;
+      }
+      &:hover{
+        color: red;
+      }
+      text-align: center;
+      margin-top: 60px;
+    }
   }
-.btn{
-  a{
-    display: inline-block;
-    width: 284px;
-    height: 56px;
-    background: #1B1B1B;
-    line-height: 56px;
-    margin-right: 20px;
-  }
-  &:hover{
-    color: red;
-  }
-  text-align: center;
-  margin-top: 60px;
-}
-}
 </style>
 
diff --git a/ant-design-vue-jeecg/src/views/shopping/shopHome.vue b/ant-design-vue-jeecg/src/views/shopping/shopHome.vue
index 4f7844d8..2a0da223 100644
--- a/ant-design-vue-jeecg/src/views/shopping/shopHome.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/shopHome.vue
@@ -86,7 +86,7 @@
           <div slot="nextArrow" slot-scope="props" class="custom-slick-arrow" style="right: 10px">
             <a-icon type="right-circle" />
           </div>
-          <div class="box" v-for="(item, index) in clothList2" :key="index">
+          <div class="box" v-for="(item, index) in clothList2" :key="index" @click="tjspxq1(item.id,item.title)">
             <img :src="item.imgUrl" alt="" />
             <p class="box1">{{item.title}}</p>
             <p class="box2">{{item.time}}</p>
@@ -121,6 +121,7 @@
                 class="item d-flex"
                 v-for="(item, index) in nanzhuang"
                 :key="index"
+                @click="tjspxq(item.id,item.title2)"
               >
                 <img :src="item.imgUrl" alt="" />
                 <p class="title_6">
@@ -148,6 +149,7 @@
                 class="item d-flex"
                 v-for="(item, index) in nvzhuang"
                 :key="index"
+                @click="tjspxq(item.id,item.title2)"
               >
                 <img :src="item.imgUrl" alt="" />
                 <p>
@@ -175,6 +177,7 @@
                 class="item d-flex"
                 v-for="(item, index) in tongzhuang"
                 :key="index"
+                @click="tjspxq(item.id,item.title2)"
               >
                 <img :src="item.imgUrl" alt="" />
                 <p>
@@ -217,6 +220,7 @@
           zxdz: "/zygoods/zyGoods/zxdz",
           tjsp: "/zygoods/zyGoods/tjsp",
           fzlx: "/zygoods/zyGoods/fzlx",
+          tjspxq: "/zygoods/zyGoods/tjspxq",
         },
         // 轮播图数据
         imgList: [
@@ -655,10 +659,38 @@
         }
       })
     },
+    methods:{
+      tjspxq(id,title){
+        getAction(this.url.tjspxq,{id:id}).then((res) => {
+          if (res.success) {
+            console.log(res.result)
+            this.$router.push({
+              path: "/shopping/ClothDetail",
+              query: { id: id, title: title ,name:res.result.name,parentName:res.result.parentName},
+            });
+          }else{
+            this.$message.error(res.message);
+          }
+        })
+      },
+      tjspxq1(id,title){
+        getAction(this.url.tjspxq,{id:id}).then((res) => {
+          if (res.success) {
+            console.log(res.result)
+            this.$router.push({
+              path: "/shopping/ClothDetail1",
+              query: { id: id, title: title ,name:res.result.name,parentName:res.result.parentName},
+            });
+          }else{
+            this.$message.error(res.message);
+          }
+        })
+      },
+    },
   }
 </script>
 <style scoped>
-  @import './assets/common.css'
+  @import './assets/common.css';
 </style>
 <style scoped>
   .box {
diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
index a6331fd3..76b381ad 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@@ -163,6 +163,12 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/zygoods/zyGoods/cd","anon");
         filterChainDefinitionMap.put("/zygoods/zyGoods/lxlist","anon");
         filterChainDefinitionMap.put("/zygoods/zyGoods/lxlistxq","anon");
+        //filterChainDefinitionMap.put("/zyorders/zyOrders/xd","anon");
+        //filterChainDefinitionMap.put("/zyorders/zyOrders/dzlist","anon");
+        //filterChainDefinitionMap.put("/zyorders/zyOrders/orderXD","anon");
+        //filterChainDefinitionMap.put("/zyorders/zyOrders/TJorder","anon");
+        //filterChainDefinitionMap.put("/zyorders/zyOrders/zf","anon");
+        //filterChainDefinitionMap.put("/zygoods/zyGoods/cylxlist","anon");
 
         //filterChainDefinitionMap.put("/actTask/**", "anon");
         //filterChainDefinitionMap.put("/actProcessIns/**", "anon");
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/controller/ZyGoodsController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/controller/ZyGoodsController.java
index c08bb049..2a43b838 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/controller/ZyGoodsController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/controller/ZyGoodsController.java
@@ -750,6 +750,34 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
 		 }
 		 return Result.OK(listsp);
 	 }
+	 /**
+	  * 商城接口成衣推荐查询
+	  *
+	  * @param zyGoods
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "成衣推荐查询")
+	 @ApiOperation(value="成衣推荐查询", notes="成衣推荐查询")
+	 @GetMapping(value = "/cylxlist")
+	 public Result<?> cylxlist(ZyGoods zyGoods,HttpServletRequest req,@RequestParam(name="typeid",required=true) String typeid) {
+		 QueryWrapper<ZyGoods> queryWrapper = QueryGenerator.initQueryWrapper(zyGoods, req.getParameterMap());
+		 queryWrapper.eq("cloths_type_id",typeid);
+		 queryWrapper.eq("recommend",1);
+		 List<ZyGoods> pageList = zyGoodsService.list(queryWrapper);
+		 List<FzlxSp> listsp = new ArrayList<>();
+		 for (int i = 0 ; i < pageList.size() ; i++){
+			 FzlxSp fzlxSp = new FzlxSp();
+			 fzlxSp.setId(pageList.get(i).getId());
+			 fzlxSp.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageList.get(i).getDefaultPicture());
+			 fzlxSp.setCurrentPrice(pageList.get(i).getPromotionPrice());
+			 fzlxSp.setHistoricalPrice(pageList.get(i).getUnitPrice());
+			 fzlxSp.setTitle(pageList.get(i).getGoodsName());
+			 fzlxSp.setHeat(pageList.get(i).getClick());
+			 listsp.add(fzlxSp);
+		 }
+		 return Result.OK(listsp);
+	 }
 	 /**
 	  * 商城接口服装详情
 	  * @param req
@@ -761,6 +789,8 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
 	 public Result<?> lxlistxq(HttpServletRequest req,@RequestParam(name="id",required=true) String id) {
 		 Map<String,Object> mapgoods = new HashMap<>();
 		 ZyGoods zyGoods = zyGoodsService.getById(id);
+		 zyGoods.setClick((Integer.parseInt(zyGoods.getClick())+1)+"");
+		 zyGoodsService.updateById(zyGoods);
 		 mapgoods.put("zyGoods",zyGoods);
 		 String[] baseUrl = zyGoods.getGoodsPicture().split(",");
 		 String str = "";
@@ -794,4 +824,22 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
 		 return Result.OK(mapgoods);
 	 }
 
+	 /**
+	  * 首页推荐商品详情查询
+	  *
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "推荐商品详情查询")
+	 @ApiOperation(value="推荐商品详情查询", notes="推荐商品详情查询")
+	 @GetMapping(value = "/tjspxq")
+	 public Result<?> tjspxq(HttpServletRequest req,@RequestParam(name="id",required=true) String id) {
+		 ZyGoods zyGoods = zyGoodsService.getById(id);
+		 ZyClothsType zyclothsType = zyClothsTypeService.getById(zyGoods.getClothsTypeId());
+		 Map<String,Object> map = new HashMap<>();
+		 map.put("name",zyclothsType.getTypeName());
+		 map.put("parentName",zyclothsType.getTypeIdName());
+		 return Result.OK(map);
+	 }
+
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/controller/ZyOrdersController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/controller/ZyOrdersController.java
index 512cf415..5e2f7dd9 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/controller/ZyOrdersController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/controller/ZyOrdersController.java
@@ -1,22 +1,30 @@
 package org.jeecg.modules.demo.zyorders.controller;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.demo.accessories.service.IZyAccessoriesService;
+import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
 import org.jeecg.modules.demo.customerinvoice.entity.CustomerInvoice;
 import org.jeecg.modules.demo.customerinvoice.service.ICustomerInvoiceService;
+import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
+import org.jeecg.modules.demo.customermeasure.service.ICustomerMeasureService;
+import org.jeecg.modules.demo.customerpayment.entity.CustomerPayment;
+import org.jeecg.modules.demo.customerpayment.service.ICustomerPaymentService;
 import org.jeecg.modules.demo.customerreceivingaddress.entity.CustomerReceivingAddress;
 import org.jeecg.modules.demo.customerreceivingaddress.service.ICustomerReceivingAddressService;
+import org.jeecg.modules.demo.fabric.service.IZyFabricService;
 import org.jeecg.modules.demo.goodsaccessories.entity.GoodsAccessories;
 import org.jeecg.modules.demo.goodsaccessories.service.IGoodsAccessoriesService;
 import org.jeecg.modules.demo.goodsfabric.entity.GoodsFabric;
@@ -34,6 +42,9 @@ import org.jeecg.modules.demo.ordergoodsmodule.entity.OrderGoodsModule;
 import org.jeecg.modules.demo.ordergoodsmodule.service.IOrderGoodsModuleService;
 import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories;
 import org.jeecg.modules.demo.zyaccessories.service.IZyStyleAccessoriesService;
+import org.jeecg.modules.demo.zygoods.entity.Dz;
+import org.jeecg.modules.demo.zygoods.entity.FzlxSp;
+import org.jeecg.modules.demo.zygoods.entity.Tcsp;
 import org.jeecg.modules.demo.zygoods.entity.ZyGoods;
 import org.jeecg.modules.demo.zygoods.service.IZyGoodsService;
 import org.jeecg.modules.demo.zyorders.entity.ZyOrders;
@@ -45,6 +56,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysDepartService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
 import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric;
 import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService;
 import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
@@ -85,6 +101,8 @@ public class ZyOrdersController extends JeecgController<ZyOrders, IZyOrdersServi
 	 @Autowired
 	 private ICustomerInvoiceService iCustomerInvoiceService;
 	 @Autowired
+	 private ICustomerPaymentService iCustomerPaymentService;
+	 @Autowired
 	 private IZyGoodsService zyGoodsService;
 	 @Autowired
 	 private IOrderGoodsModuleService orderGoodsModuleService;
@@ -98,6 +116,19 @@ public class ZyOrdersController extends JeecgController<ZyOrders, IZyOrdersServi
 	 private IGoodsFabricService goodsFabricService;
 	 @Autowired
 	 private IGoodsAccessoriesService goodsAccessoriesService;
+	 @Autowired
+	 private IZyClothsStyleService zyClothsStyleService;
+	 @Autowired
+	 private IZyFabricService zyFabricService;
+	 @Autowired
+	 private IZyAccessoriesService zyAccessoriesService;
+	 @Autowired
+	 private ISysDepartService sysDepartService;
+	 @Autowired
+	 private ISysUserService sysUserService;
+	 @Autowired
+	 private ICustomerMeasureService iCustomerMeasureService;
+
 
 	 /**
 	  * 订单和订单商品接口
@@ -430,4 +461,303 @@ public class ZyOrdersController extends JeecgController<ZyOrders, IZyOrdersServi
         return super.importExcel(request, response, ZyOrders.class);
     }
 
+	 /**
+	  * 商城接口下单
+	  *
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "下单")
+	 @ApiOperation(value="下单", notes="下单")
+	 @GetMapping(value = "/xd")
+	 public Result<?> xd(@RequestParam(name="goodsid",required=true) String goodsid,HttpServletRequest req) {
+		 //这里方便获取当前登陆信息
+		 LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 //这里获取当前登陆的id
+		 String userid = loginUser.getId();
+		 //这里获取当前登陆的真实姓名
+		 String rlname = loginUser.getRealname();
+		 ZyGoods zyGoods = zyGoodsService.getById(goodsid);
+		 Map<String,Object> map = new HashMap<>();
+		 Date d = new Date();
+		 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		 map.put("dqsj",sdf.format(d));
+		 map.put("orderNum",getOrdersNum());
+		 //默认地址
+		 CustomerReceivingAddress customerReceivingAddress = new CustomerReceivingAddress();
+		 QueryWrapper<CustomerReceivingAddress> queryWrappercra = QueryGenerator.initQueryWrapper(customerReceivingAddress, req.getParameterMap());
+		 queryWrappercra.eq("user_id",userid);
+		 queryWrappercra.orderByAsc("sort");
+		 List<CustomerReceivingAddress> listcra = iCustomerReceivingAddressService.list(queryWrappercra);
+		 Dz dz = new Dz();
+		 dz.setId(listcra.get(0).getId());
+		 dz.setAddr1(listcra.get(0).getCityId());
+		 dz.setAddr2(listcra.get(0).getAddress());
+		 dz.setPostCode(listcra.get(0).getZipCode());
+		 dz.setFlag(false);
+		 map.put("address",dz);
+		 map.put("gmr",rlname);
+		 map.put("spmc",zyGoods.getGoodsName());
+		 map.put("spjg",zyGoods.getUnitPrice());
+		 map.put("spks",zyClothsStyleService.getById(zyGoods.getStyleId()).getStyleNames());
+		 //主辅料
+		 GoodsFabric goodsFabric = new GoodsFabric();
+		 QueryWrapper<GoodsFabric> queryWrappergf = QueryGenerator.initQueryWrapper(goodsFabric, req.getParameterMap());
+		 queryWrappergf.eq("goods_id",goodsid);
+		 List<GoodsFabric> listgf = goodsFabricService.list(queryWrappergf);
+		 String zlstr = "";
+		 for(int i = 0 ; i < listgf.size() ; i++){
+		 	zlstr = zlstr + zyFabricService.getById(listgf.get(i).getFabricId()).getName()+",";
+		 }
+		 GoodsAccessories goodsAccessories = new GoodsAccessories();
+		 QueryWrapper<GoodsAccessories> queryWrapperga = QueryGenerator.initQueryWrapper(goodsAccessories, req.getParameterMap());
+		 queryWrapperga.eq("goods_id",goodsid);
+		 List<GoodsAccessories> listga = goodsAccessoriesService.list(queryWrapperga);
+		 String flstr = "";
+		 for(int k = 0 ; k < listga.size() ; k++){
+		 	flstr = flstr + zyAccessoriesService.getById(listga.get(k).getAccessoriesId()).getContents()+",";
+		 }
+		 map.put("zfl",zlstr+flstr.substring(0,flstr.length()-1));
+		 map.put("sptp","http://localhost:10085/jeecg-boot/sys/common/static/"+zyGoods.getDefaultPicture());
+		 return Result.OK(map);
+	 }
+
+	 /**
+	  * 获取地址列表
+	  *
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "地址列表")
+	 @ApiOperation(value="地址列表", notes="地址列表")
+	 @GetMapping(value = "/dzlist")
+	 public Result<?> dzlist(HttpServletRequest req) {
+		 //这里方便获取当前登陆信息
+		 LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 //这里获取当前登陆的id
+		 String userid = loginUser.getId();
+		 CustomerReceivingAddress customerReceivingAddress = new CustomerReceivingAddress();
+		 QueryWrapper<CustomerReceivingAddress> queryWrappercra = QueryGenerator.initQueryWrapper(customerReceivingAddress, req.getParameterMap());
+		 queryWrappercra.eq("user_id",userid);
+		 List<CustomerReceivingAddress> listcra = iCustomerReceivingAddressService.list(queryWrappercra);
+		 List<Dz> listdz = new ArrayList<>();
+		 for (int i = 0 ; i < listcra.size(); i++){
+			 Dz dz = new Dz();
+			 dz.setId(listcra.get(i).getId());
+			 dz.setAddr1(listcra.get(i).getCityId());
+			 dz.setAddr2(listcra.get(i).getAddress());
+			 dz.setPostCode(listcra.get(i).getZipCode());
+			 dz.setFlag(false);
+			 listdz.add(dz);
+		 }
+		 return Result.OK(listdz);
+	 }
+
+	 /**
+	  * 订单下单数据交互
+	  *
+	  * @param
+	  * @return
+	  */
+	 @AutoLog(value = "订单下单数据交互")
+	 @ApiOperation(value="订单下单数据交互", notes="订单下单数据交互")
+	 @GetMapping(value = "/orderXD")
+	 public String orderXD(ZyOrdersJk zyOrdersJk,List<OrderGoodsJk> orderGoodsJkList,HttpServletRequest req,String OrdersNum) {
+		 Double actual_payment = 0.00;
+		 Double money = 0.00;
+		 for(int i = 0 ; i < orderGoodsJkList.size() ; i++){
+			 ZyGoods zyGoods = zyGoodsService.getById(orderGoodsJkList.get(i).getGoodsId());
+			 money = money + zyGoods.getUnitPrice()*orderGoodsJkList.get(i).getGoodsNum();
+			 actual_payment = actual_payment + zyGoods.getPromotionPrice()*orderGoodsJkList.get(i).getGoodsNum();
+		 }
+		 ZyOrders zyOrders = new ZyOrders();
+		 zyOrders.setIschild(0);
+		 zyOrders.setOrderTime(new Date());
+		 zyOrders.setOrdersNum(OrdersNum);
+		 zyOrders.setMoney(money);
+		 zyOrders.setFreight(zyOrdersJk.getFreight());
+		 zyOrders.setPromotionPrice(money-actual_payment);
+		 zyOrders.setActualPayment(actual_payment);
+		 //交货期先为空
+		 //zyOrders.setDeliveryTime(zyOrdersJk.getDeliveryTime());
+		 zyOrders.setOrdersType(zyOrdersJk.getOrdersType());
+		 zyOrders.setUserId(zyOrdersJk.getUserId());
+		 CustomerPayment customerPayment = new CustomerPayment();
+		 QueryWrapper<CustomerPayment> queryWrappercp = QueryGenerator.initQueryWrapper(customerPayment, req.getParameterMap());
+		 queryWrappercp.eq("user_id",zyOrdersJk.getUserId());
+		 queryWrappercp.orderByAsc("sort");
+		 List<CustomerPayment>listcp = iCustomerPaymentService.list(queryWrappercp);
+		 zyOrders.setPaymentMethod(Integer.parseInt(listcp.get(0).getPaymentType()));
+		 zyOrders.setPaymentStatus(0);
+		 zyOrders.setAccountNo(listcp.get(0).getAccountNo());
+		 zyOrders.setBankDeposit(listcp.get(0).getBankDeposit());
+		 zyOrders.setGoodsQuantity(zyOrdersJk.getGoodsQuantity());
+		 CustomerReceivingAddress customerReceivingAddress = iCustomerReceivingAddressService.getById(zyOrdersJk.getAddressId());
+		 zyOrders.setCityId(customerReceivingAddress.getCityId());
+		 zyOrders.setAddress(customerReceivingAddress.getAddress());
+		 zyOrders.setZipCode(customerReceivingAddress.getZipCode());
+		 zyOrders.setReceiver(zyOrdersJk.getReceiver());
+		 zyOrders.setMobile(customerReceivingAddress.getMobile());
+		 CustomerInvoice customerInvoice = iCustomerInvoiceService.getById(zyOrdersJk.getInvoiceId());
+		 zyOrders.setInvoiceCustomerType(Integer.parseInt(customerInvoice.getCustomerType()));
+		 zyOrders.setInvoiceType(Integer.parseInt(customerInvoice.getInvoiceType()));
+		 zyOrders.setTaxIdentificationNumber(customerInvoice.getTaxIdentificationNumber());
+		 zyOrders.setAddressBilling(customerInvoice.getAddress());
+		 zyOrders.setTelephone(customerInvoice.getTelephone());
+		 zyOrders.setBankPublic(customerInvoice.getBankDeposit());
+		 zyOrders.setAccountNumber(customerInvoice.getAccountNumber());
+		 zyOrders.setSalesEnterpriseId(zyOrdersJk.getSalesEnterpriseId());
+		 zyOrders.setSalespersonId(zyOrdersJk.getSalespersonId());
+		 //物流企业先空着
+		 //zyOrders.setLogisticsEnterprisesId(zyOrdersJk.getLogisticsEnterprisesId());
+		 zyOrders.setDeliveryStatus(0);
+		 zyOrdersService.save(zyOrders);
+		 for(int j = 0 ; j < orderGoodsJkList.size() ; j++){
+			 ZyGoods zyGoods = zyGoodsService.getById(orderGoodsJkList.get(j).getGoodsId());
+			 OrderGoods orderGoods = new OrderGoods();
+			 orderGoods.setOrdersId(zyOrders.getId());
+			 orderGoods.setGoodsId(orderGoodsJkList.get(j).getGoodsId());
+			 orderGoods.setGoodsNum(orderGoodsJkList.get(j).getGoodsNum());
+			 orderGoods.setGoodsCode(zyGoods.getGoodsCode());
+			 orderGoods.setGoodsName(zyGoods.getGoodsName());
+			 orderGoods.setGoodsIntr(zyGoods.getGoodsIntr());
+			 orderGoods.setCustomized(zyGoods.getCustomized());
+			 orderGoods.setMeasureId(orderGoodsJkList.get(j).getMeasureId());
+			 orderGoods.setGoodsPicture(zyGoods.getGoodsPicture());
+			 orderGoods.setDefaultPicture(zyGoods.getDefaultPicture());
+			 orderGoods.setGoodsVideo(zyGoods.getGoodsVideo());
+			 orderGoods.setClothsTypeId(zyGoods.getClothsTypeId());
+			 orderGoods.setStyleId(zyGoods.getStyleId());
+			 orderGoods.setModelId(zyGoods.getModelId());
+			 orderGoods.setUnit(zyGoods.getUnit());
+			 orderGoods.setNumber(zyGoods.getNumber());
+			 orderGoods.setUnitPrice(zyGoods.getUnitPrice());
+			 orderGoods.setDiscount(zyGoods.getDiscount());
+			 orderGoods.setPromotionPrice(zyGoods.getPromotionPrice());
+			 orderGoods.setRecommend(zyGoods.getRecommend());
+			 orderGoods.setPlaceOrigin(zyGoods.getPlaceOrigin());
+			 orderGoods.setStatus(zyGoods.getStatus());
+			 orderGoods.setTotalPrice(zyGoods.getUnitPrice()*orderGoodsJkList.get(j).getGoodsNum());
+			 orderGoods.setPayTotalPrice(zyGoods.getPromotionPrice()*orderGoodsJkList.get(j).getGoodsNum());
+			 orderGoodsService.save(orderGoods);
+			 GoodsModule goodsModule = new GoodsModule();
+			 QueryWrapper<GoodsModule> queryWrapperzsm = QueryGenerator.initQueryWrapper(goodsModule, req.getParameterMap());
+			 queryWrapperzsm.eq("goods_id",zyGoods.getId());
+			 queryWrapperzsm.eq("style_id",zyGoods.getStyleId());
+			 List<GoodsModule> listzsm = goodsModuleService.list(queryWrapperzsm);
+			 for (int k = 0 ; k < listzsm.size() ; k++){
+				 OrderGoodsModule orderGoodsModule = new OrderGoodsModule();
+				 orderGoodsModule.setOrderGoodsId(orderGoods.getId());
+				 orderGoodsModule.setGoodsId(zyGoods.getId());
+				 orderGoodsModule.setStyleId(zyGoods.getStyleId());
+				 orderGoodsModule.setStyleModuleId(listzsm.get(k).getStyleModuleId());
+				 orderGoodsModule.setModuleId(listzsm.get(k).getModuleId());
+				 orderGoodsModuleService.save(orderGoodsModule);
+			 }
+			 GoodsFabric goodsFabric = new GoodsFabric();
+			 QueryWrapper<GoodsFabric> queryWrapperzsf = QueryGenerator.initQueryWrapper(goodsFabric, req.getParameterMap());
+			 queryWrapperzsf.eq("goods_id",zyGoods.getId());
+			 List<GoodsFabric> listzsf = goodsFabricService.list(queryWrapperzsf);
+			 for (int o = 0 ; o < listzsf.size() ; o++){
+				 OrderGoodsFabric orderGoodsFabric = new OrderGoodsFabric();
+				 orderGoodsFabric.setOrderGoodsId(orderGoods.getId());
+				 orderGoodsFabric.setGoodsId(zyGoods.getId());
+				 orderGoodsFabric.setFabricId(listzsf.get(o).getFabricId());
+				 orderGoodsFabricService.save(orderGoodsFabric);
+			 }
+			 GoodsAccessories goodsAccessories = new GoodsAccessories();
+			 QueryWrapper<GoodsAccessories> queryWrapperzsa = QueryGenerator.initQueryWrapper(goodsAccessories, req.getParameterMap());
+			 queryWrapperzsa.eq("goods_id",zyGoods.getId());
+			 List<GoodsAccessories> listzsa = goodsAccessoriesService.list(queryWrapperzsa);
+			 for (int p = 0 ; p < listzsa.size() ; p++){
+				 OrderGoodsAccessories orderGoodsAccessories = new OrderGoodsAccessories();
+				 orderGoodsAccessories.setOrderGoodsId(orderGoods.getId());
+				 orderGoodsAccessories.setGoodsId(zyGoods.getId());
+				 orderGoodsAccessories.setAccessoriesId(listzsa.get(p).getAccessoriesId());
+				 orderGoodsAccessoriesService.save(orderGoodsAccessories);
+			 }
+		 }
+		 return zyOrders.getId();
+	 }
+	 /**
+	  * 提交商品订单
+	  *
+	  * @param
+	  * @return
+	  */
+	 @AutoLog(value = "提交商品订单")
+	 @ApiOperation(value="提交商品订单", notes="提交商品订单")
+	 @GetMapping(value = "/TJorder")
+	 public Result<?> TJorder(@RequestParam(name="OrdersNum",required=true) String OrdersNum,HttpServletRequest req,@RequestParam(name="goodsid",required=true) String goodsid,@RequestParam(name="goodsNum",required=true) String goodsNum) {
+		 //这里方便获取当前登陆信息
+		 LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 //这里获取当前登陆的id
+		 String userid = loginUser.getId();
+		 ZyOrdersJk zyOrdersJk = new ZyOrdersJk();
+		 zyOrdersJk.setFreight(0.0);
+		 zyOrdersJk.setOrdersType(0);
+		 zyOrdersJk.setUserId(userid);
+		 zyOrdersJk.setGoodsQuantity(1);
+		 CustomerReceivingAddress customerReceivingAddress = new CustomerReceivingAddress();
+		 QueryWrapper<CustomerReceivingAddress> queryWrappercra = QueryGenerator.initQueryWrapper(customerReceivingAddress, req.getParameterMap());
+		 queryWrappercra.eq("user_id",userid);
+		 queryWrappercra.orderByAsc("sort");
+		 List<CustomerReceivingAddress> listcra = iCustomerReceivingAddressService.list(queryWrappercra);
+		 zyOrdersJk.setAddressId(listcra.get(0).getId());
+		 zyOrdersJk.setReceiver(userid);
+		 CustomerInvoice customerInvoice = new CustomerInvoice();
+		 QueryWrapper<CustomerInvoice> queryWrapperci = QueryGenerator.initQueryWrapper(customerInvoice, req.getParameterMap());
+		 queryWrapperci.eq("user_id",userid);
+		 queryWrapperci.orderByAsc("sort");
+		 List<CustomerInvoice> listci = iCustomerInvoiceService.list(queryWrapperci);
+		 zyOrdersJk.setInvoiceId(listci.get(0).getId());
+		 SysDepart sysDepart = new SysDepart();
+		 QueryWrapper<SysDepart> queryWrappersd = QueryGenerator.initQueryWrapper(sysDepart, req.getParameterMap());
+		 queryWrappersd.eq("org_category","4");
+		 queryWrappersd.orderByAsc("depart_order");
+		 List<SysDepart> listsd = sysDepartService.list(queryWrappersd);
+		 zyOrdersJk.setSalesEnterpriseId(listsd.get(0).getId());
+		 SysUser sysUser = new SysUser();
+		 QueryWrapper<SysUser> queryWrappersu = QueryGenerator.initQueryWrapper(sysUser, req.getParameterMap());
+		 queryWrappersu.eq("org_code",listsd.get(0).getOrgCode());
+		 List<SysUser> listsu = sysUserService.list(queryWrappersu);
+		 zyOrdersJk.setSalespersonId(listsu.get(0).getId());
+		 zyOrdersJk.setDeliveryStatus(0);
+		 List<OrderGoodsJk> orderGoodsJkList = new ArrayList<>();
+		 OrderGoodsJk orderGoodsJk = new OrderGoodsJk();
+		 orderGoodsJk.setGoodsId(goodsid);
+		 orderGoodsJk.setGoodsNum(Integer.parseInt(goodsNum));
+		 CustomerMeasure customerMeasure = new CustomerMeasure();
+		 QueryWrapper<CustomerMeasure> queryWrappercm = QueryGenerator.initQueryWrapper(customerMeasure, req.getParameterMap());
+		 queryWrappercm.eq("user_id",userid);
+		 queryWrappercm.orderByAsc("sort");
+		 List<CustomerMeasure> listcm = iCustomerMeasureService.list(queryWrappercm);
+		 orderGoodsJk.setMeasureId(listcm.get(0).getId());
+		 orderGoodsJkList.add(orderGoodsJk);
+		 String orderid = orderXD(zyOrdersJk,orderGoodsJkList,req,OrdersNum);
+		 return Result.OK(orderid);
+	 }
+
+	 /**
+	  * 支付
+	  *
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "支付")
+	 @ApiOperation(value="支付", notes="支付")
+	 @GetMapping(value = "/zf")
+	 public Result<?> zf(@RequestParam(name="ordersid",required=true) String ordersid,@RequestParam(name="goodsid",required=true) String goodsid,HttpServletRequest req) {
+		 ZyOrders zyOrders =  zyOrdersService.getById(ordersid);
+		 zyOrders.setPaymentStatus(1);
+		 zyOrders.setPaymentTime(new Date());
+		 zyOrders.setDeliveryStatus(1);
+		 zyOrdersService.updateById(zyOrders);
+		 ZyGoods zyGoods = zyGoodsService.getById(goodsid);
+		 zyGoods.setNum(zyGoods.getNum()+1);
+		 zyGoodsService.updateById(zyGoods);
+		 return Result.OK("支付成功");
+	 }
+
+
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/entity/Dz.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/entity/Dz.java
new file mode 100644
index 00000000..8916a913
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/entity/Dz.java
@@ -0,0 +1,51 @@
+package org.jeecg.modules.demo.zygoods.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 商品表
+ * @Author: jeecg-boot
+ * @Date:   2022-12-07
+ * @Version: V1.0
+ */
+@Data
+
+public class Dz implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**省市区*/
+	@Excel(name = "省市区", width = 15)
+	@ApiModelProperty(value = "省市区")
+	private java.lang.String addr1;
+	/**地址*/
+	@Excel(name = "地址", width = 15)
+	@ApiModelProperty(value = "地址")
+	private java.lang.String addr2;
+	/**邮编*/
+	@Excel(name = "邮编", width = 15)
+	@ApiModelProperty(value = "邮编")
+	private java.lang.String postCode;
+	/**默认地址*/
+	@Excel(name = "默认地址", width = 15)
+	@ApiModelProperty(value = "默认地址")
+	private java.lang.Boolean flag;
+}

From cd8faf61381d31d0c0ba55a19ce03f1e1109a030 Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Thu, 16 Mar 2023 09:41:00 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/shopping/pages/clothDetail1.vue               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail1.vue b/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail1.vue
index b735aad3..cbbae3f4 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail1.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail1.vue
@@ -1,6 +1,6 @@
 <template>
   <!--  服装详情页-->
-  <div class="clothDetails">
+  <div class="clothDetails1">
     <Header fontColor="#000"></Header>
     <div class="jz menu d-flex">
       <el-breadcrumb separator="/">
@@ -339,7 +339,7 @@
   };
 </script>
 <style>
-  .clothDetails .cytj {
+  .clothDetails1 .cytj {
     border-bottom: 2px solid #000;
   }
 
@@ -353,7 +353,7 @@
   #btn02{
     display: none;
   }
-  .clothDetails {
+  .clothDetails1 {
     .menu{
       justify-content: space-between;
       padding-top: 100px;

From 21541320a2fb919e129aec7c2258f5f969afa55e Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Thu, 16 Mar 2023 09:45:28 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ant-design-vue-jeecg/src/views/shopping/pages/clothDetail1.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail1.vue b/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail1.vue
index cbbae3f4..0865ef57 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail1.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail1.vue
@@ -151,7 +151,7 @@
   import Footer from "../components/Footer/FooterView"
   import { httpAction, getAction } from '@/api/manage'
   export default {
-    name: "clothDetail",
+    name: "clothDetail1",
     components: { Header,Footer },
     data() {
       return {

From 3e6c447a3822411ad38bc12773843509b7c10302 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Thu, 16 Mar 2023 09:49:34 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ant-design-vue-jeecg/src/views/shopping/shopHome.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/shopping/shopHome.vue b/ant-design-vue-jeecg/src/views/shopping/shopHome.vue
index 2a0da223..68f829dc 100644
--- a/ant-design-vue-jeecg/src/views/shopping/shopHome.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/shopHome.vue
@@ -139,7 +139,7 @@
               </div>
             </div>
             <div class="more d-flex">
-              <router-link to="/shopping/clothType">更多男装</router-link>
+              <router-link to="/shopping/clothType">更多类型</router-link>
               <img src="./assets/youjiantou.png" alt="" />
             </div>
           </el-tab-pane>
@@ -167,7 +167,7 @@
               </div>
             </div>
             <div class="more d-flex">
-              <router-link to="/shopping/clothType">更多女装</router-link>
+              <router-link to="/shopping/clothType">更多类型</router-link>
               <img src="./assets/youjiantou.png" alt="" />
             </div>
           </el-tab-pane>
@@ -195,7 +195,7 @@
               </div>
             </div>
             <div class="more d-flex">
-              <router-link to="/shopping/clothType">更多童装</router-link>
+              <router-link to="/shopping/clothType">更多类型</router-link>
               <img src="./assets/youjiantou.png" alt="" />
             </div>
           </el-tab-pane>