首页新增申请退款查询

kmall-admin/src/main/java/com/kmall/admin/controller/OrderRefundController.java

@@ -40,6 +40,8 @@ public class OrderRefundController {
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");
+        params.put("sidx", "mod_time");
+        params.put("order", "desc");
         //查询列表数据
         Query query = new Query(params);
 
@@ -59,6 +61,18 @@ public class OrderRefundController {
     }
 
     /**
+     * 总计
+     */
+    @RequestMapping("/queryTotal")
+    @ResponseBody
+    public R queryTotal(@RequestParam Map<String, Object> params) {
+        ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");
+        int total = orderRefundService.queryTotal(params);
+
+        return R.ok().put("sum", total);
+    }
+
+    /**
      * 查看信息
      */
     @RequestMapping("/info/{id}")

kmall-admin/src/main/resources/mybatis/mapper/OrderRefundDao.xml

@@ -108,22 +108,22 @@
         <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
             AND s.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
-        <if test="orderId != null">
-            AND o.id = #{orderId}
-        </if>
         <if test="storeId != null and storeId != ''">
             AND o.store_id = #{storeId}
         </if>
         <if test="merchSn != null and merchSn.trim() != ''">
             AND o.merch_sn = #{merchSn}
         </if>
-        <if test="shippingStatus != null and shippingStatus.trim() != ''">
+        <if test="orderId != null">
+            AND o.id = #{orderId}
+        </if>
+        <if test="shippingStatus != null and shippingStatus != ''">
             AND o.shipping_status = #{shippingStatus}
         </if>
-        <if test="payStatus != null and payStatus.trim() != ''">
+        <if test="payStatus != null and payStatus != ''">
             AND o.pay_status = #{payStatus}
         </if>
-        <if test="orderStatus != null and orderStatus.trim() != ''">
+        <if test="orderStatus != null and orderStatus != ''">
             AND o.order_status = #{orderStatus}
         </if>
         <if test="noCancelStatus != null and noCancelStatus == 'true'">
@@ -132,9 +132,12 @@
         <if test="refundStatus != null">
             AND r.refund_status = #{refundStatus}
         </if>
-        <if test="orderType != null and orderType.trim() != ''">
+        <if test="orderType != null and orderType != ''">
             AND o.order_type = #{orderType}
         </if>
+        <if test="isOnfflineOrder != null and isOnfflineOrder != ''">
+            AND o.is_onffline_order = #{isOnfflineOrder}
+        </if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -173,13 +176,13 @@
         <if test="orderId != null">
             AND o.id = #{orderId}
         </if>
-        <if test="shippingStatus != null and shippingStatus.trim() != ''">
+        <if test="shippingStatus != null and shippingStatus != ''">
             AND o.shipping_status = #{shippingStatus}
         </if>
-        <if test="payStatus != null and payStatus.trim() != ''">
+        <if test="payStatus != null and payStatus != ''">
             AND o.pay_status = #{payStatus}
         </if>
-        <if test="orderStatus != null and orderStatus.trim() != ''">
+        <if test="orderStatus != null and orderStatus != ''">
             AND o.order_status = #{orderStatus}
         </if>
         <if test="noCancelStatus != null and noCancelStatus == 'true'">
@@ -188,9 +191,12 @@
         <if test="refundStatus != null">
             AND r.refund_status = #{refundStatus}
         </if>
-        <if test="orderType != null and orderType.trim() != ''">
+        <if test="orderType != null and orderType != ''">
             AND o.order_type = #{orderType}
         </if>
+        <if test="isOnfflineOrder != null and isOnfflineOrder != ''">
+            AND o.is_onffline_order = #{isOnfflineOrder}
+        </if>
     </select>
 
     <insert id="save" parameterType="com.kmall.admin.entity.OrderRefundEntity" useGeneratedKeys="true" keyProperty="id">

kmall-admin/src/main/webapp/WEB-INF/page/shop/order.html

@@ -391,7 +391,7 @@
                         <i-input v-model="order.consignee" readonly/>
                     </Form-item>
                     <Form-item label="收货地址" prop="address">
-                        <i-input v-model="order.address" readonly/>
+                        {{order.province}}{{order.city}}{{order.district}}{{order.address}}
                     </Form-item>
                     <Form-item label="联系电话" prop="mobile">
                         <i-input v-model="order.mobile" readonly/>

kmall-admin/src/main/webapp/WEB-INF/page/sys/main.html

@@ -63,12 +63,12 @@
             <div class="small-box bg-fuchsia">
                 <div class="inner">
                     <h3>{{thcOrderSum}}</h3>
-                    <p>退货</p>
+                    <p>退款</p>
                 </div>
                 <div class="icon">
                     <i class="fa fa-shopping-bag"></i>
                 </div>
-                <a onclick="vm.toOrderByShipStatus(4)" class="small-box-footer">详情 <i
+                <a onclick="vm.toOrderByRefundStatus(1)" class="small-box-footer">详情 <i
                         class="fa fa-arrow-circle-right"></i></a>
             </div>
         </div>
@@ -161,7 +161,7 @@
             yfOrderSum: 0,//已发货
             yfkOrderSum: 0,//待付款
             ywcOrderSum: 0,//已完成
-            thcOrderSum: 0,//退货
+            thcOrderSum: 0,//退款
             userSum: 0,//所有会员数
             goodsSum: 0,//所有商品数
             yfkOrderUserSum: 0,//已付款订单会员数
@@ -201,7 +201,7 @@
                         iview.Message.error('没有数据！');
                         return;
                     }
