20190718添加订单时间

src/main/java/com/izouma/awesomeadmin/constant/AppConstant.java

@@ -132,57 +132,62 @@ public interface AppConstant {
         int NO_PAY = 0;
 
         /**
-         * 支付完成，待上传原图、代发货
+         * 支付完成，待预约拍照
          */
         int PAY_OVER = 1;
 
         /**
-         * 待修图、已发货
+         * 预约完成，待拍照
          */
-        int WAIT_REPAIR = 2;
+        int BOOK_PHOTO = 2;
 
         /**
-         * 修图完成待验收、
+         * 拍照完成
          */
-        int ACCEPT = 3;
+        int PHOTO_OVER = 3;
 
         /**
-         * 验收不通过，待返修
+         * 预约选片
          */
-        int REWORK = 4;
+        int BOOK_SELECT = 4;
 
 
         /**
-         * 验收完成待评论、已收货待评论
+         * 选片完成
          */
-        int FINISH = 5;
+        int SELECT_OVER = 5;
 
         /**
-         * 结束
+         * 审片预约
          */
-        int END = 6;
+        int BOOK_CHECK = 6;
 
 
         /**
-         * 退款中
+         * 审片完成
          */
-        int REFUNDING = 7;
+        int CHECK_OVER = 7;
 
         /**
-         * 已经取消
+         * 预约取件
          */
-        int CANCEL = 8;
+        int BOOK_ACCESS = 8;
 
 
         /**
-         * 退款失败
+         * 取件完成
          */
-        int REFUND_FAIL = 9;
+        int ACCESS_OVER = 9;
 
         /**
          * 退款成功
          */
-        int REFUND_SUCCESS = 10;
+        int FINISH = 10;
+
+        /**
+         * 取消
+         */
+        int CANCEL = 10;
 
 
     }

src/main/java/com/izouma/awesomeadmin/dao/UserOrderDetailMapper.xml

@@ -37,15 +37,21 @@
         <result column="use_type" property="useType" jdbcType="VARCHAR"/>
         <result column="order_id" property="orderId" jdbcType="INTEGER"/>
         <result column="tail_money" property="tailMoney" jdbcType="DECIMAL"/>
+        <result column="book_photo_time" property="bookPhotoTime" jdbcType="TIMESTAMP"/>
+        <result column="photo_time" property="photoTime" jdbcType="TIMESTAMP"/>
+        <result column="book_select_time" property="bookSelectTime" jdbcType="TIMESTAMP"/>
+        <result column="select_time" property="selectTime" jdbcType="TIMESTAMP"/>
+        <result column="book_check_time" property="bookCheckTime" jdbcType="TIMESTAMP"/>
+        <result column="check_time" property="checkTime" jdbcType="TIMESTAMP"/>
+        <result column="book_access_time" property="bookAccessTime" jdbcType="TIMESTAMP"/>
+        <result column="access_time" property="accessTime" jdbcType="TIMESTAMP"/>
+        <result column="comment_time" property="commentTime" jdbcType="TIMESTAMP"/>
         <!--generatedEnd-->
     </resultMap>
 
     <sql id="Base_Column_List">
         <!--generatedStart-->
-        id, del_flag, update_time, update_user, create_time, create_user, user_id, order_code, store_id, type_flag,
-        product_id, product_name, down_payment, unit_price, quantity, off_price, coupon_price, total_price, deal_price,
-        pay_mode, pay_time, remark, show_flag, status_flag, fee, coin, point, cash, user_address_id, service_id,
-        message, use_type, order_id, tail_money        <!--generatedEnd-->
+        id, del_flag, update_time, update_user, create_time, create_user, user_id, order_code, store_id, type_flag, product_id, product_name, down_payment, unit_price, quantity, off_price, coupon_price, total_price, deal_price, pay_mode, pay_time, remark, show_flag, status_flag, fee, coin, point, cash, user_address_id, service_id, message, use_type, order_id, tail_money, book_photo_time, photo_time, book_select_time, select_time, book_check_time, check_time, book_access_time, access_time, comment_time        <!--generatedEnd-->
     </sql>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -168,6 +174,33 @@
             <if test="tailMoney!= null">
                 tail_money,
             </if>
+            <if test="bookPhotoTime!= null">
+                book_photo_time,
+            </if>
+            <if test="photoTime!= null">
+                photo_time,
+            </if>
+            <if test="bookSelectTime!= null">
+                book_select_time,
+            </if>
+            <if test="selectTime!= null">
+                select_time,
+            </if>
+            <if test="bookCheckTime!= null">
+                book_check_time,
+            </if>
+            <if test="checkTime!= null">
+                check_time,
+            </if>
+            <if test="bookAccessTime!= null">
+                book_access_time,
+            </if>
+            <if test="accessTime!= null">
+                access_time,
+            </if>
+            <if test="commentTime!= null">
+                comment_time,
+            </if>
             <!--generatedEnd-->
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -274,6 +307,33 @@
             <if test="tailMoney != null">
                 #{tailMoney,jdbcType=DECIMAL},
             </if>
+            <if test="bookPhotoTime != null">
+                #{bookPhotoTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="photoTime != null">
+                #{photoTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="bookSelectTime != null">
+                #{bookSelectTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="selectTime != null">
+                #{selectTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="bookCheckTime != null">
+                #{bookCheckTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="checkTime != null">
+                #{checkTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="bookAccessTime != null">
+                #{bookAccessTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="accessTime != null">
+                #{accessTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="commentTime != null">
+                #{commentTime,jdbcType=TIMESTAMP},
+            </if>
             <!--generatedEnd-->
         </trim>
     </insert>
@@ -384,6 +444,33 @@
             <if test="tailMoney != null">
                 tail_money= #{tailMoney,jdbcType=DECIMAL},
             </if>
+            <if test="bookPhotoTime != null">
+                book_photo_time= #{bookPhotoTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="photoTime != null">
+                photo_time= #{photoTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="bookSelectTime != null">
+                book_select_time= #{bookSelectTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="selectTime != null">
+                select_time= #{selectTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="bookCheckTime != null">
+                book_check_time= #{bookCheckTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="checkTime != null">
+                check_time= #{checkTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="bookAccessTime != null">
+                book_access_time= #{bookAccessTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="accessTime != null">
+                access_time= #{accessTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="commentTime != null">
+                comment_time= #{commentTime,jdbcType=TIMESTAMP},
+            </if>
             <!--generatedEnd-->
         </set>
         WHERE
