付第三方

src/main/java/com/caimei/modules/order/entity/ChangePayShopOther.java

@@ -11,6 +11,11 @@ import java.util.Date;
  * @date : 2021/5/26
  */
 public class ChangePayShopOther implements Serializable {
+
+    /**
+     * 1线下付第三方  2 线上付三方
+     */
+    private Integer payType;
     private Integer id;
     /**
      * 子订单Id
@@ -102,6 +107,14 @@ public class ChangePayShopOther implements Serializable {
         this.id = id;
     }
 
+    public Integer getPayType() {
+        return payType;
+    }
+
+    public void setPayType(Integer payType) {
+        this.payType = payType;
+    }
+
     public Integer getShopOrderId() {
         return shopOrderId;
     }

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

@@ -288,12 +288,12 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 List<Product> product = cmPayShopDao.priceNum(so.getOrderNo());
                 // 计算订单总佣金
                 Double income = newShopOrderDao.findIncome(so.getOrderID());
-                if(returnNum != null) {
-                    if(product != null) {
+                if (returnNum != null) {
+                    if (product != null) {
                         for (Product pro : product) {
                             Integer number = newOrderProductDao.CountReturnedPurchaseProduct(pro.getShopOrderID(), pro.getOrderProductID());
                             Double commission = 0.0;
-                            if(number != null && number != 0) {
+                            if (number != null && number != 0) {
                                 if (pro.getTaxRate() != null && pro.getTaxRate() != 0) {
                                     commission = (pro.getPrice() + pro.getPrice() * (pro.getTaxRate() / 100)) - (Double.parseDouble(pro.getCostPrice()) + Double.parseDouble(pro.getCostPrice()) * (pro.getTaxRate() / 100));
                                 } else {
@@ -426,11 +426,11 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 List<Product> product = cmPayShopDao.priceNum(so.getOrderNo());
                 // 计算佣金
                 Double income = newShopOrderDao.findIncome(so.getOrderID());
-                if(count != 0) {
-                    for(Product pro: product) {
+                if (count != 0) {
+                    for (Product pro : product) {
                         Double commission = pro.getPrice() - Double.parseDouble(pro.getCostPrice());
                         Integer number = newOrderProductDao.CountReturnedPurchaseProduct(pro.getShopOrderID(), pro.getOrderProductID());
-                        if(number != null && number != 0) {
+                        if (number != null && number != 0) {
                             if (pro.getTaxRate() != null && pro.getTaxRate() != 0) {
                                 commission = (pro.getPrice() + pro.getPrice() * (pro.getTaxRate() / 100)) - (Double.parseDouble(pro.getCostPrice()) + Double.parseDouble(pro.getCostPrice()) * (pro.getTaxRate() / 100));
                             } else {
@@ -946,6 +946,10 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
 
     @Transactional(readOnly = false)
     public void saveShopOtherFee(ChangePayShopOther payShopOther) {
+        /**
+         * payType = 2为线上付第三方，创建付款单，无付款银行，开户行，帐号
+         * 生成的记录，审核人/审核时间/审核状态，分别置为:系统自动/同申请时间/审核通过
+         */
         String[] remarkImages = payShopOther.getRemarkImages();
         if (remarkImages != null && remarkImages.length > 0) {
             StringBuilder remarkImage = new StringBuilder();
@@ -966,18 +970,21 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
         NewShopOrder shopOrder = newShopOrderDao.findByShopOrderID(payShopOther.getShopOrderId());
         CmPayShop payShop = new CmPayShop();
         payShop.setShopID(shopOrder.getShopID().toString());
-        payShop.setName(payShopOther.getName());
-        payShop.setBankAccountName(payShopOther.getBankAccountName());
-        payShop.setBankAccount(payShopOther.getBankAccount());
-        payShop.setBankName(payShopOther.getBankName());
-        payShop.setType(payShopOther.getType().toString());
+        if (2 != payShopOther.getPayType()) {
+            payShop.setName(payShopOther.getName());
+            payShop.setBankAccountName(payShopOther.getBankAccountName());
+            payShop.setBankAccount(payShopOther.getBankAccount());
+            payShop.setBankName(payShopOther.getBankName());
+            payShop.setType(payShopOther.getType().toString());
+        }
         payShop.setTotalAmount(payShopOther.getShopOtherFee().doubleValue());
         payShop.setBalancePayFee(0d);
         payShop.setTransferPayFee(payShopOther.getShopOtherFee().doubleValue());
         payShop.setWipePayment(0d);
         payShop.setApplicant(currentUser.getId());
         payShop.setApplyTime(time);
-        payShop.setStatus("0");
+        String status = 2 == payShopOther.getPayType()?"1":"0";
+        payShop.setStatus(status);
         payShop.setDelFlag("0");
         if (payShopOther.getPayShopId() == null) {
             cmPayShopDao.insert(payShop);
@@ -994,7 +1001,7 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
         payShopRecord.setWipePayment(0d);
         payShopRecord.setPaymentType(3);
         payShopRecord.setPayShopID(payShop.getId());
-        payShopRecord.setStatus("0");
+        payShopRecord.setStatus(status);
         payShopRecord.setDelFlag("0");
         if (payShopOther.getPayShopId() == null) {
             cmPayShopRecordDao.insert(payShopRecord);

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

@@ -42,18 +42,14 @@ public class SplitAccountService extends BaseService {
     private NewShopOrderDao newShopOrderDao;
 
     @Transactional(readOnly = false, rollbackFor = Exception.class)
-    public void SplitAccount(String shopOrderIds) {
+    public void SplitAccount(String[] shopOrderIds) {
         logger.info("【手动分账开始】>>>>>>>>>>手动分账");
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String currentTime = format.format(calendar.getTime());
         List<String> ids = new ArrayList<>();
-        if (shopOrderIds.contains(",")) {
-            ids = Arrays.stream(shopOrderIds.split(",")).collect(Collectors.toList());
-        } else {
-            ids.add(shopOrderIds);
-        }
+        ids = Arrays.stream(shopOrderIds).collect(Collectors.toList());
 
         ids.forEach(i -> {
             // 查询未分账已支付收款

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

@@ -732,13 +732,10 @@ public class CmPayShopController extends BaseController {
 
     @RequestMapping("splitEdit")
     public String splitEdit(String[] shopOrderIDs, RedirectAttributes redirectAttributes, Model model) {
-        splitAccountService.SplitAccount(shopOrderIDs[0]);
 
-//        Page<NewShopOrder> page = newShopOrderService.findSplitList(new Page<NewShopOrder>(),new NewShopOrder());
-//        model.addAttribute("page", page);
+        splitAccountService.SplitAccount(shopOrderIDs);
         addMessage(redirectAttributes, "分账成功！");
         return "redirect:" + Global.getAdminPath() + "/shopOrder/splitList";
-//        return "modules/order/cmSplitAccountList";
     }
 
     /**
@@ -1013,7 +1010,7 @@ public class CmPayShopController extends BaseController {
      * 付第三方数据回显
      */
     @RequestMapping("shopOtherFeeForm")
-    public String shopOtherFeeForm(Integer shopOrderId, Model model) {
+    public String shopOtherFeeForm(Integer shopOrderId,Integer payType, Model model) {
         ChangePayShopOther payShopOther = cmPayShopService.shopOtherFeeForm(shopOrderId);
         payShopOther.setShopOrderId(shopOrderId);
         NewShopOrder shopOrder = newShopOrderService.findByShopOrderID(shopOrderId);
@@ -1023,6 +1020,7 @@ public class CmPayShopController extends BaseController {
         brokerage = brokerage == null ? 0d : brokerage;
         model.addAttribute("brokerage", brokerage);
         model.addAttribute("payShopOther", payShopOther);
+        model.addAttribute("payType", payType);
         return "modules/order/shopOtherFeeForm";
     }
 

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

@@ -505,31 +505,13 @@
                                                                   pattern="#,##0.00"/></td>
                         <td><fmt:formatNumber value="${p.costPrice * (p.num + p.presentNum - p.returnedNum)}"
                                               type="number" pattern="#,##0.00"/></td>
-                        <div class="pay-more-func">
-                            <a id="applyShopOtherFee" href="${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=${s.shopOrderID}">付第三方申请</a>
-                        </div>
                     </tr>
+                    <div class="pay-more-func">
+                        <a id="applyShopOtherFee" href="${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=${s.shopOrderID}&payType=2">付第三方申请</a>
+                    </div>
                 </c:forEach>
             </table>
-<%--            <div class="pay-more-func">--%>
-<%--                <c:if test="${s.paying ne '1' and s.payStatus eq '1' and !s.modifyPayable}">--%>
-<%--                    <shiro:hasPermission name="order:cmPayShop:modifyPay">--%>
-<%--                        <a href="${ctx}/shopOrder/toChangePayShopAmount?shopOrderID=${s.shopOrderID}">修改成本</a>--%>
-<%--                    </shiro:hasPermission>--%>
-<%--                </c:if>--%>
-<%--                <c:if test="${(s.modifyPayable and s.paying ne '1') || s.payStatus eq '2'}">--%>
-<%--                    <a href="${ctx}/order/cmPayShop/differencePriceForm?shopOrderId=${s.shopOrderID}">供应商差价</a>--%>
-<%--                </c:if>--%>
-<%--                <c:if test="${s.paying ne '1' and s.payStatus eq '2'}">--%>
-<%--                    <c:if test="${!s.modifyPayable || s.receiptStatus eq '3'}">--%>
-<%--                        <shiro:hasPermission name="order:cmPayShop:modifyPay">--%>
-<%--                            <a href="${ctx}/shopOrder/toApplyPayWipe?shopOrderID=${s.shopOrderID}">付款抹平</a>--%>
-<%--                        </shiro:hasPermission>--%>
-<%--                    </c:if>--%>
-<%--                </c:if>--%>
-<%--                <a href="${ctx}/shopOrder/payShopRemark?shopOrderId=${s.shopOrderID}">应付备注</a>--%>
-<%--                <a href="${ctx}/shopOrder/payedAndRefundRecordList?shopOrderID=${s.shopOrderID}&operatingMode=${operatingMode}">退/付款记录</a>--%>
-<%--            </div>--%>
+
         </div>
     </c:forEach>
 </div>
@@ -619,12 +601,12 @@
 <script>
     function changeCheck(el){
         var checked = $('input[type=checkbox]:checked');
-        if (checked.length > 1) {
-            // $(".checkShop").attr('disabled','true');
-            alertx("请最多选择一个子订单进行分账");
-            $(el).prop('checked',false);
-            return false;
-        }
+        // if (checked.length > 1) {
+        //     // $(".checkShop").attr('disabled','true');
+        //     alertx("请最多选择一个子订单进行分账");
+        //     $(el).prop('checked',false);
+        //     return false;
+        // }
     }
 
     (function () {
@@ -840,26 +822,26 @@
 
         });
 
-        //付第三方
-        $('#applyShopOtherFee').on('click', function () {
-            var checked = $('.pay-wrapper input[type=checkbox]:checked');
-            if (checked.length < 1) {
-                alertx('请选择一个子订单');
-                return false;
-            }
-            if (checked.length > 1) {
-                alertx('每次只能选择一个子订单进行付第三方申请');
-                return false;
-            }
-            var isPayShopOtherFee = $(checked[0]).attr('data-isPayShopOtherFee');
-            if ("false" == isPayShopOtherFee) {
-                alertx("付第三方处于待审核状态，暂不能操作");
-                return false;
-            }
-            var shopOrderId = $(checked[0]).attr('data-shoporderid');
-
-            window.location.href = '${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=' + shopOrderId;
-        });
+        <%--//付第三方--%>
+        <%--$('#applyShopOtherFee').on('click', function () {--%>
+        <%--    var checked = $('.pay-wrapper input[type=checkbox]:checked');--%>
+        <%--    if (checked.length < 1) {--%>
+        <%--        alertx('请选择一个子订单');--%>
+        <%--        return false;--%>
+        <%--    }--%>
+        <%--    if (checked.length > 1) {--%>
+        <%--        alertx('每次只能选择一个子订单进行付第三方申请');--%>
+        <%--        return false;--%>
+        <%--    }--%>
+        <%--    var isPayShopOtherFee = $(checked[0]).attr('data-isPayShopOtherFee');--%>
+        <%--    if ("false" == isPayShopOtherFee) {--%>
+        <%--        alertx("付第三方处于待审核状态，暂不能操作");--%>
+        <%--        return false;--%>
+        <%--    }--%>
+        <%--    var shopOrderId = $(checked[0]).attr('data-shoporderid');--%>
+
+        <%--    window.location.href = '${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=' + shopOrderId;--%>
+        <%--});--%>
 
         $('#refund').on('click', function () {
             var checked = $('.pay-wrapper input[type=checkbox]:checked'), params = '?';

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

@@ -123,20 +123,25 @@
         .pay-status label:first-child {
             margin-left: 10px
         }
-        .controls{
+
+        .controls {
             font-size: 0;
         }
-        .controls .conList{
+
+        .controls .conList {
             display: inline-block;
             margin-right: 15px;
         }
-        .conList .btn:nth-of-type(1){
+
+        .conList .btn:nth-of-type(1) {
             margin-left: 25px;
         }
+
         .upload-content {
             margin-top: -70px;
             display: inline-block;
         }
+
         .upload-content .conList .btn:nth-of-type(1) {
             width: 90px;
             height: 100px;
@@ -144,19 +149,23 @@
             background: #fff;
             position: relative;
         }
-        .upload-content .conList .btn:nth-of-type(1)>div {
+
+        .upload-content .conList .btn:nth-of-type(1) > div {
             position: absolute;
             top: 50%;
             left: 50%;
             transform: translate(-50%, -50%);
             color: #666;
         }
+
         .upload-content .conList .btn:nth-of-type(1) span {
             font-size: 35px;
         }
+
         .upload-content .conList .btn:nth-of-type(1) h5 {
             color: #666;
         }
+
         .cancel-upload {
             background: transparent;
             border: none;
@@ -167,6 +176,7 @@
             cursor: pointer;
             z-index: 100;
         }
+
         .upload-content .conList ol li {
             width: 114px;
             min-height: 80px;
@@ -176,41 +186,42 @@
             top: 120px;
             margin-left: 2px;
         }
+
         .hide-pic {
             display: none !important;
         }
     </style>
     <script type="text/javascript">
-            $(document).ready(function() {
-                $("#inputForm").validate({
-                    ignore:"",
-                    submitHandler: function (form) {
-                        var shopOtherFee = $("#shopOtherFee").val();
-                        var brokerage = ${brokerage};
-                        if (brokerage < shopOtherFee) {
-                            top.$.jBox.confirm("付第三方的值不合理，导致佣金为负，确认继续吗？", '提示', function (v, h, f) {
-                                if (v == true) {
-                                    loading('正在提交，请稍等...');
-                                    form.submit();
-                                }
-                                return;
-                            }, {buttons: {'取消': false, '确定': true}});
-                        } else {
-                            loading('正在提交，请稍等...');
-                            form.submit();
-                        }
-                    },
-                    errorContainer: "#messageBox",
-                    errorPlacement: function(error, element) {
-                        $("#messageBox").text("输入有误，请先更正。");
-                        if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
-                            error.appendTo(element.parent().parent());
-                        } else {
-                            error.insertAfter(element);
-                        }
+        $(document).ready(function () {
+            $("#inputForm").validate({
+                ignore: "",
+                submitHandler: function (form) {
+                    var shopOtherFee = $("#shopOtherFee").val();
+                    var brokerage = ${brokerage};
+                    if (brokerage < shopOtherFee) {
+                        top.$.jBox.confirm("付第三方的值不合理，导致佣金为负，确认继续吗？", '提示', function (v, h, f) {
+                            if (v == true) {
+                                loading('正在提交，请稍等...');
+                                form.submit();
+                            }
+                            return;
+                        }, {buttons: {'取消': false, '确定': true}});
+                    } else {
+                        loading('正在提交，请稍等...');
+                        form.submit();
+                    }
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function (error, element) {
+                    $("#messageBox").text("输入有误，请先更正。");
+                    if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
                     }
-                });
+                }
             });
+        });
     </script>
 </head>
 <body>
@@ -218,10 +229,13 @@
     <li><a href="${ctx}/order/cmPayShop">付款列表</a></li>
     <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
     <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
-    <li class="active"><a href="${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=${payShopOther.shopOrderId}">付第三方</a></li>
+    <li class="active"><a
+            href="${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=${payShopOther.shopOrderId}&payType=${payType}">付第三方</a></li>
 </ul>
-<form:form id="inputForm" modelAttribute="payShopOther" action="${ctx}/order/cmPayShop/saveShopOtherFee" method="post" class="form-horizontal">
+<form:form id="inputForm" modelAttribute="payShopOther" action="${ctx}/order/cmPayShop/saveShopOtherFee" method="post"
+           class="form-horizontal">
     <form:hidden path="shopOrderId"/>
+    <input style="display: none" name="payType" value="${payType}"/>
     <div class="control-group">
         <label class="control-label"><font color='red'>*</font>付款单名称：</label>
         <div class="controls">
@@ -231,72 +245,96 @@
     <div class="control-group">
         <label class="control-label"><font color='red'>*</font>付第三方金额：</label>
         <div class="controls">
-            <input type="number" id="shopOtherFee" required name="shopOtherFee" min="0" value="${payShopOther.shopOtherFee}" onchange="changeShouldPay(this)"/>
+            <input type="number" id="shopOtherFee" required name="shopOtherFee" min="0"
+                   value="${payShopOther.shopOtherFee}" onchange="changeShouldPay(this)"/>
         </div>
     </div>
-    <div class="control-group">
-        <label class="control-label"><font color='red'>*</font>开户名：</label>&nbsp;&nbsp;&nbsp;&nbsp;
-        <form:input path="bankAccountName" htmlEscape="false" maxlength="100" class="input-xlarge required"/>&nbsp;&nbsp;&nbsp;&nbsp;
-        <label><font color='red'>*</font>账号：</label>
-        <form:input path="bankAccount" htmlEscape="false" maxlength="100" class="input-xlarge required"/>
-    </div>
-    <div class="control-group">
-        <label class="control-label"><font color='red'>*</font>开户行：</label>&nbsp;&nbsp;&nbsp;&nbsp;
-        <form:input path="bankName" htmlEscape="false" maxlength="100" class="input-xlarge required"/>&nbsp;&nbsp;&nbsp;&nbsp;
-        <label><font color='red'>*</font>账户类型：</label>
-        <form:select path="type" class="select-ele input-xlarge required">
-            <form:option value="0" label="公账"/>
-            <form:option value="1" label="私账"/>
-        </form:select>
-    </div>
+    <c:if test="${payType ne 2}">
+        <div class="control-group">
+            <label class="control-label"><font color='red'>*</font>开户名：</label>&nbsp;&nbsp;&nbsp;&nbsp;
+            <form:input path="bankAccountName" htmlEscape="false" maxlength="100" class="input-xlarge required"/>&nbsp;&nbsp;&nbsp;&nbsp;
+            <label><font color='red'>*</font>账号：</label>
+            <form:input path="bankAccount" htmlEscape="false" maxlength="100" class="input-xlarge required"/>
+        </div>
+        <div class="control-group">
+            <label class="control-label"><font color='red'>*</font>开户行：</label>&nbsp;&nbsp;&nbsp;&nbsp;
+            <form:input path="bankName" htmlEscape="false" maxlength="100" class="input-xlarge required"/>&nbsp;&nbsp;&nbsp;&nbsp;
+            <label><font color='red'>*</font>账户类型：</label>
+            <form:select path="type" class="select-ele input-xlarge required">
+                <form:option value="0" label="公账"/>
+                <form:option value="1" label="私账"/>
+            </form:select>
+        </div>
+    </c:if>
     <div class="control-group">
         <label class="control-label"><font color='red'>*</font>备注内容：</label>
         <div class="controls">
-            <textarea type="text" name="remark" placeholder="请详细说明修改的原因，不超过500字" style="position: relative;height: 100px; width: 450px;" maxlength="500" required ></textarea>
+            <textarea type="text" name="remark" placeholder="请详细说明修改的原因，不超过500字"
+                      style="position: relative;height: 100px; width: 450px;" maxlength="500" required></textarea>
         </div>
     </div>
     <div class="control-group">
         <label class="control-label">图片：</label>
         <div class="controls upload-content" style="margin: -91px 0px 0px 16px;" id="remarkImageBox">
             <div class="conList">
-                <form:hidden id="remarkImage1" path="remarkImages" htmlEscape="false" maxlength="255" class="input-xlarge"/>
-                <sys:ckfinder input="remarkImage1" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                <form:hidden id="remarkImage1" path="remarkImages" htmlEscape="false" maxlength="255"
+                             class="input-xlarge"/>
+                <sys:ckfinder input="remarkImage1" type="images" uploadPath="/photo" selectMultiple="false"
+                              maxWidth="100" maxHeight="100"/>
             </div>
             <div class="conList hide-pic">
-                <form:hidden id="remarkImage2" path="remarkImages" htmlEscape="false" maxlength="255" class="input-xlarge"/>
-                <sys:ckfinder input="remarkImage2" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                <form:hidden id="remarkImage2" path="remarkImages" htmlEscape="false" maxlength="255"
+                             class="input-xlarge"/>
+                <sys:ckfinder input="remarkImage2" type="images" uploadPath="/photo" selectMultiple="false"
+                              maxWidth="100" maxHeight="100"/>
             </div>
             <div class="conList hide-pic">
-                <form:hidden id="remarkImage3" path="remarkImages" htmlEscape="false" maxlength="255" class="input-xlarge"/>
-                <sys:ckfinder input="remarkImage3" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                <form:hidden id="remarkImage3" path="remarkImages" htmlEscape="false" maxlength="255"
+                             class="input-xlarge"/>
+                <sys:ckfinder input="remarkImage3" type="images" uploadPath="/photo" selectMultiple="false"
+                              maxWidth="100" maxHeight="100"/>
             </div>
             <div class="conList hide-pic">
-                <form:hidden id="remarkImage4" path="remarkImages" htmlEscape="false" maxlength="255" class="input-xlarge"/>
-                <sys:ckfinder input="remarkImage4" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                <form:hidden id="remarkImage4" path="remarkImages" htmlEscape="false" maxlength="255"
+                             class="input-xlarge"/>
+                <sys:ckfinder input="remarkImage4" type="images" uploadPath="/photo" selectMultiple="false"
+                              maxWidth="100" maxHeight="100"/>
             </div>
             <div class="conList hide-pic">
-                <form:hidden id="remarkImage5" path="remarkImages" htmlEscape="false" maxlength="255" class="input-xlarge"/>
-                <sys:ckfinder input="remarkImage5" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                <form:hidden id="remarkImage5" path="remarkImages" htmlEscape="false" maxlength="255"
+                             class="input-xlarge"/>
+                <sys:ckfinder input="remarkImage5" type="images" uploadPath="/photo" selectMultiple="false"
+                              maxWidth="100" maxHeight="100"/>
             </div>
             <div class="conList hide-pic">
-                <form:hidden id="remarkImage6" path="remarkImages" htmlEscape="false" maxlength="255" class="input-xlarge"/>
-                <sys:ckfinder input="remarkImage6" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                <form:hidden id="remarkImage6" path="remarkImages" htmlEscape="false" maxlength="255"
+                             class="input-xlarge"/>
+                <sys:ckfinder input="remarkImage6" type="images" uploadPath="/photo" selectMultiple="false"
+                              maxWidth="100" maxHeight="100"/>
             </div>
             <div class="conList hide-pic">
-                <form:hidden id="remarkImage7" path="remarkImages" htmlEscape="false" maxlength="255" class="input-xlarge"/>
-                <sys:ckfinder input="remarkImage7" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                <form:hidden id="remarkImage7" path="remarkImages" htmlEscape="false" maxlength="255"
+                             class="input-xlarge"/>
+                <sys:ckfinder input="remarkImage7" type="images" uploadPath="/photo" selectMultiple="false"
+                              maxWidth="100" maxHeight="100"/>
             </div>
             <div class="conList hide-pic">
-                <form:hidden id="remarkImage8" path="remarkImages" htmlEscape="false" maxlength="255" class="input-xlarge"/>
-                <sys:ckfinder input="remarkImage8" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                <form:hidden id="remarkImage8" path="remarkImages" htmlEscape="false" maxlength="255"
+                             class="input-xlarge"/>
+                <sys:ckfinder input="remarkImage8" type="images" uploadPath="/photo" selectMultiple="false"
+                              maxWidth="100" maxHeight="100"/>
             </div>
             <div class="conList  hide-pic">
-                <form:hidden id="remarkImage9" path="remarkImages" htmlEscape="false" maxlength="255" class="input-xlarge"/>
-                <sys:ckfinder input="remarkImage9" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                <form:hidden id="remarkImage9" path="remarkImages" htmlEscape="false" maxlength="255"
+                             class="input-xlarge"/>
+                <sys:ckfinder input="remarkImage9" type="images" uploadPath="/photo" selectMultiple="false"
+                              maxWidth="100" maxHeight="100"/>
             </div>
             <div class="conList  hide-pic">
-                <form:hidden id="remarkImage10" path="remarkImages" htmlEscape="false" maxlength="255" class="input-xlarge"/>
-                <sys:ckfinder input="remarkImage10" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                <form:hidden id="remarkImage10" path="remarkImages" htmlEscape="false" maxlength="255"
+                             class="input-xlarge"/>
+                <sys:ckfinder input="remarkImage10" type="images" uploadPath="/photo" selectMultiple="false"
+                              maxWidth="100" maxHeight="100"/>
             </div>
         </div>
     </div>
@@ -315,61 +353,61 @@
         $('.upload-content .conList').find('.cancel-upload').hide();
         var observeEle = document.getElementsByClassName('upload-content')[0];
         var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
-        var MutationObserverConfig={
+        var MutationObserverConfig = {
             childList: true,
             subtree: true,
             characterData: true
         };
-        var observer = new MutationObserver(function(mutations){
-            $.each(mutations, function(index,item) {
+        var observer = new MutationObserver(function (mutations) {
+            $.each(mutations, function (index, item) {
                 if (item.type === 'childList') {
                     // 在创建新的 element 时调用
                     var target = $(item.target),
                         thisWrapper = target.closest('.conList'),
                         nextEle = thisWrapper.next();
-                    thisWrapper.find('li').css('z-index',99);
+                    thisWrapper.find('li').css('z-index', 99);
                     thisWrapper.find('.cancel-upload').show();
-                    if(nextEle.hasClass('hide-pic')) {
+                    if (nextEle.hasClass('hide-pic')) {
                         nextEle.removeClass('hide-pic');
                     }
                 }
             })
         });
-        observer.observe(observeEle,MutationObserverConfig);
+        observer.observe(observeEle, MutationObserverConfig);
 
-        $('body').on('click','.upload-content li',function() {
+        $('body').on('click', '.upload-content li', function () {
             var index = $(this).closest('.conList').index() + 1,
-                str = 'remarkImage'+index+'FinderOpen';
-            eval(str+'()');
+                str = 'remarkImage' + index + 'FinderOpen';
+            eval(str + '()');
         });
-        $('body').on('click', '.cancel-upload',function() {
+        $('body').on('click', '.cancel-upload', function () {
             var wrapper = $(this).closest('.conList');
-            wrapper.find('li').css('z-index','-1');
+            wrapper.find('li').css('z-index', '-1');
             wrapper.find('input').val('');
             $(this).hide();
             if ($('.cancel-upload:visible').length < 9) {
                 wrapper.addClass("hide-pic");
-            }else{
+            } else {
                 wrapper.removeClass("hide-pic");
             }
             wrapper.parent().append(wrapper.clone());
             wrapper.remove();
-            $(".conList").each(function(i,ele){
-                if($(ele).find("input.input-xlarge").val()){
+            $(".conList").each(function (i, ele) {
+                if ($(ele).find("input.input-xlarge").val()) {
                     $(ele).next().removeClass("hide-pic")
                 }
             })
         });
-        $(window).on("load", function(){
-            setTimeout(function(){
-                $("#remarkImageBox").find("input.input-xlarge").each(function(i,ele){
-                    if($(ele).val()){
-                        $(ele).next().find("li").css("z-index","99");
+        $(window).on("load", function () {
+            setTimeout(function () {
+                $("#remarkImageBox").find("input.input-xlarge").each(function (i, ele) {
+                    if ($(ele).val()) {
+                        $(ele).next().find("li").css("z-index", "99");
                         $(ele).parents(".conList").find(".cancel-upload").show();
                         $(ele).parents(".conList").next().removeClass("hide-pic")
                     }
                 })
-            },500);
+            }, 500);
         });
     });