-                } else if (shippingStatus == 4) {//退货
+                } else if (shippingStatus == 4) {//退款
                     if (vm.thcOrderSum == 0) {
                         iview.Message.error('没有数据！');
                         return;
@@ -215,6 +215,19 @@
                     content: url
                 });
             },
+            toOrderByRefundStatus: function (refundStatus) {
+                let url = '../shop/orderrefund.html?refundStatus=' + refundStatus;
+                if (vm.thcOrderSum == 0) {
+                    iview.Message.error('没有数据！');
+                    return;
+                }
+                openWindow({
+                    top: true,
+                    type: 2,
+                    title: '订单申请维权信息',
+                    content: url
+                });
+            },
             toOrderByPayStatus: function (payStatus) {
                 if (vm.yfkOrderSum == 0) {
                     iview.Message.error('没有数据！');
@@ -294,7 +307,11 @@
             $.getJSON("../order/queryTotal?isOnfiilineOrder=0&orderStatus=402", function (r) {
                 vue.ywcOrderSum = r.sum;
             });
-            $.getJSON("../order/queryTotal?isOnfiilineOrder=0&shippingStatus=4", function (r) {
+//            $.getJSON("../orderrefund/queryTotal?isOnfflineOrder=0&refundStatus=1", function (r) {
+//                console.log(r.sum)
+//                vue.thcOrderSum = r.sum;
+//            });
+            $.get("../orderrefund/queryTotal?isOnfflineOrder=0&refundStatus=1", function (r) {
                 vue.thcOrderSum = r.sum;
             });
             $.getJSON("../order/getUserOrderInfo?type=yfkOrderUserSum", function (r) {

kmall-admin/src/main/webapp/js/shop/orderrefund.js

@@ -1,6 +1,15 @@
 $(function () {
+    let refundStatus = getQueryString("refundStatus");
+    let isOnfflineOrder = getQueryString("isOnfflineOrder");
+    let url = '../orderrefund/list?1';
+    if (refundStatus) {
+        url += '&refundStatus=' + refundStatus;
+    }
+    if (isOnfflineOrder) {
+        url += '&isOnfflineOrder=' + isOnfflineOrder;
+    }
     $("#jqGrid").jqGrid({
-        url: '../orderrefund/list',
+        url: url,
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},