bug fixes

src/main/java/com/caimei/modules/bulkpurchase/web/CmRefundsProductController.java

@@ -301,8 +301,8 @@ public class CmRefundsProductController extends BaseController {
      */
     @RequestMapping(value = "saveRefound")
     public String saveRefound(CmReturnedPurchase cmReturnedPurchase, HttpServletRequest request, HttpServletResponse response, Model model) {
+        NewOrder newOrder = newOrderService.get(cmReturnedPurchase.getOrderID().toString());
         try {
-            NewOrder newOrder = newOrderService.get(cmReturnedPurchase.getOrderID().toString());
             String receiptStatus = "0";
             if (null != newOrder) {
                 receiptStatus = newOrder.getReceiptStatus();//收款状态：1待收款、2部分收款、3已收款
@@ -355,7 +355,7 @@ public class CmRefundsProductController extends BaseController {
                                 freightNum = bean.getApplicationReturnedNum();
                             }
                             //判断退货数量，取消数量 是否大于0
-                            if (bean != null && (bean.getApplicationReturnedNum() != null && bean.getApplicationCancelNum() != null && (bean.getApplicationReturnedNum() > 0 || bean.getApplicationCancelNum() > 0))) {
+                            if (bean.getApplicationReturnedNum() != null && bean.getApplicationCancelNum() != null && (bean.getApplicationReturnedNum() > 0 || bean.getApplicationCancelNum() > 0)) {
                                 bean.setActualReturnedNum(bean.getApplicationReturnedNum());
                                 bean.setActualCancelNum(bean.getApplicationCancelNum());
                                 NewOrderProduct orderProduct = newOrderProductService.get(bean.getOrderProductID().toString());
@@ -436,7 +436,7 @@ public class CmRefundsProductController extends BaseController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return "redirect:" + Global.getAdminPath() + "/order/cmReturnedPurchase/";
+        return "redirect:" + Global.getAdminPath() + "/order/cmReturnedPurchase/list?orderType=" + newOrder.getOrderType();
     }
 
     //计算退款用户数据
@@ -739,14 +739,15 @@ public class CmRefundsProductController extends BaseController {
      */
     @RequestMapping(value = "cancelApply")
     public String cancelApply(CmReturnedPurchase cmReturnedPurchase, RedirectAttributes redirectAttributes) {
+        NewOrder order = new NewOrder();
         try {
             cmReturnedPurchase.setDelFlag("1");
-            cmReturnedPurchaseService.cancelApply(cmReturnedPurchase);
+            order = cmReturnedPurchaseService.cancelApply(cmReturnedPurchase);
         } catch (Exception e) {
             addMessage(redirectAttributes, e.getMessage());
             e.printStackTrace();
         }
-        return "redirect:" + Global.getAdminPath() + "/order/cmReturnedPurchase/";
+        return "redirect:" + Global.getAdminPath() + "/order/cmReturnedPurchase/list?orderType=" + order.getOrderType();
     }
 
     /**
@@ -758,16 +759,18 @@ public class CmRefundsProductController extends BaseController {
      */
     @RequestMapping(value = "revokeApply")
     public String revokeApply(CmReturnedPurchase cmReturnedPurchase, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
+        NewOrder order = new NewOrder();
         try {
             cmReturnedPurchase = cmReturnedPurchaseService.get(cmReturnedPurchase.getId());
             if (!"2".equals(cmReturnedPurchase.getStatus())) {
                 throw new Exception("该退款单状态已发生改变，不可撤销");
             }
+            order = newOrderService.findByOrderID(cmReturnedPurchase.getOrderID());
             cmReturnedPurchaseService.revokeApply(cmReturnedPurchase, request);
         } catch (Exception e) {
             addMessage(redirectAttributes, e.getMessage());
             e.printStackTrace();
         }
-        return "redirect:" + Global.getAdminPath() + "/order/cmReturnedPurchase/";
+        return "redirect:" + Global.getAdminPath() + "/order/cmReturnedPurchase/list?orderType=" + order.getOrderType();
     }
 }

src/main/java/com/caimei/modules/order/service/CmReturnedPurchaseService.java

@@ -405,14 +405,14 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
 
 
     @Transactional(readOnly = false)
-    public void cancelApply(CmReturnedPurchase cmReturnedPurchase) throws Exception {
+    public NewOrder cancelApply(CmReturnedPurchase cmReturnedPurchase) throws Exception {
         CmReturnedPurchase returnedPurchase = cmReturnedPurchaseDao.get(cmReturnedPurchase);
         if ("2".equals(returnedPurchase.getStatus())) {
             throw new Exception("该退款单已被审核，不能取消");
         }
         //待审核状态
+        NewOrder newOrder = newOrderService.get(returnedPurchase.getOrderID().toString());
         if ("1".equals(returnedPurchase.getStatus())) {
-            NewOrder newOrder = newOrderService.get(returnedPurchase.getOrderID().toString());
             List<NewOrderProduct> orderProductList = newOrderProductDao.findListByOrderID(newOrder.getOrderID());
             boolean rechargeGoods = false;
             for (NewOrderProduct orderProduct : orderProductList) {
@@ -431,6 +431,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             }
         }
         cmReturnedPurchaseDao.update(cmReturnedPurchase);
+        return newOrder;
     }
 
     @Transactional(readOnly = false)

src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp

@@ -181,7 +181,12 @@
 <input type="hidden" id="product_index" value="${fn:length(order.orderProduct)}">
 <input type="hidden" id="ctx" value="${ctx}">
 <ul class="nav nav-tabs">
-    <li><a href="${ctx}/order/orderList">订单列表</a></li>
+    <c:if test="${order.orderType eq 2}">
+        <li><a href="${ctx}/hehe/new/order/orderList">订单列表</a></li>
+    </c:if>
+    <c:if test="${order.orderType ne 2}">
+        <li><a href="${ctx}/order/orderList">订单列表</a></li>
+    </c:if>
     <li class="active"><a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${order.orderID}&id=${cmReturnedPurchase.id}">申请退货</a></li>
 </ul>
 <br/>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderConfirmReturnRecord.jsp

@@ -108,7 +108,7 @@
 <input type="hidden" id="product_index" value="${fn:length(order.orderProduct)}">
 <input type="hidden" id="ctx" value="${ctx}">
 <ul class="nav nav-tabs">
-    <li><a href="${ctx}/order/cmReturnedPurchase/">退款列表</a></li>
+    <li><a href="${ctx}/order/cmReturnedPurchase/list?orderType=${order.orderType}">退款列表</a></li>
     <li class="active"><a
             href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecord.rpc?id=${cmReturnedPurchase.id}&orderID=${cmReturnedPurchase.orderID}">退款详情</a>
     </li>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReviewReturnRecord.jsp

@@ -108,7 +108,7 @@
 <input type="hidden" id="product_index" value="${fn:length(order.orderProduct)}">
 <input type="hidden" id="ctx" value="${ctx}">
 <ul class="nav nav-tabs">
-    <li><a href="${ctx}/order/cmReturnedPurchase/">退款列表</a></li>
+    <li><a href="${ctx}/order/cmReturnedPurchase/list?orderType=${order.orderType}">退款列表</a></li>
     <li class="active"><a href="${ctx}/bulkpurchase/cmRefundsProduct/toReviewRecturnRecord.rpc?id=${cmReturnedPurchase.id}&orderID=${cmReturnedPurchase.orderID}">退款审核</a></li>
 </ul>
 <br/>

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheProductForm.jsp

@@ -67,7 +67,7 @@
 			<div class="control-group">
 				<label class="control-label"><font color="red">*</font>售价：</label>
 				<div class="controls">
-					<input type="number" type="number" style="width:100px;" id="price" name="price" value="${cmHeheProduct.price}" required onblur="checkPrice(this)">
+					<input type="number" style="width:100px;" min="0" id="price" name="price" value="${cmHeheProduct.price}" required onblur="checkPrice(this)">
 				</div>
 			</div>
 			<div class="control-group">