小版本，优化后台供应商审核不通过原因

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -716,6 +716,8 @@ public class NewOrderController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/order/detail/?id=" + orderID;
     }
 
+
+
     /**
      * 确认收货
      *
@@ -732,6 +734,8 @@ public class NewOrderController extends BaseController {
     }
 
 
+
+
     /**
      * 去子订单orderProduct页面
      *

src/main/webapp/WEB-INF/views/modules/order/newOrderList.jsp

@@ -1053,6 +1053,7 @@
                                 <a href="${ctx}/order/cancelOrder?orderID=${order.orderID}"
                                    onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>
                             </c:if>
+
                             <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
 				            order.status eq 23 || order.status eq 0}">
                                 <c:if test="${empty order.rechargeGoods && (order.ableUserMoney > 0 || order.status eq 0)}">
@@ -1075,7 +1076,8 @@
                                onclick="modelShow('${order.orderID}')">编辑经理折扣</a>
                         </c:if>
                         <c:if test="${order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1}">
-                            <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}" onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为返佣订单</a>
+                            <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}"
+                               onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为返佣订单</a>
                         </c:if>
                     </shiro:hasPermission>
 
@@ -1104,9 +1106,19 @@
                                 </c:if>
                             </c:if>
                         </c:if>
+
+
                     </shiro:hasPermission>
 
+
                     <shiro:hasPermission name="order:order:edit">
+
+                        <c:if test="${(order.rebateOrder == 1 )}">
+                            <a href="javascript:void(0);"
+                               onclick="money('${order.orderID}')">置为已收款已付款</a>
+                        </c:if>
+
+
                         <c:if test="${order.organizeID == 0}">
                             <c:if test="${order.status == 11}">
                                 <c:if test="${order.splitFlag == 1}">

src/main/webapp/WEB-INF/views/modules/user/newCmShopForm.jsp

@@ -299,12 +299,11 @@ function auditShop(shopId,userId) {
                         + "       <div class='bd-row'>"
                         + "           <span><font color='red'>*</font>原因：</span>"
                         + "           <div class='auditCheckBox'>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='营业执照图片模糊'><span>营业执照图片模糊</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='营业执照编号错误'><span>营业执照编号错误</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='公司名称敏感'><span>公司名称敏感</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='生产许可证错误'><span>生产许可证错误</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='卫生许可证错误'><span>卫生许可证错误</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='税务许可证错误'><span>税务许可证错误</span></label>"
+                        + "               <label><input name='auditCheckBox' type='checkbox' value='入驻资质不达标'><span>入驻资质不达标</span></label>"
+                        + "               <label><input name='auditCheckBox' type='checkbox' value='品牌评估不通过'><span>品牌评估不通过</span></label>"
+                        + "               <label><input name='auditCheckBox' type='checkbox' value='相关证照不清晰'><span>相关证照不清晰</span></label>"
+                        + "               <label><input name='auditCheckBox' type='checkbox' value='企业经营异常'><span>企业经营异常</span></label>"
+                        + "               <label><input name='auditCheckBox' type='checkbox' value='其他'><span>其他</span></label>"
                         + "           </div>"
                         + "       </div>"
                         + "       <div class='bd-row'>"
@@ -664,7 +663,7 @@ function loadTown(curTown) {
 							<font color="red">已下线</font>
 						</c:if>
 						<c:if test="${newCmShop.status eq 92}">
-							<font color="red">审核未通过</font>
+							<font color="red" style="border-bottom: red">审核未通过</font>
 						</c:if>
 						</td>
 

src/main/webapp/WEB-INF/views/modules/user/newCmShopList.jsp

@@ -270,7 +270,7 @@
 								<font color="red">已下线</font>
 							</c:if>
 							<c:if test="${newCmShop.status eq 92}">
-								<font color="red" <c:if test="${not empty newCmShop.auditNote}">onclick="alertx('审核未通过原因：'+'${newCmShop.auditNote}')"</c:if> style="cursor:pointer" >审核未通过</font>
+								<font color="red" <c:if test="${not empty newCmShop.auditNote}">onclick="alertx('审核未通过原因：'+'${newCmShop.auditNote}')"</c:if> style="cursor:pointer;text-decoration: underline" >审核未通过</font>
 							</c:if>
 
 						<c:if test="${newCmShop.status eq 90}">
@@ -766,12 +766,11 @@ function auditShop(shopId,userId,townID,address,name,linkMan,contractMobile) {
                         + "       <div class='bd-row'>"
                         + "           <span><font color='red'>*</font>原因：</span>"
                         + "           <div class='auditCheckBox'>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='营业执照图片模糊'><span>营业执照图片模糊</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='营业执照编号错误'><span>营业执照编号错误</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='公司名称敏感'><span>公司名称敏感</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='生产许可证错误'><span>生产许可证错误</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='卫生许可证错误'><span>卫生许可证错误</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='税务许可证错误'><span>税务许可证错误</span></label>"
+                        + "               <label><input name='auditCheckBox' type='checkbox' value='入驻资质不达标'><span>入驻资质不达标</span></label>"
+                        + "               <label><input name='auditCheckBox' type='checkbox' value='品牌评估不通过'><span>品牌评估不通过</span></label>"
+                        + "               <label><input name='auditCheckBox' type='checkbox' value='相关证照不清晰'><span>相关证照不清晰</span></label>"
+                        + "               <label><input name='auditCheckBox' type='checkbox' value='企业经营异常'><span>企业经营异常</span></label>"
+                        + "               <label><input name='auditCheckBox' type='checkbox' value='其他'><span>其他</span></label>"
                         + "           </div>"
                         + "       </div>"
                         + "       <div class='bd-row'>"