Merge branch 'master' of lsp/kmall-pt-general into master

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

@@ -36,7 +36,7 @@ public class OrderRefundController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("orderrefund:list")
+    //@RequiresPermissions("orderrefund:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");
@@ -46,13 +46,6 @@ public class OrderRefundController {
         Query query = new Query(params);
 
         List<OrderRefundEntity> orderRefundList = orderRefundService.queryList(query);
-        for (OrderRefundEntity entity: orderRefundList
-             ) {
-            if(entity.getIsOnfflineOrder().equalsIgnoreCase(Dict.isOnfflineOrder.item_1.getItem())) {
-                SysUserEntity sysUserEntity = sysUserService.queryObject(entity.getUserId().longValue());
-                entity.setUserName("操作店员:"+sysUserEntity.getUsername());
-            }
-        }
         int total = orderRefundService.queryTotal(query);
 
         PageUtils pageUtil = new PageUtils(orderRefundList, total, query.getLimit(), query.getPage());

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

@@ -138,6 +138,12 @@
         <if test="isOnfflineOrder != null and isOnfflineOrder != ''">
             AND o.is_onffline_order = #{isOnfflineOrder}
         </if>
+        <if test="startTime != null and startTime != ''">
+            AND r.create_time >= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND r.create_time &lt;= #{endTime}
+        </if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}

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

@@ -12,6 +12,12 @@
                 <i-col span="4">
                     <i-input v-model="q.orderSn" @on-enter="query" placeholder="订单编号"/>
                 </i-col>
+                <i-col span="3">
+                    <Date-picker v-model="q.startTime" placeholder="退款开始时间"/>
+                </i-col>
+                <i-col span="3">
+                    <Date-picker v-model="q.endTime" placeholder="退款结束时间"/>
+                </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
             </div>

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

@@ -13,18 +13,18 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '订单编号', name: 'orderSn', index: 'order_sn',width: 220},
+			{label: '订单编号', name: 'orderSn', index: 'order_sn',width: 220, align: 'center'},
 			{label: '用户名称', name: 'userName', index: 'username', align: 'center' , width: 80},
 			{label: '商户退款单号', name: 'outRefundNo', index: 'out_refund_no', align: 'center' , width: 180},
             {
-                label: '申请时间', name: 'createTime', index: 'create_time',  align: 'center' ,width: 140,
+                label: '退款时间', name: 'createTime', index: 'create_time',  align: 'center' ,width: 140,
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
             },
-			{label: '微信退款单号', name: 'refundId', index: 'refund_id', width: 80, hidden: true},
+			{label: '微信退款单号', name: 'refundId', index: 'refund_id', width: 80, hidden: true, align: 'center'},
 			{
-			    label: '退款类型', name: 'refundType', index: 'refund_type', width: 180,
+			    label: '退款类型', name: 'refundType', index: 'refund_type', width: 180, align: 'center',
                 formatter: function (value) {
                     if (value == '1') {
                         return '用户全额退款';
@@ -34,12 +34,6 @@ $(function () {
                     return value;
                 }
             },
-			{
-			    label: '退款时间', name: 'refundTime', index: 'refund_time',  align: 'center' ,width: 140,
-                formatter: function (value) {
-                    return transDate(value, 'yyyy-MM-dd hh:mm:ss');
-                }
-            },
 			{label: '退款金额', name: 'refundMoney', index: 'refund_money', width: 80, align: 'right'},
 			{
 			    label: '退款状态', name: 'refundStatus', index: 'refund_status', align: 'center' , width: 120,
@@ -58,17 +52,6 @@ $(function () {
                     return value;
                 }
             },
-			{label: '退款原因', name: 'refundReason', index: 'refund_reason', width: 140},
-            {label: '退款操作人', name: 'moderSn', index: 'moderSn', width: 90},
-			{label: '退款入账账户', name: 'refundRecvAccout', index: 'refund_recv_accout', width: 80, hidden: true},
-			{label: '审核人', name: 'approver', index: 'approver', width: 80},
-			{
-			    label: '审核时间', name: 'approvalTime', index: 'approval_time',  align: 'center' ,width: 140,
-                formatter: function (value) {
-                    return transDate(value, 'yyyy-MM-dd hh:mm:ss');
-                }
-            },
-			{label: '审核备注', name: 'approvalRemark', index: 'approval_remark', width: 80},
             {
                 label: '操作', width: 130, sortable: false, align: 'center' ,
                 formatter: function (value, col, row) {
@@ -127,7 +110,9 @@ var vm = new Vue({
 			]
 		},
 		q: {
-            orderSn: ''
+            orderSn: '',
+            startTime: '',
+            endTime: ''
 		}
 	},
 	methods: {
@@ -206,7 +191,11 @@ var vm = new Vue({
 			vm.showList = 0;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'orderSn': vm.q.orderSn},
+                postData: {
+                    'orderSn': vm.q.orderSn,
+                    'startTime': vm.q.startTime,
+                    'endTime': vm.q.endTime
+                },
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');