@@ -508,6 +595,33 @@
             <if test="record.tailMoney != null and !&quot;&quot;.equals(record.tailMoney)">
                 AND tail_money = #{record.tailMoney}
             </if>
+            <if test="record.bookPhotoTime != null and !&quot;&quot;.equals(record.bookPhotoTime)">
+                AND book_photo_time = #{record.bookPhotoTime}
+            </if>
+            <if test="record.photoTime != null and !&quot;&quot;.equals(record.photoTime)">
+                AND photo_time = #{record.photoTime}
+            </if>
+            <if test="record.bookSelectTime != null and !&quot;&quot;.equals(record.bookSelectTime)">
+                AND book_select_time = #{record.bookSelectTime}
+            </if>
+            <if test="record.selectTime != null and !&quot;&quot;.equals(record.selectTime)">
+                AND select_time = #{record.selectTime}
+            </if>
+            <if test="record.bookCheckTime != null and !&quot;&quot;.equals(record.bookCheckTime)">
+                AND book_check_time = #{record.bookCheckTime}
+            </if>
+            <if test="record.checkTime != null and !&quot;&quot;.equals(record.checkTime)">
+                AND check_time = #{record.checkTime}
+            </if>
+            <if test="record.bookAccessTime != null and !&quot;&quot;.equals(record.bookAccessTime)">
+                AND book_access_time = #{record.bookAccessTime}
+            </if>
+            <if test="record.accessTime != null and !&quot;&quot;.equals(record.accessTime)">
+                AND access_time = #{record.accessTime}
+            </if>
+            <if test="record.commentTime != null and !&quot;&quot;.equals(record.commentTime)">
+                AND comment_time = #{record.commentTime}
+            </if>
             <!--generatedEnd-->
             <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
