From 3f74f12301cccf8e42642c1d28d9973138dc3b99 Mon Sep 17 00:00:00 2001
From: mactj <tottimctj@163.com>
Date: Thu, 21 Jan 2021 10:10:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AppActivityController.java     |  2 +
 .../winery/controller/AppOrderController.java |  4 +-
 .../com/ruoyi/winery/domain/AppActivity.java  |  7 +-
 .../com/ruoyi/winery/domain/AppOrder.java     |  2 +-
 .../ruoyi/winery/domain/AppOrderDetail.java   | 65 ++++++++++----
 .../src/components/mall/tab/mall-home.wpy     |  8 +-
 mini-app/src/pages/mall/user/user-address.wpy |  2 -
 ruoyi-ui/src/views/winery/activity/index.vue  | 89 ++++++++++++-------
 ruoyi-ui/src/views/winery/order/index.vue     | 42 +++++++--
 9 files changed, 155 insertions(+), 66 deletions(-)

diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppActivityController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppActivityController.java
index 056c3344f..b318a8b6b 100644
--- a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppActivityController.java
+++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppActivityController.java
@@ -61,6 +61,7 @@ public class AppActivityController extends BaseController {
         if (appActivity.getImageHeight() != null){
             lqw.eq(AppActivity::getImageHeight ,appActivity.getImageHeight());
         }
+        lqw.orderByAsc(AppActivity::getSort);
         List<AppActivity> list = iAppActivityService.list(lqw);
         return getDataTable(list);
     }
@@ -138,6 +139,7 @@ public class AppActivityController extends BaseController {
         if (appActivity.getImageHeight() != null){
             lqw.eq(AppActivity::getImageHeight ,appActivity.getImageHeight());
         }
+        lqw.orderByAsc(AppActivity::getSort);
         List<AppActivity> list = iAppActivityService.list(lqw);
         return getDataTable(list);
     }
diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java
index 3e9a5a43a..eb6b013aa 100644
--- a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java
+++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java
@@ -89,7 +89,7 @@ public class AppOrderController extends BaseController {
         if (StringUtils.isNotBlank(appOrder.getPostName())) {
             lqw.eq(AppOrder::getPostName, appOrder.getPostName());
         }
-        if (StringUtils.isNotBlank(appOrder.getPostMoible())) {
+        if (StringUtils.isNotBlank(appOrder.getPostMobile())) {
             lqw.eq(AppOrder::getPostName, appOrder.getPostName());
         }
         if (StringUtils.isNotBlank(appOrder.getPostRegion())) {
@@ -180,7 +180,7 @@ public class AppOrderController extends BaseController {
             return AjaxResult.error("请校验地址信息");
         }
 
-        appOrder.setPostMoible(address.getMobile());
+        appOrder.setPostMobile(address.getMobile());
         appOrder.setPostName(address.getName());
         appOrder.setPostRegion(address.getRegion());
         appOrder.setPostAddress(address.getAddress());
diff --git a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppActivity.java b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppActivity.java
index 0cf1cbab8..97a609e75 100644
--- a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppActivity.java
+++ b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppActivity.java
@@ -41,7 +41,7 @@ private static final long serialVersionUID=1L;
     private String url;
 
     /** 1每日精选2热门活动 */
-    @Excel(name = "1每日精选2热门活动")
+    @Excel(name = "0无1每日精选2热门活动")
     private Integer type;
 
     /** 图片 */
@@ -63,4 +63,9 @@ private static final long serialVersionUID=1L;
 
     /** 更新时间 */
     private Date updateTime;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
 }
diff --git a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java
index b08454970..92a10dde5 100644
--- a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java
+++ b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java
@@ -53,7 +53,7 @@ private static final long serialVersionUID=1L;
 
     /** 收货人姓名 */
     @Excel(name = "收货人电话号码")
-    private String postMoible;
+    private String postMobile;
 
     /** 收货人姓名 */
     @Excel(name = "收货人地区")
diff --git a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrderDetail.java b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrderDetail.java
index 1bf4e5e2d..2e2c0e706 100644
--- a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrderDetail.java
+++ b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrderDetail.java
@@ -12,14 +12,16 @@ import com.ruoyi.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
+
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 订单明细对象 app_order_detail
- * 
+ *
  * @author ruoyi
  * @date 2021-01-18
  */
@@ -31,55 +33,84 @@ import com.ruoyi.common.core.domain.BaseEntity;
 @TableName("app_order_detail")
 public class AppOrderDetail implements Serializable {
 
-private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
 
-    /** 明细ID */
+    /**
+     * 明细ID
+     */
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
-    /** 部门ID */
+    /**
+     * 部门ID
+     */
     @Excel(name = "部门ID")
     private Long deptId;
 
-    /** 用户ID */
+    /**
+     * 用户ID
+     */
     @Excel(name = "用户ID")
     private Long userId;
 
-    /** 订单ID */
+    /**
+     * 订单ID
+     */
     @Excel(name = "订单ID")
     private String orderId;
 
-    /** 商品ID */
+    /**
+     * 商品ID
+     */
     @Excel(name = "商品ID")
     private String goodsId;
 
-    /** 商品数量 */
+    /**
+     * 商品数量
+     */
     @Excel(name = "商品数量")
     private Integer goodsCount;
 
-    /** 明细状态:
+    /**
+     * 明细状态:
      * 0 未退款
-1.退款申请
-2.退款中
-3.退款成功 */
+     * 1.退款申请
+     * 2.退款中
+     * 3.退款成功
+     */
     @Excel(name = "明细状态")
     private Integer status;
 
-    /** 统一退单号 */
+    /**
+     * 统一退单号
+     */
     @Excel(name = "统一退单号")
     private String refundNo;
 
-    /** 退款时间 */
-    @Excel(name = "退款时间" , width = 30, dateFormat = "yyyy-MM-dd")
+    /**
+     * 退款时间
+     */
+    @Excel(name = "退款时间", width = 30, dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date refundTime;
 
-    /** 创建时间 */
+    /**
+     　退款理由
+     */
+    @Excel(name = "退款理由")
+    private String refundReason;
+
+
+    /**
+     * 创建时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
-    /** 更新时间 */
+    /**
+     * 更新时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
diff --git a/mini-app/src/components/mall/tab/mall-home.wpy b/mini-app/src/components/mall/tab/mall-home.wpy
index d83e25e65..6f9e18be9 100644
--- a/mini-app/src/components/mall/tab/mall-home.wpy
+++ b/mini-app/src/components/mall/tab/mall-home.wpy
@@ -177,15 +177,17 @@ module.exports.parseImage = parseImage;
       <!--                 @tap="onNavItem(navDefine.HOME_BANNER2)" />-->
 
 
-      <div v-for="(item, index) in records">
-        <div style="margin: 22px 2px 12px 2px; display: flex; align-items: center;">
+      <div v-for="(item, index) in records" style="margin: 22px 2px 0px 2px; ">
+
+
+        <div v-if="item.type" style="display: flex; align-items: center;margin-bottom: 5px;">
           <van-image :src="imageDefine.HOME_WINE_LAB" height="16px" width="5px" />
           <span style="margin:0px 5px;font-weight: bold;"> {{item.type === 1 ? '每日精选' : '热门活动'}}</span>
         </div>
 
 
         <van-image width="100%" :height="item.imageHeight + 'px'" :src="filters.parseImage(item.image)"
-                   @tap="onWebItem(item)" />
+                   @tap="onWebItem(item)"  />
       </div>
 
       <!--      <div class="column-record-item" v-for="(item, index) in columnRecord" @tap="onNavItem(navDefine.HOME_BANNER2)">-->
diff --git a/mini-app/src/pages/mall/user/user-address.wpy b/mini-app/src/pages/mall/user/user-address.wpy
index 1c60a3afc..dd0a27b56 100644
--- a/mini-app/src/pages/mall/user/user-address.wpy
+++ b/mini-app/src/pages/mall/user/user-address.wpy
@@ -167,7 +167,6 @@ wepy.page({
       'userAddress': state => state.userAddress
     })
   },
-
   methods: {
     bindRegionChange(e) {
       this.form.region = e.$wx.detail.value
@@ -247,7 +246,6 @@ wepy.page({
       })
       return
     }
-
     this.form.mobile = this.user.mobile
   },
 
diff --git a/ruoyi-ui/src/views/winery/activity/index.vue b/ruoyi-ui/src/views/winery/activity/index.vue
index 2f62b66de..ce55ac90f 100644
--- a/ruoyi-ui/src/views/winery/activity/index.vue
+++ b/ruoyi-ui/src/views/winery/activity/index.vue
@@ -43,7 +43,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['winery:activity:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -53,7 +54,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['winery:activity:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -63,7 +65,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['winery:activity:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -72,23 +75,26 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['winery:activity:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="activityList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="ID" align="center" prop="id" v-if="false"/>
-      <el-table-column label="链接" align="center" prop="url" />
-      <el-table-column label="活动类型" align="center"  :formatter="actTypeFormat" prop="type" />
+
+      <el-table-column label="活动类型" align="center" :formatter="actTypeFormat" prop="type"/>
+      <el-table-column label="排序" align="center" prop="sort"/>
+      <el-table-column label="链接" align="center" prop="url"/>
       <el-table-column label="图片" align="center" prop="image">
         <template slot-scope="scope">
           <el-image :src="scope.row.image | getImageForKey"
                     style="width: 60px; height: 60px"/>
         </template>
       </el-table-column>
-      <el-table-column label="高度" align="center" prop="imageHeight" />
+      <el-table-column label="高度" align="center" prop="imageHeight"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -97,14 +103,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['winery:activity:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['winery:activity:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -121,7 +129,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="链接" prop="url">
-          <el-input v-model="form.url" placeholder="请输入链接" />
+          <el-input v-model="form.url" placeholder="请输入链接"/>
         </el-form-item>
         <el-form-item label="活动类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择活动类型" clearable size="small">
@@ -133,11 +141,15 @@
             />
           </el-select>
         </el-form-item>
+
+        <el-form-item label="排序" prop="sort">
+          <el-input v-model="form.sort" placeholder="请输入排序"/>
+        </el-form-item>
         <el-form-item label="图片">
           <uploadImage v-model="form.image"/>
         </el-form-item>
         <el-form-item label="高度" prop="imageHeight">
-          <el-input v-model="form.imageHeight" placeholder="请输入高度" />
+          <el-input v-model="form.imageHeight" placeholder="请输入高度"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -149,7 +161,14 @@
 </template>
 
 <script>
-import { listActivity, getActivity, delActivity, addActivity, updateActivity, exportActivity } from "@/api/winery/activity";
+import {
+  listActivity,
+  getActivity,
+  delActivity,
+  addActivity,
+  updateActivity,
+  exportActivity
+} from "@/api/winery/activity";
 import UploadImage from '@/components/UploadImage';
 import CommonMixin from "@/mixin/common";
 
@@ -190,16 +209,17 @@ export default {
         type: undefined,
         image: undefined,
         imageHeight: undefined,
+        sort: undefined
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         createBy: [
-          { required: true, message: "创建者不能为空", trigger: "blur" }
+          {required: true, message: "创建者不能为空", trigger: "blur"}
         ],
         createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
+          {required: true, message: "创建时间不能为空", trigger: "blur"}
         ],
       }
     };
@@ -236,6 +256,7 @@ export default {
         url: undefined,
         type: undefined,
         image: undefined,
+        sort: undefined,
         imageHeight: undefined,
         createBy: undefined,
         createTime: undefined,
@@ -257,7 +278,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -300,28 +321,28 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm('是否确认删除活动编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delActivity(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delActivity(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有活动数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportActivity(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportActivity(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };
diff --git a/ruoyi-ui/src/views/winery/order/index.vue b/ruoyi-ui/src/views/winery/order/index.vue
index bb28d7992..e015cbdfb 100644
--- a/ruoyi-ui/src/views/winery/order/index.vue
+++ b/ruoyi-ui/src/views/winery/order/index.vue
@@ -19,15 +19,25 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="收货地址ID" prop="addressId">
+      <el-form-item label="收货人" prop="postName">
         <el-input
-          v-model="queryParams.addressId"
-          placeholder="请输入收货地址ID"
+          v-model="queryParams.postName"
+          placeholder="请输入收货人"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="收货人手机号码" prop="postMobile">
+        <el-input
+          v-model="queryParams.postMobile"
+          placeholder="请输入收货人手机号码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item label="总金额" prop="totalFee">
         <el-input
           v-model="queryParams.totalFee"
@@ -119,7 +129,10 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="订单ID" align="center" prop="id" v-if="false"/>
       <el-table-column label="用户ID" align="center" prop="userId" />
-      <el-table-column label="收货地址ID" align="center" prop="addressId" />
+      <el-table-column label="收货人" align="center" prop="postUser" />
+      <el-table-column label="收货电话" align="center" prop="postMobile" />
+      <el-table-column label="收货人省市区" align="center" prop="postRegion" />
+      <el-table-column label="收货人地址" align="center" prop="postAddress" />
       <el-table-column label="总金额" align="center" prop="totalFee" />
       <el-table-column label="运单号" align="center" prop="transportNo" />
       <el-table-column label="订单状态" align="center" prop="status" />
@@ -173,8 +186,17 @@
         <el-form-item label="用户ID" prop="userId">
           <el-input v-model="form.userId" placeholder="请输入用户ID" />
         </el-form-item>
-        <el-form-item label="收货地址ID" prop="addressId">
-          <el-input v-model="form.addressId" placeholder="请输入收货地址ID" />
+        <el-form-item label="收货人" prop="postName">
+          <el-input v-model="form.postName" placeholder="请输入收货地址" />
+        </el-form-item>
+        <el-form-item label="收货电话" prop="postMobile">
+          <el-input v-model="form.postMobile" placeholder="请输入收货地址" />
+        </el-form-item>
+        <el-form-item label="收货省市区" prop="postRegion">
+          <el-input v-model="form.postRegion" placeholder="请输入收货省市区" />
+        </el-form-item>
+        <el-form-item label="收货地址" prop="postAddress">
+          <el-input v-model="form.postAddress" placeholder="请输入收货地址" />
         </el-form-item>
         <el-form-item label="总金额" prop="totalFee">
           <el-input v-model="form.totalFee" placeholder="请输入总金额" />
@@ -250,6 +272,10 @@ export default {
         addressId: undefined,
         totalFee: undefined,
         transportNo: undefined,
+        postName: undefined,
+        postMobile: undefined,
+        postRegion: undefined,
+        postAddress: undefined,
         status: undefined,
         payTime: undefined,
         cancelTime: undefined,
@@ -299,6 +325,10 @@ export default {
         addressId: undefined,
         totalFee: undefined,
         transportNo: undefined,
+        postName: undefined,
+        postMobile: undefined,
+        postRegion: undefined,
+        postAddress: undefined,
         status: 0,
         payTime: undefined,
         remark: undefined,