修改上朵bug

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/CartServiceImpl.java

@@ -1,6 +1,7 @@
 package com.iamberry.wechat.service.cart;
 
 import java.text.DecimalFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -306,6 +307,7 @@ public class CartServiceImpl implements CartService {
 			case 2:	//已支付待发货
 				if (operation == 2) {	//申请退款
 					order.setSalesStatus(3);	//退款申请中
+					order.setSalesReturnDate(new Date());
 					//修改订单状态
 					int num = cartDao.updateOrderByOrder(order);
 					if (num > 0) {
@@ -347,6 +349,7 @@ public class CartServiceImpl implements CartService {
 			case 5:	//已发货
 				if (operation == 4) {	//申请退货
 					order.setSalesStatus(6);	//申请退货中
+					order.setSalesReturnDate(new Date());
 					//修改订单状态
 					int num = cartDao.updateOrderByOrder(order);
 					if (num > 0) {
@@ -371,6 +374,7 @@ public class CartServiceImpl implements CartService {
 					}
 				} else if (operation == 7) {	//申请换货
 					order.setSalesStatus(11);	//申请换货中
+					order.setSalesReturnDate(new Date());
 					//修改订单状态
 					int num = cartDao.updateOrderByOrder(order);
 					if (num > 0) {

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/order/order.jsp

@@ -178,12 +178,12 @@
 			  	<td colspan="3">${order.salesAdminRemark }</td>
 			  </tr>
 			  <tr class="text-r">
-			  	<td  class="f-14" style="font-weight: bold;">退款时间：</td>
-			  	<td ><fmt:formatDate value="${order.salesReturnDate }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-			  	<td  class="f-14" style="font-weight: bold;">退款备注：</td>
-			  	<td >${order.salesReturnDes }</td>
-			  	<td  class="f-14" style="font-weight: bold;">退货时间：</td>
+			  	<td  class="f-14" style="font-weight: bold;">售后发起时间：</td>
 			  	<td ><fmt:formatDate value="${order.salesReturnDate }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+			  	<td  class="f-14" style="font-weight: bold;">申请售后原因：</td>
+			  	<td colspan="3">${order.salesReturnDes }</td>
+			  	<%--<td  class="f-14" style="font-weight: bold;">退货时间：</td>--%>
+			  	<%--<td ><fmt:formatDate value="${order.salesReturnDate }" pattern="yyyy-MM-dd HH:mm:ss"/></td>--%>
 			  </tr>
 			  <tr class="text-r">
 			  	<td  class="f-14" style="font-weight: bold;">收货地址：</td>