@@ -526,7 +640,6 @@
                     OR total_price LIKE concat('%',#{record.searchKey},'%')
                     OR deal_price LIKE concat('%',#{record.searchKey},'%')
                     OR pay_mode LIKE concat('%',#{record.searchKey},'%')
-                    OR pay_time LIKE concat('%',#{record.searchKey},'%')
                     OR remark LIKE concat('%',#{record.searchKey},'%')
                     OR show_flag LIKE concat('%',#{record.searchKey},'%')
                     OR status_flag LIKE concat('%',#{record.searchKey},'%')
@@ -698,6 +811,33 @@
             <if test="tailMoney != null and !&quot;&quot;.equals(tailMoney)">
                 AND tail_money = #{tailMoney}
             </if>
+            <if test="bookPhotoTime != null and !&quot;&quot;.equals(bookPhotoTime)">
+                AND book_photo_time = #{bookPhotoTime}
+            </if>
+            <if test="photoTime != null and !&quot;&quot;.equals(photoTime)">
+                AND photo_time = #{photoTime}
+            </if>
+            <if test="bookSelectTime != null and !&quot;&quot;.equals(bookSelectTime)">
+                AND book_select_time = #{bookSelectTime}
+            </if>
+            <if test="selectTime != null and !&quot;&quot;.equals(selectTime)">
+                AND select_time = #{selectTime}
+            </if>
+            <if test="bookCheckTime != null and !&quot;&quot;.equals(bookCheckTime)">
+                AND book_check_time = #{bookCheckTime}
+            </if>
+            <if test="checkTime != null and !&quot;&quot;.equals(checkTime)">
+                AND check_time = #{checkTime}
+            </if>
+            <if test="bookAccessTime != null and !&quot;&quot;.equals(bookAccessTime)">
+                AND book_access_time = #{bookAccessTime}
+            </if>
+            <if test="accessTime != null and !&quot;&quot;.equals(accessTime)">
+                AND access_time = #{accessTime}
+            </if>
+            <if test="commentTime != null and !&quot;&quot;.equals(commentTime)">
+                AND comment_time = #{commentTime}
+            </if>
             <!--generatedEnd-->
             <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
@@ -716,7 +856,6 @@
                     OR total_price LIKE concat('%',#{searchKey},'%')
                     OR deal_price LIKE concat('%',#{searchKey},'%')
                     OR pay_mode LIKE concat('%',#{searchKey},'%')
-                    OR pay_time LIKE concat('%',#{searchKey},'%')
                     OR remark LIKE concat('%',#{searchKey},'%')
                     OR show_flag LIKE concat('%',#{searchKey},'%')
                     OR status_flag LIKE concat('%',#{searchKey},'%')
@@ -884,6 +1023,33 @@
             <if test="tailMoney != null and !&quot;&quot;.equals(tailMoney)">
                 AND tail_money = #{tailMoney}
             </if>
+            <if test="bookPhotoTime != null and !&quot;&quot;.equals(bookPhotoTime)">
+                AND book_photo_time = #{bookPhotoTime}
+            </if>
+            <if test="photoTime != null and !&quot;&quot;.equals(photoTime)">
+                AND photo_time = #{photoTime}
+            </if>
+            <if test="bookSelectTime != null and !&quot;&quot;.equals(bookSelectTime)">
+                AND book_select_time = #{bookSelectTime}
+            </if>
+            <if test="selectTime != null and !&quot;&quot;.equals(selectTime)">
+                AND select_time = #{selectTime}
+            </if>
+            <if test="bookCheckTime != null and !&quot;&quot;.equals(bookCheckTime)">
+                AND book_check_time = #{bookCheckTime}
+            </if>
+            <if test="checkTime != null and !&quot;&quot;.equals(checkTime)">
+                AND check_time = #{checkTime}
+            </if>
+            <if test="bookAccessTime != null and !&quot;&quot;.equals(bookAccessTime)">
+                AND book_access_time = #{bookAccessTime}
+            </if>
+            <if test="accessTime != null and !&quot;&quot;.equals(accessTime)">
+                AND access_time = #{accessTime}
+            </if>
+            <if test="commentTime != null and !&quot;&quot;.equals(commentTime)">
+                AND comment_time = #{commentTime}
+            </if>
             <!--generatedEnd-->
         </where>
         LIMIT 1

src/main/java/com/izouma/awesomeadmin/model/UserOrderDetail.java

@@ -45,6 +45,15 @@ public class UserOrderDetail {
     private String useType;
     private Integer orderId;
     private BigDecimal tailMoney;
+    private Date bookPhotoTime;
+    private Date photoTime;
+    private Date bookSelectTime;
+    private Date selectTime;
+    private Date bookCheckTime;
+    private Date checkTime;
+    private Date bookAccessTime;
+    private Date accessTime;
+    private Date commentTime;
 
     private String idStr;
 
@@ -63,10 +72,10 @@ public class UserOrderDetail {
 
     private ProductInfo productInfo;
 
-    private OrderAddress orderAddress;
-
     private UserInfo userInfo;
 
+    private OrderAddress orderAddress;
+
     /*generatedStart*/
     public Integer getId() {
         return this.id;
@@ -340,6 +349,78 @@ public class UserOrderDetail {
         this.tailMoney = tailMoney;
     }
 
+    public Date getBookPhotoTime() {
+        return this.bookPhotoTime;
+    }
+
+    public void setBookPhotoTime(Date bookPhotoTime) {
+        this.bookPhotoTime = bookPhotoTime;
+    }
+
+    public Date getPhotoTime() {
+        return this.photoTime;
+    }
+
+    public void setPhotoTime(Date photoTime) {
+        this.photoTime = photoTime;
+    }
+
+    public Date getBookSelectTime() {
+        return this.bookSelectTime;
+    }
+
+    public void setBookSelectTime(Date bookSelectTime) {
+        this.bookSelectTime = bookSelectTime;
+    }
+
+    public Date getSelectTime() {
+        return this.selectTime;
+    }
+
+    public void setSelectTime(Date selectTime) {
+        this.selectTime = selectTime;
+    }
+
+    public Date getBookCheckTime() {
+        return this.bookCheckTime;
+    }
+
+    public void setBookCheckTime(Date bookCheckTime) {
+        this.bookCheckTime = bookCheckTime;
+    }
+
+    public Date getCheckTime() {
+        return this.checkTime;
+    }
+
+    public void setCheckTime(Date checkTime) {
+        this.checkTime = checkTime;
+    }
+
+    public Date getBookAccessTime() {
+        return this.bookAccessTime;
+    }
+
+    public void setBookAccessTime(Date bookAccessTime) {
+        this.bookAccessTime = bookAccessTime;
+    }
+
+    public Date getAccessTime() {
+        return this.accessTime;
+    }
+
+    public void setAccessTime(Date accessTime) {
+        this.accessTime = accessTime;
+    }
+
+    public Date getCommentTime() {
+        return this.commentTime;
+    }
+
+    public void setCommentTime(Date commentTime) {
+        this.commentTime = commentTime;
+    }
+
     public String getSearchKey() {
         return searchKey;
     }
@@ -382,14 +463,6 @@ public class UserOrderDetail {
         this.productInfo = productInfo;
     }
 
-    public OrderAddress getOrderAddress() {
-        return orderAddress;
-    }
-
-    public void setOrderAddress(OrderAddress orderAddress) {
-        this.orderAddress = orderAddress;
-    }
-
     public UserInfo getUserInfo() {
         return userInfo;
     }
@@ -397,5 +470,13 @@ public class UserOrderDetail {
     public void setUserInfo(UserInfo userInfo) {
         this.userInfo = userInfo;
     }
+
+    public OrderAddress getOrderAddress() {
+        return orderAddress;
+    }
+
+    public void setOrderAddress(OrderAddress orderAddress) {
+        this.orderAddress = orderAddress;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/UserOrderService.java

@@ -53,23 +53,6 @@ public interface UserOrderService {
      */
     Result jieSuan(String orderId);
 
-    /**
-     * <p>退款。</p>
-     *
-     * @param orderId
-     * @return
-     */
-    Result refundOrder(String orderId);
-
-
-
-    /**
-     * <p>退款失败，被拒绝。</p>
-     *
-     * @param orderId
-     * @return
-     */
-    Result refundFail(String orderId);
 
     /**
      * <p>。自动执行任务</p>

src/main/java/com/izouma/awesomeadmin/service/impl/RefundApplicationServiceImpl.java

@@ -119,7 +119,7 @@ public class RefundApplicationServiceImpl implements RefundApplicationService {
                 if (userOrder != null) {
                     UserOrder updateUserOrder = new UserOrder();
                     updateUserOrder.setId(record.getOrderId());
-                    updateUserOrder.setStatusFlag(AppConstant.OrderStatus.REFUNDING);
+//                    updateUserOrder.setStatusFlag(AppConstant.OrderStatus.REFUNDING);
                     updateUserOrder.setOldStatus(userOrder.getStatusFlag());
                     updateUserOrder.setRefundStatus(AppConstant.RefundStatus.APPLY);
                     userOrderMapper.updateByPrimaryKeySelective(updateUserOrder);
@@ -256,7 +256,7 @@ public class RefundApplicationServiceImpl implements RefundApplicationService {
 
                             UserOrder updateOrder = new UserOrder();
                             updateOrder.setId(userOrder.getId());
-                            updateOrder.setStatusFlag(AppConstant.OrderStatus.REFUND_SUCCESS);
+//                            updateOrder.setStatusFlag(AppConstant.OrderStatus.REFUND_SUCCESS);
                             updateOrder.setRefundStatus(AppConstant.RefundStatus.SUCCESS);
                             userOrderMapper.updateByPrimaryKeySelective(updateOrder);
 

src/main/java/com/izouma/awesomeadmin/service/impl/UserOrderServiceImpl.java

@@ -6,11 +6,7 @@ import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.dto.Result;
 import com.izouma.awesomeadmin.model.*;
 import com.izouma.awesomeadmin.service.*;
-import com.izouma.awesomeadmin.util.AlipayClientFactory;
 import com.izouma.awesomeadmin.util.MbappUtil;
-import com.izouma.awesomeadmin.util.PropertiesFileLoader;
-import com.izouma.weixin.dto.WxPayRefundData;
-import com.izouma.weixin.model.WxpayTemp;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -898,164 +894,6 @@ public class UserOrderServiceImpl implements UserOrderService {
     }
 
 
-    @Override
-    public Result refundOrder(String orderId) {
-
-        logger.info("refundOrder：退款");
-        try {
-
-            UserOrder userOrder = userOrderMapper.selectByPrimaryKey(Integer.valueOf(orderId));
-            if (userOrder != null) {
-
-                if (AppConstant.OrderStatus.REFUNDING == userOrder.getStatusFlag()) {
-
-
-                    double coin = userOrder.getCoin().doubleValue();
-
-                    double point = userOrder.getPoint().doubleValue();
-
-                    double cash = userOrder.getCash().doubleValue();
-
-                    int payMode = userOrder.getPayMode();
-                    UserInfo userInfo = userInfoService.getUserInfoById(userOrder.getUserId() + "");
-
-
-                    /**
-                     * 余额
-                     */
-                    double moneyCoin = userInfo.getMoneyCoin();
-
-                    /**
-                     * 商城积分
-                     */
-                    double moneyPoint = userInfo.getMoneyPoint();
-
-
-                    if (coin > 0) {
-
-                        MemberCoin memberCoin = new MemberCoin();
-                        memberCoin.setCreateUser("系统");
-                        memberCoin.setUserId(userInfo.getId() + "");
-                        memberCoin.setOrderId(orderId);
-                        memberCoin.setMoney(String.valueOf(coin + 0.0));
-                        memberCoin.setBalance(String.valueOf(moneyCoin + coin));
-                        memberCoin.setTypeFlag(AppConstant.CoinType.REFUND);
-                        memberCoin.setRemark("退款，订单号：" + userOrder.getOrderCode());
-                        memberCoinService.createMemberCoin(memberCoin);
-
-                    }
-
-                    if (point > 0) {
-//                        MemberPoint memberPoint = new MemberPoint();
-//                        memberPoint.setCreateUser("系统");
-//                        memberPoint.setOrderId(orderId);
-//                        memberPoint.setUserId(userInfo.getId() + "");
-//                        memberPoint.setMoney(String.valueOf(point + 0.0));
-//                        memberPoint.setBalance(String.valueOf(moneyPoint + point));
-//                        memberPoint.setTypeFlag(AppConstant.CoinType.REFUND);
-//                        memberPoint.setRemark("退款，订单号：" + userOrder.getOrderCode());
-//                        memberPointService.createMemberPoint(memberPoint);
-                    }
-
-
-                    if (cash > 0) {
-//                        if (AppConstant.PayMode.ALIPAY == payMode) {
-//                            AlipayTemp alipayTemp = new AlipayTemp();
-//                            alipayTemp.setTradeStatus(AppConstant.Aliapi.TRADE_SUCCESS);
-//                            alipayTemp.setOrderId(orderId);
-//                            alipayTemp.setTypeFlag(AppConstant.Aliapi.BUY);
-//                            alipayTemp = alipayTempMapper.queryAlipayTemp(alipayTemp);
-//                            if (alipayTemp != null) {
-//
-//                                AlipayClientFactory.refund(alipayTemp.getOutTradeNo(), cash);
-//                            }
-//                        }
-//
-//                        if (AppConstant.PayMode.WEI_XIN == payMode) {
-//
-//                            WxpayTemp wxpayTemp = new WxpayTemp();
-//                            wxpayTemp.setOrderId(orderId);
-//                            wxpayTemp.setTypeFlag(AppConstant.Aliapi.BUY);
-//                            wxpayTemp = wxpayTempMapper.queryWxpayTemp(wxpayTemp);
-//
-//                            if (wxpayTemp != null) {
-//
-//                                String out_refund_no = MbappUtil.create_out_trade_no();
-//                                WxPayRefundData data = new WxPayRefundData();
-//                                data.setAppid(PropertiesFileLoader.getProperties("weixinappid"));
-//                                data.setMch_id(PropertiesFileLoader.getProperties("weixin_mch_id"));
-//                                data.setDevice_info(AppConstant.DEVICE_INFO);
-//                                data.setNonce_str(MbappUtil.create_nonce_str());
-//                                data.setOut_trade_no(wxpayTemp.getOutTradeNo());
-//                                data.setTransaction_id(wxpayTemp.getTransactionId());
-//                                data.setOut_refund_no(out_refund_no);
-//                                data.setTotal_fee((int) (cash * 100));
-//                                data.setRefund_fee((int) (cash * 100));
-//                                data.setOp_user_id(PropertiesFileLoader.getProperties("weixin_mch_id"));
-//
-//                                WXRefundService.refund(data, "UTF-8", PropertiesFileLoader.getProperties("weixin_cert_path"), PropertiesFileLoader.getProperties("weixin_mch_id"));
-//
-//                                wxpayTemp.setOutRefundNo(out_refund_no);
-//
-//                                wxpayTempMapper.updateByPrimaryKeySelective(wxpayTemp);
-//
-//                            }
-//                        }
-                    }
-
-                    UserInfo updateUser = new UserInfo();
-                    updateUser.setId(userInfo.getId());
-                    updateUser.setMoneyCoin(moneyCoin + coin);
-                    updateUser.setMoneyPoint(moneyPoint + point);
-                    userInfoService.updateUserInfo(updateUser);
-
-                    UserOrder updateOrder = new UserOrder();
-                    updateOrder.setId(userOrder.getId());
-                    updateOrder.setStatusFlag(AppConstant.OrderStatus.REFUND_SUCCESS);
-
-
-                    userOrderMapper.updateByPrimaryKeySelective(updateOrder);
-
-                }
-            }
-
-            return new Result(true, "退款成功");
-
-        } catch (Exception e) {
-            logger.error("refundOrder：退款异常", e);
-        }
-        return new Result(false, "退款失败");
-    }
-
-
-    @Override
-    public Result refundFail(String orderId) {
-
-        logger.info("refundFail：拒绝退款");
-        try {
-
-            UserOrder userOrder = userOrderMapper.selectByPrimaryKey(Integer.valueOf(orderId));
-            if (userOrder != null) {
-
-                if (AppConstant.OrderStatus.REFUNDING == userOrder.getStatusFlag()) {
-
-                    UserOrder updateOrder = new UserOrder();
-                    updateOrder.setId(userOrder.getId());
-                    updateOrder.setStatusFlag(AppConstant.OrderStatus.REFUND_FAIL);
-                    userOrderMapper.updateByPrimaryKeySelective(updateOrder);
-
-                }
-            }
-
-            return new Result(true, "拒绝退款成功");
-
-        } catch (Exception e) {
-            logger.error("refundFail：拒绝退款异常", e);
-        }
-        return new Result(false, "拒绝退款失败");
-    }
-
-
     @Override
     public Result ziDong() {
 

src/main/java/com/izouma/awesomeadmin/web/UserOrderController.java

@@ -109,12 +109,13 @@ public class UserOrderController {
 
     /**
      * 提交订单， UserOrder json
+     *
      * @param record
      * @return
      */
     @RequestMapping(value = "/submit", method = RequestMethod.POST)
     @ResponseBody
-    public Result submit(@RequestBody  UserOrder record) {
+    public Result submit(@RequestBody UserOrder record) {
         return userOrderService.submit(record);
     }
 
@@ -244,35 +245,6 @@ public class UserOrderController {
 
     }
 
-    /**
-     * <p>退款。</p>
-     *
-     * @param orderId
-     * @return
-     */
-    @RequestMapping(value = "/refund", method = RequestMethod.POST)
-    @ResponseBody
-    public Result refund(@RequestParam(required = true, value = "orderId") String orderId) {
-
-        return userOrderService.refundOrder(orderId);
-
-    }
-
-
-    /**
-     * 退款失败
-     *
-     * @param orderId
-     * @return
-     */
-    @RequestMapping(value = "/refundFail", method = RequestMethod.POST)
-    @ResponseBody
-    public Result refundFail(@RequestParam(required = true, value = "orderId") String orderId) {
-
-        return userOrderService.refundFail(orderId);
-
-    }
-
 
     @RequestMapping(value = "/ziDong", method = RequestMethod.GET)
     @ResponseBody

src/main/java/com/izouma/awesomeadmin/web/UserOrderDetailController.java

@@ -100,10 +100,10 @@ public class UserOrderDetailController {
         String sheetName = "user_order_detail";
         String titleName = "订单详情数据表";
         String fileName = "订单详情表";
-        int columnNumber = 34;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户" ,   "订单号" ,   "店铺" ,   "类型" ,   "商品" ,   "商品名" ,   "定金" ,   "单价" ,   "数量" ,   "减价格" ,   "优惠价格" ,   "总价格" ,   "支付价格" ,   "支付方式" ,   "支付时间" ,   "备注" ,   "前端显示" ,   "状态" ,   "手续费" ,   "余额" ,   "积分" ,   "现金" ,   "地址Id" ,   "店铺服务" ,   "留言" ,   "消费方式" ,   "订单Id" ,   "尾款"  };
-        String[][] dataList = new String[userOrderDetails.size()][34];
+        int columnNumber = 43;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户" ,   "订单号" ,   "店铺" ,   "类型" ,   "商品" ,   "商品名" ,   "定金" ,   "单价" ,   "数量" ,   "减价格" ,   "优惠价格" ,   "总价格" ,   "支付价格" ,   "支付方式" ,   "支付时间" ,   "备注" ,   "前端显示" ,   "状态" ,   "手续费" ,   "余额" ,   "积分" ,   "现金" ,   "地址Id" ,   "店铺服务" ,   "留言" ,   "消费方式" ,   "订单Id" ,   "尾款" ,   "预约拍照时间" ,   "拍照时间" ,   "预约选片时间" ,   "选片时间" ,   "预约审片时间" ,   "审片时间" ,   "预约取件时间" ,   "取件时间" ,   "评论时间"  };
+        String[][] dataList = new String[userOrderDetails.size()][43];
 
         for (int i = 0; i < userOrderDetails.size(); i++) {
                         dataList[i][0] = String.valueOf(userOrderDetails.get(i).getId());
@@ -140,6 +140,15 @@ public class UserOrderDetailController {
                         dataList[i][31] = String.valueOf(userOrderDetails.get(i).getUseType());
                         dataList[i][32] = String.valueOf(userOrderDetails.get(i).getOrderId());
                         dataList[i][33] = String.valueOf(userOrderDetails.get(i).getTailMoney());
+                        dataList[i][34] = String.valueOf(userOrderDetails.get(i).getBookPhotoTime());
+                        dataList[i][35] = String.valueOf(userOrderDetails.get(i).getPhotoTime());
+                        dataList[i][36] = String.valueOf(userOrderDetails.get(i).getBookSelectTime());
+                        dataList[i][37] = String.valueOf(userOrderDetails.get(i).getSelectTime());
+                        dataList[i][38] = String.valueOf(userOrderDetails.get(i).getBookCheckTime());
+                        dataList[i][39] = String.valueOf(userOrderDetails.get(i).getCheckTime());
+                        dataList[i][40] = String.valueOf(userOrderDetails.get(i).getBookAccessTime());
+                        dataList[i][41] = String.valueOf(userOrderDetails.get(i).getAccessTime());
+                        dataList[i][42] = String.valueOf(userOrderDetails.get(i).getCommentTime());
                     }
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,

src/main/vue/src/pages/UserOrderDetails.vue

@@ -43,7 +43,14 @@
                     min-width="50"
                     align="center">
             </el-table-column>
-                                                                                                                                                                                                    
+                            
+                                            <el-table-column
+                                v-if="isColumnShow('id')"
+                                prop="id"
+                                label="ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                                                                                                                                                            
                                             <el-table-column
                                 v-if="isColumnShow('userId')"
                                 prop="userId"
@@ -146,6 +153,7 @@
                                 v-if="isColumnShow('payTime')"
                                 prop="payTime"
                                 label="支付时间"
+                                :formatter="DateTimeFormatter"
                                 min-width="100">
                         </el-table-column>
                                                                 
@@ -239,6 +247,78 @@
                                 label="尾款"
                                 min-width="100">
                         </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('bookPhotoTime')"
+                                prop="bookPhotoTime"
+                                label="预约拍照时间"
+                                :formatter="DateTimeFormatter"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('photoTime')"
+                                prop="photoTime"
+                                label="拍照时间"
+                                :formatter="DateTimeFormatter"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('bookSelectTime')"
+                                prop="bookSelectTime"
+                                label="预约选片时间"
+                                :formatter="DateTimeFormatter"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('selectTime')"
+                                prop="selectTime"
+                                label="选片时间"
+                                :formatter="DateTimeFormatter"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('bookCheckTime')"
+                                prop="bookCheckTime"
+                                label="预约审片时间"
+                                :formatter="DateTimeFormatter"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('checkTime')"
+                                prop="checkTime"
+                                label="审片时间"
+                                :formatter="DateTimeFormatter"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('bookAccessTime')"
+                                prop="bookAccessTime"
+                                label="预约取件时间"
+                                :formatter="DateTimeFormatter"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('accessTime')"
+                                prop="accessTime"
+                                label="取件时间"
+                                :formatter="DateTimeFormatter"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('commentTime')"
+                                prop="commentTime"
+                                label="评论时间"
+                                :formatter="DateTimeFormatter"
+                                min-width="100">
+                        </el-table-column>
                                                             <el-table-column
                     label="操作"
                     align="center"
@@ -382,7 +462,12 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '用户',
                                 value: 'userId',
                                 show: true
@@ -521,6 +606,51 @@
                                 label: '尾款',
                                 value: 'tailMoney',
                                 show: true
+                            },
+                                                                                                {
+                                label: '预约拍照时间',
+                                value: 'bookPhotoTime',
+                                show: true
+                            },
+                                                                                                {
+                                label: '拍照时间',
+                                value: 'photoTime',
+                                show: true
+                            },
+                                                                                                {
+                                label: '预约选片时间',
+                                value: 'bookSelectTime',
+                                show: true
+                            },
+                                                                                                {
+                                label: '选片时间',
+                                value: 'selectTime',
+                                show: true
+                            },
+                                                                                                {
+                                label: '预约审片时间',
+                                value: 'bookCheckTime',
+                                show: true
+                            },
+                                                                                                {
+                                label: '审片时间',
+                                value: 'checkTime',
+                                show: true
+                            },
+                                                                                                {
+                                label: '预约取件时间',
+                                value: 'bookAccessTime',
+                                show: true
+                            },
+                                                                                                {
+                                label: '取件时间',
+                                value: 'accessTime',
+                                show: true
+                            },
+                                                                                                {
+                                label: '评论时间',
+                                value: 'commentTime',
+                                show: true
                             },
                                                             ],
                 multipleMode: false,
@@ -530,7 +660,11 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '用户',
                                 value: 'user_id'
                             },
@@ -641,6 +775,42 @@
                                                                                                 {
                                 label: '尾款',
                                 value: 'tail_money'
+                            },
+                                                                                                {
+                                label: '预约拍照时间',
+                                value: 'book_photo_time'
+                            },
+                                                                                                {
+                                label: '拍照时间',
+                                value: 'photo_time'
+                            },
+                                                                                                {
+                                label: '预约选片时间',
+                                value: 'book_select_time'
+                            },
+                                                                                                {
+                                label: '选片时间',
+                                value: 'select_time'
+                            },
+                                                                                                {
+                                label: '预约审片时间',
+                                value: 'book_check_time'
+                            },
+                                                                                                {
+                                label: '审片时间',
+                                value: 'check_time'
+                            },
+                                                                                                {
+                                label: '预约取件时间',
+                                value: 'book_access_time'
+                            },
+                                                                                                {
+                                label: '取件时间',
+                                value: 'access_time'
+                            },
+                                                                                                {
+                                label: '评论时间',
+                                value: 'comment_time'
                             },
                                                             ],
                 advancedQuerySearchKey: '',

src/main/vue/src/pages/UserOrders.vue

@@ -5,18 +5,21 @@
             <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
+                       icon="el-icon-search" class="filter-item">高级查询
             </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
+                       icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push({path:'/userOrder',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
+            <el-button @click="$router.push({path:'/userOrder',query:{column:$route.query.column}})" type="primary"
+                       size="small" icon="el-icon-edit"
+                       class="filter-item">添加
             </el-button>
             <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
             </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                    筛选数据
-                    <i class="el-icon-arrow-down el-icon--right"></i>
+                    筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
                     <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
@@ -24,48 +27,183 @@
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
-        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
-            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+        <el-table
+                  :data="tableData"
+                  :height="tableHeight"
+                  row-key="id"
+                  ref="table">
+            <el-table-column
+                             v-if="multipleMode"
+                             align="center"
+                             type="selection"
+                             width="50">
             </el-table-column>
-            <el-table-column type="index" min-width="50" align="center">
+            <el-table-column
+                             type="index"
+                             min-width="50"
+                             align="center">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('id')" prop="id" label="ID" min-width="100">
+            <el-table-column
+                             v-if="isColumnShow('id')"
+                             prop="id"
+                             label="id"
+                             min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('userId')" prop="userId" label="用户ID" min-width="100">
+            <el-table-column
+                             v-if="isColumnShow('statusFlag')"
+                             prop="statusFlag"
+                             label="状态"
+                             min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('lankMarkId')" prop="lankMarkId" label="地标ID" min-width="100">
+            <el-table-column
+                             v-if="isColumnShow('userId')"
+                             prop="userId"
+                             label="用户"
+                             min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('packageId')" prop="packageId" label="导游包ID" min-width="100">
+            <el-table-column
+                             v-if="isColumnShow('orderCode')"
+                             prop="orderCode"
+                             label="订单编码"
+                             min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('statusFlag')" prop="statusFlag" label="状态" min-width="100">
+            <el-table-column
+                             v-if="isColumnShow('storeId')"
+                             prop="storeId"
+                             label="店铺"
+                             min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('payTime')" prop="payTime" label="支付时间"  :formatter="DateTimeFormatter" min-width="100">
+            <el-table-column
+                             v-if="isColumnShow('totlePrice')"
+                             prop="totlePrice"
+                             label="总价"
+                             min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('payMode')" prop="payMode" label="支付方式" min-width="100">
+            <el-table-column
+                             v-if="isColumnShow('dealPrice')"
+                             prop="dealPrice"
+                             label="成交价"
+                             min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
+            <el-table-column
+                             v-if="isColumnShow('payMode')"
+                             prop="payMode"
+                             label="支付方式"
+                             min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('showFlag')" prop="showFlag" label="显示标识" min-width="100">
+            <el-table-column
+                             v-if="isColumnShow('payTime')"
+                             prop="payTime"
+                             label="支付时间"
+                             :formatter="DateTimeFormatter"
+                             min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('totlePrice')" prop="totlePrice" label="金额" min-width="100">
+            <el-table-column
+                             v-if="isColumnShow('createTime')"
+                             prop="createTime"
+                             label="创建时间"
+                             :formatter="DateTimeFormatter"
+                             min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('dealPrice')" prop="dealPrice" label="成交" min-width="100">
+            <el-table-column
+                             v-if="isColumnShow('remark')"
+                             prop="remark"
+                             label="备注"
+                             min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('marketCode')" prop="marketCode" label="推广码" min-width="100">
+            <el-table-column
+                             v-if="isColumnShow('showFlag')"
+                             prop="showFlag"
+                             label="显示标识"
+                             min-width="100">
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+
+            <el-table-column
+                             v-if="isColumnShow('userCouponId')"
+                             prop="userCouponId"
+                             label="优惠券"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('offPrice')"
+                             prop="offPrice"
+                             label="优惠金额"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('fee')"
+                             prop="fee"
+                             label="手续费"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('coin')"
+                             prop="coin"
+                             label="余额"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('point')"
+                             prop="point"
+                             label="积分"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('cash')"
+                             prop="cash"
+                             label="现金"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('cancelReason')"
+                             prop="cancelReason"
+                             label="取消原因"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('confirmTime')"
+                             prop="confirmTime"
+                             label="确认时间"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('oldStatus')"
+                             prop="oldStatus"
+                             label="退款前状态"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('refundStatus')"
+                             prop="refundStatus"
+                             label="退款状态"
+                             min-width="100">
+            </el-table-column>
+            <el-table-column
+                             label="操作"
+                             align="center"
+                             fixed="right"
+                             min-width="150">
                 <template slot-scope="scope">
                     <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
@@ -81,7 +219,15 @@
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
-            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
+            <el-pagination
+                           background
+                           @size-change="pageSizeChange"
+                           @current-change="currentPageChange"
+                           :current-page="currentPage"
+                           :page-sizes="[10, 20, 30, 40, 50]"
+                           :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalNumber">
             </el-pagination>
         </div>
         <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
@@ -102,14 +248,16 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
                 <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
                     <template slot-scope="{row}">
                         <el-select v-model="row.searchMethod">
-                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
+                            <el-option v-for="item in searchMethods" :label="item" :value="item"
+                                       :key="item"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -139,7 +287,8 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -173,11 +322,12 @@
     </div>
 </template>
 <script>
-import { mapState } from 'vuex'
-import { format } from 'date-fns'
-import zh from 'date-fns/locale/zh_cn'
+import { mapState } from 'vuex';
+import { format } from 'date-fns';
+import zh from 'date-fns/locale/zh_cn';
 
 export default {
+    name: 'UserOrders',
     created() {
         this.getData();
     },
@@ -192,64 +342,114 @@ export default {
             filter2: '',
             tableColumns: [
                 {
-                    label: 'ID',
+                    label: 'id',
                     value: 'id',
-                    show: true
+                    show: true,
                 },
                 {
-                    label: '用户ID',
+                    label: '创建时间',
+                    value: 'createTime',
+                    show: true,
+                },
+                {
+                    label: '用户',
                     value: 'userId',
-                    show: true
+                    show: true,
                 },
                 {
-                    label: '地标ID',
-                    value: 'lankMarkId',
-                    show: true
+                    label: '订单编码',
+                    value: 'orderCode',
+                    show: true,
                 },
                 {
-                    label: '导游包ID',
-                    value: 'packageId',
-                    show: true
+                    label: '店铺',
+                    value: 'storeId',
+                    show: true,
                 },
                 {
-                    label: '状态',
-                    value: 'statusFlag',
-                    show: true
+                    label: '优惠券',
+                    value: 'userCouponId',
+                    show: true,
                 },
                 {
-                    label: '支付时间',
-                    value: 'payTime',
-                    show: true
+                    label: '优惠金额',
+                    value: 'offPrice',
+                    show: true,
+                },
+                {
+                    label: '总价',
+                    value: 'totlePrice',
+                    show: true,
+                },
+                {
+                    label: '成交价',
+                    value: 'dealPrice',
+                    show: true,
                 },
                 {
                     label: '支付方式',
                     value: 'payMode',
-                    show: true
+                    show: true,
+                },
+                {
+                    label: '支付时间',
+                    value: 'payTime',
+                    show: true,
                 },
                 {
                     label: '备注',
                     value: 'remark',
-                    show: true
+                    show: true,
                 },
                 {
                     label: '显示标识',
                     value: 'showFlag',
-                    show: true
+                    show: true,
                 },
                 {
-                    label: '金额',
-                    value: 'totlePrice',
-                    show: true
+                    label: '状态',
+                    value: 'statusFlag',
+                    show: true,
                 },
                 {
-                    label: '成交',
-                    value: 'dealPrice',
-                    show: true
+                    label: '手续费',
+                    value: 'fee',
+                    show: true,
                 },
                 {
-                    label: '推广码',
-                    value: 'marketCode',
-                    show: true
+                    label: '余额',
+                    value: 'coin',
+                    show: true,
+                },
+                {
+                    label: '积分',
+                    value: 'point',
+                    show: true,
+                },
+                {
+                    label: '现金',
+                    value: 'cash',
+                    show: true,
+                },
+                {
+                    label: '取消原因',
+                    value: 'cancelReason',
+                    show: true,
+                },
+                {
+                    label: '确认时间',
+                    value: 'confirmTime',
+                    show: true,
+                },
+                {
+                    label: '退款前状态',
+                    value: 'oldStatus',
+                    show: true,
+                },
+                {
+                    label: '退款状态',
+                    value: 'refundStatus',
+                    show: true,
                 },
             ],
             multipleMode: false,
@@ -260,65 +460,105 @@ export default {
             searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
             advancedQueryColumns: [
                 {
-                    label: 'ID',
-                    value: 'id'
+                    label: 'id',
+                    value: 'id',
+                },
+                {
+                    label: '创建时间',
+                    value: 'create_time',
                 },
                 {
-                    label: '用户ID',
-                    value: 'user_id'
+                    label: '用户',
+                    value: 'user_id',
                 },
                 {
-                    label: '地标ID',
-                    value: 'lank_mark_id'
+                    label: '订单编码',
+                    value: 'order_code',
                 },
                 {
-                    label: '导游包ID',
-                    value: 'package_id'
+                    label: '店铺',
+                    value: 'store_id',
                 },
                 {
-                    label: '状态',
-                    value: 'status_flag'
+                    label: '优惠券',
+                    value: 'user_coupon_id',
                 },
                 {
-                    label: '支付时间',
-                    value: 'pay_time'
+                    label: '优惠金额',
+                    value: 'off_price',
+                },
+                {
+                    label: '总价',
+                    value: 'totle_price',
+                },
+                {
+                    label: '成交价',
+                    value: 'deal_price',
                 },
                 {
                     label: '支付方式',
-                    value: 'pay_mode'
+                    value: 'pay_mode',
+                },
+                {
+                    label: '支付时间',
+                    value: 'pay_time',
                 },
                 {
                     label: '备注',
-                    value: 'remark'
+                    value: 'remark',
                 },
                 {
                     label: '显示标识',
-                    value: 'show_flag'
+                    value: 'show_flag',
                 },
                 {
-                    label: '金额',
-                    value: 'totle_price'
+                    label: '状态',
+                    value: 'status_flag',
                 },
                 {
-                    label: '成交',
-                    value: 'deal_price'
+                    label: '手续费',
+                    value: 'fee',
                 },
                 {
-                    label: '推广码',
-                    value: 'market_code'
+                    label: '余额',
+                    value: 'coin',
+                },
+                {
+                    label: '积分',
+                    value: 'point',
+                },
+                {
+                    label: '现金',
+                    value: 'cash',
+                },
+                {
+                    label: '取消原因',
+                    value: 'cancel_reason',
+                },
+                {
+                    label: '确认时间',
+                    value: 'confirm_time',
+                },
+                {
+                    label: '退款前状态',
+                    value: 'old_status',
+                },
+                {
+                    label: '退款状态',
+                    value: 'refund_status',
                 },
             ],
             advancedQuerySearchKey: '',
             orderByStr: '',
             imgSrc: '',
             imageDialogVisible: false,
-        }
+        };
     },
     computed: {
         ...mapState(['tableHeight']),
         selection() {
             return this.$refs.table.selection.map(i => i.id);
-        }
+        },
     },
     methods: {
         pageSizeChange(size) {
@@ -331,29 +571,30 @@ export default {
             this.getData();
         },
         getData() {
-
             var data = {
                 currentPage: this.currentPage,
                 pageNumber: this.pageSize,
                 searchKey: this.filter1,
                 advancedQuery: this.advancedQuerySearchKey,
                 orderByStr: this.orderByStr,
-            }
+            };
 
             if (this.$route.query.column) {
                 var tempColumn = this.$route.query.column;
                 data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
             }
 
-            this.$http.get({
-                url: '/userOrder/page',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.totalNumber = res.data.page.totalNumber;
-                    this.tableData = res.data.pp;
-                }
-            })
+            this.$http
+                .get({
+                    url: '/userOrder/page',
+                    data: data,
+                })
+                .then(res => {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.tableData = res.data.pp;
+                    }
+                });
         },
         isColumnShow(column) {
             var row = this.tableColumns.find(i => i.value === column);
@@ -371,13 +612,13 @@ export default {
                 query: {
                     id: row.id,
                     column: this.$route.query.column,
-                }
-            })
+                },
+            });
         },
         operation1() {
             this.$notify({
                 title: '提示',
-                message: this.selection
+                message: this.selection,
             });
         },
         operation2() {
@@ -397,22 +638,31 @@ export default {
             }
         },
         advancedQuery() {
-
             this.advancedQuerySearchKey = '';
 
             if (this.advancedQueryFields.length > 0) {
-
                 var templist = [];
 
                 this.advancedQueryFields.forEach(item => {
-                    if (item.link && item.name && item.searchMethod && item.value) {
-                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                    if (
+                        item.link &&
+                        item.name &&
+                        item.searchMethod &&
+                        item.value
+                    ) {
+                        var tempItem =
+                            item.link +
+                            '_,' +
+                            item.name +
+                            '_,' +
+                            item.searchMethod +
+                            '_,' +
+                            item.value;
                         templist.push(tempItem);
                     }
-                })
+                });
 
                 if (templist.length > 0) {
-
                     this.advancedQuerySearchKey = templist.join('_;');
                 }
             }
@@ -432,11 +682,9 @@ export default {
             }
         },
         tableSortQuery() {
-
             this.orderByStr = '';
 
             if (this.tableSortFields.length > 0) {
-
                 var templist = [];
 
                 this.tableSortFields.forEach(item => {
@@ -444,10 +692,9 @@ export default {
                         var tempItem = item.name + '_,' + item.order;
                         templist.push(tempItem);
                     }
-                })
+                });
 
                 if (templist.length > 0) {
-
                     this.orderByStr = templist.join('_;');
                 }
             }
@@ -456,49 +703,57 @@ export default {
             this.showTableSortDialog = false;
         },
         exportExcel() {
-            window.location.href = this.$baseUrl + "/userOrder/exportExcel?searchKey="
-                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+            window.location.href =
+                this.$baseUrl +
+                '/userOrder/exportExcel?searchKey=' +
+                this.filter1 +
+                '&advancedQuery=' +
+                this.advancedQuerySearchKey +
+                '&orderByStr=' +
+                this.orderByStr;
         },
         searchData() {
             this.currentPage = 1;
             this.getData();
         },
         deleteRow(row) {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/userOrder/del',
-                    data: { id: row.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.getData();
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', {
+                type: 'error',
             })
+                .then(() => {
+                    return this.$http.post({
+                        url: '/userOrder/del',
+                        data: { id: row.id },
+                    });
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                });
         },
         DateTimeFormatter(row, column, cellValue) {
             if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh });
             }
-
         },
         DateFormatter(row, column, cellValue) {
             if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh });
             }
-
         },
         showImg(img) {
             this.imgSrc = img;
             this.imageDialogVisible = true;
         },
-
-    }
-}
+    },
+};
 </script>
 <style lang="less" scoped>
 </style>