Home Explore Help
Sign In
csk
/
kmall-pt
forked from project/kmall-pt
1
0
Fork 0
Files
Browse Source

Merge branch 'master' of dq/kmall-pt into master

黄亚琴 6 years ago
parent
155095ca33 d072dc2c44
commit
5d6270aa79
5 changed files with 57 additions and 14 deletions
Unified View Show Diff Stats
  1. 10 0
      kmall-admin/src/main/java/com/kmall/admin/entity/OrderRefundEntity.java
  2. 10 0
      kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderRefundServiceImpl.java
  3. 4 0
      kmall-admin/src/main/resources/mybatis/mapper/OrderRefundDao.xml
  4. 15 4
      kmall-admin/src/main/webapp/WEB-INF/page/shop/orderrefund.html
  5. 18 10
      kmall-admin/src/main/webapp/js/shop/orderrefund.js

+ 10 - 0
kmall-admin/src/main/java/com/kmall/admin/entity/OrderRefundEntity.java
View File 

@@ -63,6 +63,8 @@ public class OrderRefundEntity implements Serializable {
 
      * 退款入账账户 1）退回银行卡：{银行名称}{卡类型}{卡尾号} 2）退回支付用户零钱:支付用户零钱3）退还商户:商户基本账户 商户结算银行账户4）退回支付用户零钱通:支付用户零钱通
 
      * 退款入账账户 1）退回银行卡：{银行名称}{卡类型}{卡尾号} 2）退回支付用户零钱:支付用户零钱3）退还商户:商户基本账户 商户结算银行账户4）退回支付用户零钱通:支付用户零钱通
 
      */
 
      */
 
     private String refundRecvAccout;
 
     private String refundRecvAccout;
 
+
 
+    private String wechatRefundStatusDes;
 
     /**
 
     /**
 
      * 审核人
 
      * 审核人
 
      */
 
      */
 
@@ -405,4 +407,12 @@ public class OrderRefundEntity implements Serializable {
 
     public void setUserName(String userName) {
 
     public void setUserName(String userName) {
 
         this.userName = userName;
 
         this.userName = userName;
 
     }
 
     }
 
+
 
+    public String getWechatRefundStatusDes() {
 
+        return wechatRefundStatusDes;
 
+    }
 
+
 
+    public void setWechatRefundStatusDes(String wechatRefundStatusDes) {
 
+        this.wechatRefundStatusDes = wechatRefundStatusDes;
 
+    }
 
 }
 
 }

+ 10 - 0
kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderRefundServiceImpl.java
View File 

@@ -1,9 +1,13 @@
 
 package com.kmall.admin.service.impl;
 
 package com.kmall.admin.service.impl;
 
 
 
 import com.kmall.admin.service.OrderRefundService;
 
 import com.kmall.admin.service.OrderRefundService;
 
+import com.kmall.common.entity.SysUserEntity;
 
+import com.kmall.common.utils.ShiroUtils;
 
+import com.kmall.common.utils.StringUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.stereotype.Service;
 
 import org.springframework.stereotype.Service;
 
 
 
+import java.util.Date;
 
 import java.util.List;
 
 import java.util.List;
 
 import java.util.Map;
 
 import java.util.Map;
 
 
 
@@ -44,6 +48,12 @@ public class OrderRefundServiceImpl implements OrderRefundService {
 
 
 
     @Override
 
     @Override
 
     public int update(OrderRefundEntity orderRefund) {
 
     public int update(OrderRefundEntity orderRefund) {
 
+        if (StringUtils.isNotEmpty(orderRefund.getApprovalRemark())) {
 
+            orderRefund.setApprovalTime(new Date());
 
+            SysUserEntity user = ShiroUtils.getUserEntity();
 
+            orderRefund.setApprover(user.getUserId().toString());
 
+            orderRefund.setRefundStatus(3);
 
+        }
 
         return orderRefundDao.update(orderRefund);
 
         return orderRefundDao.update(orderRefund);
 
     }
 
     }

+ 4 - 0
kmall-admin/src/main/resources/mybatis/mapper/OrderRefundDao.xml
View File 

@@ -13,6 +13,7 @@
 
         <result property="refundMoney" column="refund_money"/>
 
         <result property="refundMoney" column="refund_money"/>
 
         <result property="refundReason" column="refund_reason"/>
 
         <result property="refundReason" column="refund_reason"/>
 
         <result property="refundStatus" column="refund_status"/>
 
         <result property="refundStatus" column="refund_status"/>
 
+        <result property="wechatRefundStatusDes" column="wechat_refund_status_des"/>
 
         <result property="approver" column="approver"/>
 
         <result property="approver" column="approver"/>
 
         <result property="approvalTime" column="approval_time"/>
 
         <result property="approvalTime" column="approval_time"/>
 
         <result property="approvalRemark" column="approval_remark"/>
 
         <result property="approvalRemark" column="approval_remark"/>
 
@@ -130,6 +131,7 @@
 
 			`creator`,
 
 			`creator`,
 
 			`refund_money`,
 
 			`refund_money`,
 
 			`refund_status`,
 
 			`refund_status`,
 
+			`wechat_refund_status_des`,
 
 			`approver`,
 
 			`approver`,
 
 			`approval_time`,
 
 			`approval_time`,
 
 			`approval_remark`)
 
 			`approval_remark`)
 
@@ -141,6 +143,7 @@
 
 			#{creator},
 
 			#{creator},
 
 			#{refundMoney},
 
 			#{refundMoney},
 
 			#{refundStatus},
 
 			#{refundStatus},
 
+			#{wechatRefundStatusDes},
 
 			#{approver},
 
 			#{approver},
 
 			#{approvalTime},
 
 			#{approvalTime},
 
 			#{approvalRemark})
 
 			#{approvalRemark})
 
@@ -156,6 +159,7 @@
 
             <if test="creator != null">`creator` = #{creator},</if>
 
             <if test="creator != null">`creator` = #{creator},</if>
 
             <if test="refundMoney != null">`refund_money` = #{refundMoney},</if>
 
             <if test="refundMoney != null">`refund_money` = #{refundMoney},</if>
 
             <if test="refundStatus != null">`refund_status` = #{refundStatus},</if>
 
             <if test="refundStatus != null">`refund_status` = #{refundStatus},</if>
 
+            <if test="wechatRefundStatusDes != null">`wechat_refund_status_des` = #{wechatRefundStatusDes},</if>
 
             <if test="approver != null">`approver` = #{approver},</if>
 
             <if test="approver != null">`approver` = #{approver},</if>
 
             <if test="approvalTime != null">`approval_time` = #{approvalTime},</if>
 
             <if test="approvalTime != null">`approval_time` = #{approvalTime},</if>
 
             <if test="approvalRemark != null">`approval_remark` = #{approvalRemark},</if>
 
             <if test="approvalRemark != null">`approval_remark` = #{approvalRemark},</if>

+ 15 - 4
kmall-admin/src/main/webapp/WEB-INF/page/shop/orderrefund.html
View File 

@@ -6,7 +6,7 @@
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <div id="rrapp" v-cloak>
 
 <div id="rrapp" v-cloak>
 
-	<div v-show="showList">
 
+	<div v-show="showList == 0">
 
         <Row :gutter="16">
 
         <Row :gutter="16">
 
             <div class="search-group">
 
             <div class="search-group">
 
                 <i-col span="4">
 
                 <i-col span="4">
 
@@ -15,7 +15,7 @@
 
                 <i-button @click="query">查询</i-button>
 
                 <i-button @click="query">查询</i-button>
 
                 <i-button @click="reloadSearch">重置</i-button>
 
                 <i-button @click="reloadSearch">重置</i-button>
 
             </div>
 
             </div>
 
-            <div class="buttons-group">
 
+            <!--<div class="buttons-group">
 
                 #if($shiro.hasPermission("orderrefund:save"))
 
                 #if($shiro.hasPermission("orderrefund:save"))
 
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
 
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
 
                 #end
 
                 #end
 
@@ -25,13 +25,13 @@
 
                 #if($shiro.hasPermission("orderrefund:delete"))
 
                 #if($shiro.hasPermission("orderrefund:delete"))
 
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
 
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
 
                 #end
 
                 #end
 
-            </div>
 
+            </div>-->
 
         </Row>
 
         </Row>
 
 	    <table id="jqGrid"></table>
 
 	    <table id="jqGrid"></table>
 
 	    <div id="jqGridPager"></div>
 
 	    <div id="jqGridPager"></div>
 
     </div>
 
     </div>
 
 
 
-    <Card v-show="!showList">
 
+    <Card v-show="showList == 1">
 
         <p slot="title">{{title}}</p>
 
         <p slot="title">{{title}}</p>
 
 		<i-form ref="formValidate" :model="orderRefund" :rules="ruleValidate" :label-width="80">
 
 		<i-form ref="formValidate" :model="orderRefund" :rules="ruleValidate" :label-width="80">
 
             <Form-item label="订单Id" prop="orderId">
 
             <Form-item label="订单Id" prop="orderId">
 
@@ -85,6 +85,17 @@
 
             </Form-item>
 
             </Form-item>
 
         </i-form>
 
         </i-form>
 
 	</Card>
 
 	</Card>
 
+
 
+    <Card v-show="showList == 2">
 
+        <p slot="title">{{title}}</p>
 
+        <i-form ref="formValidate" :model="orderRefund" :rules="ruleValidate" :label-width="80">
 
+            <Form-item label="审核备注" prop="approvalRemark">
 
+                <i-input type="textarea" v-model="orderRefund.approvalRemark" placeholder="审核备注"/>
 
+            </Form-item>
 
+            <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
 
+            <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
 
+        </i-form>
 
+    </Card>
 
 </div>
 
 </div>
 
 
 
 <script src="${rc.contextPath}/js/shop/orderrefund.js?_${date.systemTime}"></script>
 
 <script src="${rc.contextPath}/js/shop/orderrefund.js?_${date.systemTime}"></script>

+ 18 - 10
kmall-admin/src/main/webapp/js/shop/orderrefund.js
View File 

@@ -62,7 +62,7 @@ $(function () {
 
                     if (hasPermission('order:refund')) {
 
                     if (hasPermission('order:refund')) {
 
                         if (row.refundStatus == 1) {
 
                         if (row.refundStatus == 1) {
 
                             htmlStr += '<button class="btn btn-outline btn-primary" onclick="vm.refundUpdate(' + row.orderId + ')"><i class="fa fa-check-circle"></i>&nbsp;退款</button>&nbsp;' +
 
                             htmlStr += '<button class="btn btn-outline btn-primary" onclick="vm.refundUpdate(' + row.orderId + ')"><i class="fa fa-check-circle"></i>&nbsp;退款</button>&nbsp;' +
 
-                                '<button class="btn btn-outline btn-danger" onclick="vm.printDetail(' + row.id + ')"><i class="fa fa-times-circle-o"></i>审核</button>&nbsp;';
 
+                                '<button class="btn btn-outline btn-danger" onclick="vm.approval(' + row.id + ')"><i class="fa fa-times-circle-o"></i>审核</button>&nbsp;';
 
                         }
 
                         }
 
                     }
 
                     }
 
                     return htmlStr;
 
                     return htmlStr;
 
@@ -97,7 +97,7 @@ $(function () {
 
 let vm = new Vue({
 
 let vm = new Vue({
 
 	el: '#rrapp',
 
 	el: '#rrapp',
 
 	data: {
 
 	data: {
 
-        showList: true,
 
+        showList: 0,
 
         title: null,
 
         title: null,
 
 		orderRefund: {},
 
 		orderRefund: {},
 
 		ruleValidate: {
 
 		ruleValidate: {
 
@@ -106,15 +106,16 @@ let vm = new Vue({
 
 			]
 
 			]
 
 		},
 
 		},
 
 		q: {
 
 		q: {
 
-		    name: ''
 
-		}
 
+            userName: ''
 
+		},
 
+
 
 	},
 
 	},
 
 	methods: {
 
 	methods: {
 
 		query: function () {
 
 		query: function () {
 
 			vm.reload();
 
 			vm.reload();
 
 		},
 
 		},
 
 		add: function () {
 
 		add: function () {
 
-			vm.showList = false;
 
+			vm.showList = 1;
 
 			vm.title = "新增";
 
 			vm.title = "新增";
 
 			vm.orderRefund = {};
 
 			vm.orderRefund = {};
 
 		},
 
 		},
 
@@ -123,7 +124,7 @@ let vm = new Vue({
 
 			if (id == null) {
 
 			if (id == null) {
 
 				return;
 
 				return;
 
 			}
 
 			}
 
-			vm.showList = false;
 
+			vm.showList = 1;
 
             vm.title = "修改";
 
             vm.title = "修改";
 
 
 
             vm.getInfo(id)
 
             vm.getInfo(id)
 
@@ -182,10 +183,10 @@ let vm = new Vue({
 
             vm.reload();
 
             vm.reload();
 
 		},
 
 		},
 
 		reload: function (event) {
 
 		reload: function (event) {
 
-			vm.showList = true;
 
+			vm.showList = 0;
 
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 
 			$("#jqGrid").jqGrid('setGridParam', {
 
 			$("#jqGrid").jqGrid('setGridParam', {
 
-                postData: {'name': vm.q.name},
 
+                postData: {'userName': vm.q.userName},
 
                 page: page
 
                 page: page
 
             }).trigger("reloadGrid");
 
             }).trigger("reloadGrid");
 
             vm.handleReset('formValidate');
 
             vm.handleReset('formValidate');
 
@@ -217,8 +218,15 @@ let vm = new Vue({
 
                 }
 
                 }
 
             });
 
             });
 
         },
 
         },
 
-        lookDetail: function (rowId) { //第三步：定义编辑操作
 
-            vm.showList = false;
 
+        approval: function(rowId) {
 
+            vm.showList = 2;
 
+            vm.title = "维权订单审核";
 
+            $.get("../orderrefund/info/" + rowId, function (r) {
 
+                vm.orderRefund = r.orderRefund;
 
+            });
 
+        },
 
+        lookDetail: function (rowId) {
 
+            vm.showList = 1;
 
             vm.title = "维权订单详情";
 
             vm.title = "维权订单详情";
 
             $.get("../orderrefund/info/" + rowId, function (r) {
 
             $.get("../orderrefund/info/" + rowId, function (r) {
 
                 vm.orderRefund = r.orderRefund;
 
                 vm.orderRefund = r.orderRefund;