bugfix

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

@@ -797,7 +797,8 @@ public class CmRefundsProductController extends BaseController {
 //        List<CmReceiptOrderRelation> listRelation = cmReceiptOrderRelationService.findByOrderID(newOrder.getOrderID().toString());
         List<CmReceiptOrderRelation> listRelation = cmReceiptOrderRelationService.findByShopOrderIds(Arrays.asList(cmReturnedPurchase.getShopOrderID()));
         List<CmReturnedPurchase> dataList = cmReturnedPurchaseService.getReturnedPurchaseList(cmReturnedPurchase);
-        Double refundFee = 0D;  //退款总额
+        //退款总额
+        Double refundFee = 0D;
         for (CmReturnedPurchase bean : dataList) {
             for (ShopOrderReturned shopOrderReturned : bean.getShopOrderReturnedList()) {
                 if (shopOrderReturned.getShopOrderID().equals(cmReturnedPurchase.getShopOrderID())) {

src/main/java/com/caimei/modules/order/dao/NewShopOrderDao.java

@@ -14,6 +14,7 @@ import java.util.List;
 
 /**
  * 子订单DAO接口
+ *
  * @author lwt
  * @version 2018-07-30
  */
@@ -48,7 +49,7 @@ public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
 
     void updateNote(NewShopOrder shopOrder);
 
-    int findShopOrderNum(@Param("orderID")Integer orderID);
+    int findShopOrderNum(@Param("orderID") Integer orderID);
 
     int updateByShopOrderID(NewShopOrder dbShopOrder);
 
@@ -72,27 +73,27 @@ public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
 
     List<NewShopOrder> findByShopOrderIDs(@Param("shopOrderIDs") List<String> shopOrderIDs);
 
-    void updatePaying(@Param("shopOrderID") String shopOrderID, @Param("paying")  String paying);
+    void updatePaying(@Param("shopOrderID") String shopOrderID, @Param("paying") String paying);
 
     List<NewShopOrder> findPayOrderListByIDs(@Param("ids") String[] shopOrderIDs);
 
     void outPaying(@Param("payShopID") String payShopID);
 
-    List<String> findPayStatusByOrderID(@Param("orderID")  Integer orderID);
+    List<String> findPayStatusByOrderID(@Param("orderID") Integer orderID);
 
-    List<NewShopOrder> findByRefundID(@Param("refundShopID")  String refundShopID);
+    List<NewShopOrder> findByRefundID(@Param("refundShopID") String refundShopID);
 
-    List<String> getPayingStatus(@Param("payShopID")  Integer payShopID);
+    List<String> getPayingStatus(@Param("payShopID") Integer payShopID);
 
     void inPaying(@Param("payShopID") String payShopID);
 
     NewShopOrder findSiblingPostFeeOrder(@Param("orderID") Integer orderID);
 
-    void updatePayStatus(@Param("shopOrderID") Integer shopOrderID,@Param("payStatus") String payStatus);
+    void updatePayStatus(@Param("shopOrderID") Integer shopOrderID, @Param("payStatus") String payStatus);
 
-    void updateByShopOtherFee(@Param("profit")Double profit,@Param("shopOtherFee") BigDecimal shopOtherFee, @Param("shopOrderId") Integer shopOrderId);
+    void updateByShopOtherFee(@Param("profit") Double profit, @Param("shopOtherFee") BigDecimal shopOtherFee, @Param("shopOrderId") Integer shopOrderId);
 
-    void updateByDifferencePrice(@Param("type") Integer type,@Param("differencePrice") BigDecimal differencePrice, @Param("shopOrderId") Integer shopOrderId);
+    void updateByDifferencePrice(@Param("type") Integer type, @Param("differencePrice") BigDecimal differencePrice, @Param("shopOrderId") Integer shopOrderId);
 
     List<String> findShopOrderNos(Integer orderID);
 
@@ -108,6 +109,7 @@ public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
 
     //查询子订单是 线上 还是 线上
     List<Integer> payWay(Integer shopOrderID);
+
     /**
      * 查询子订单
      *
@@ -147,6 +149,7 @@ public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
      * @return 子订单集合
      */
     public List<NewShopOrder> getCmShopOrderList(NewShopOrder cmShopOrder);
+
     /**
      * 查询子订单记录总数
      *
@@ -193,7 +196,7 @@ public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
      * @param shopOrderIDs 需要删除的数据主键集合
      * @return 结果
      */
-    public int updateDelCmShopOrderByShopOrderIDs(@Param("shopOrderIDs") String[] shopOrderIDs,@Param("delFlag") Integer delFlag);
+    public int updateDelCmShopOrderByShopOrderIDs(@Param("shopOrderIDs") String[] shopOrderIDs, @Param("delFlag") Integer delFlag);
 
     List<NewShopOrder> getShopOrderlist(NewShopOrder newShopOrder);
 
@@ -201,5 +204,5 @@ public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
 
     OtherFeeDto findCmProfit(Integer shopOrderId);
 
-    List<NewShopOrder> findByShopOrderIDsNot(List<String> ids);
+    List<NewShopOrder> findByShopOrderIDsNot(@Param("ids") List<String> ids);
 }

src/main/resources/mappings/modules/order/CmReceiptOrderRelationMapper.xml

@@ -241,8 +241,7 @@
         <foreach collection="shopOrderIds" separator="," item="shopOrderID" open="(" close=")">
             #{shopOrderID}
         </foreach>
-        AND b.receiptType = '1'
-        AND b.receiptStatus = '3'
+        AND ((b.receiptType = 1 AND b.receiptStatus = '3') OR (b.receiptType IN (3,10,11) AND b.receiptStatus = '2'))
         AND a.delFlag = '0'
         AND b.delFlag = '0'
         ORDER BY a.associateAmount DESC

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -1580,7 +1580,7 @@
         c.name AS clubName,
         a.onlinePayWays,
         ifnull(a.cmAccountType,0) as cmAccountType,
-        ifnull(a.a.cmShopOtherFee,0) as cmShopOtherFee
+        ifnull(a.cmShopOtherFee,0) as cmShopOtherFee
         FROM cm_shop_order a
         LEFT JOIN cm_pay_shop_record cpsr ON a.shopOrderID = cpsr.shopOrderID
         LEFT JOIN bp_order_userinfo bou ON bou.orderId = a.orderID
@@ -2777,9 +2777,9 @@
             left join cm_order co on co.orderID = a.orderID
             left join shop s on s.shopID = a.shopID
             left join club c on c.userID = a.userID
-            <if test="shopOrderIDs != null and shopOrderIDs.size() > 0">
+            <if test="ids != null and ids.size() > 0">
                 where a.shopOrderID in
-                <foreach collection="shopOrderIDs" separator="," item="shopOrderID" open="(" close=")">
+                <foreach collection="ids" separator="," item="shopOrderID" open="(" close=")">
                     #{shopOrderID}
                 </foreach>
             </if>

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

@@ -4,7 +4,7 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-    <title>收退款记录</title>
+    <title>收付款记录</title>
     <meta name="decorator" content="default"/>
     <style>
         .form-horizontal .controls {
@@ -51,21 +51,33 @@
             line-height: 30px;
             padding-left: 8px;
         }
-        .zeroCost .message{
-            display:none;
-            position:absolute;
-            background:#FFF;
-            white-space:nowrap;
-            border:1px solid black;
+
+        .zeroCost .message {
+            display: none;
+            position: absolute;
+            background: #FFF;
+            white-space: nowrap;
+            border: 1px solid black;
 
         }
-        .zeroCost:hover .message{
+
+        .zeroCost:hover .message {
             display: inline-block;
             color: black;
             padding: 5px;
             margin-left: 10px;
         }
-        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
+
+        .weishaIcon {
+            background: darkorange;
+            color: white;
+            margin: 0 0px;
+            padding: 0 3px;
+            font-style: normal;
+            font-size: 12px;
+            display: inline-block;
+            border-radius: 2px
+        }
     </style>
     <script type="text/javascript">
         $(document).ready(function () {
@@ -109,207 +121,11 @@
     <c:if test="${from eq '3'}">
         <li><a href="${ctx}/shopOrder/checkPaymentOrder">订单财务信息</a></li>
     </c:if>
-    <li class="active"><a href="#">收退款记录</a></li>
+    <li class="active"><a href="#">收付款记录</a></li>
 </ul>
 <br/>
 <table id="orderTable" class="table table-striped table-bordered table-condensed">
-    <%--    <thead>--%>
-    <%--    </thead>--%>
-    <%--    <tr>--%>
-    <%--        <td>--%>
-    <%--            下单时间：${order.orderTime}--%>
-    <%--        </td>--%>
-    <%--        <td>--%>
-    <%--            订单号(ID)：${order.orderNo}(${order.orderID})--%>
-    <%--        </td>--%>
-    <%--        <c:if test="${order.organizeID != 4}">--%>
-    <%--            <td>--%>
-    <%--                <c:if test="${order.organizeID != 1}">--%>
-    <%--                    订单类型：${fns:getDictLabel(order.orderType,'order_type' ,'' )}--%>
-    <%--                    <c:if test="${order.orderType eq 2}">--%>
-    <%--                        ${order.collageFlag eq 1?'拼团订单':'独立订单'}--%>
-    <%--                    </c:if>--%>
-    <%--                </c:if>--%>
-    <%--            </td>--%>
-    <%--        </c:if>--%>
-    <%--        <td>--%>
-    <%--            <c:if test="${order.organizeID != 1}">--%>
-    <%--                订单来源：${fns:getDictLabel(order.orderSource,'bp_orderSource' ,'' )}--%>
-    <%--            </c:if>--%>
-    <%--        </td>--%>
-    <%--    </tr>--%>
-    <%--    <tr>--%>
-    <%--        <td>--%>
-    <%--            订单状态：--%>
-    <%--            <c:if test="${ not empty order.status}">--%>
-    <%--                ${fns:getNewOrderStatus(order.status)}--%>
-    <%--            </c:if>--%>
-    <%--        </td>--%>
-    <%--        <td>--%>
-    <%--            收款状态：&lt;%&ndash;${fns:getDictLabel(order.receiptStatus,'receiptStatus' ,'' )}&ndash;%&gt;--%>
-    <%--            <c:if test="${order.receiptStatus == 1}">--%>
-    <%--                <font color="red">待收款</font>--%>
-    <%--            </c:if>--%>
-    <%--            <c:if test="${order.receiptStatus == 2}">--%>
-    <%--                <font color="#ff8c00">部分收款</font>--%>
-    <%--            </c:if>--%>
-    <%--            <c:if test="${order.receiptStatus == 3}">--%>
-    <%--                <font color="green">已收款</font>--%>
-    <%--            </c:if>--%>
-    <%--        </td>--%>
-    <%--        <c:if test="${order.orderType eq 2}">--%>
-    <%--            <td>--%>
-    <%--                拼团状态：--%>
-    <%--                <c:choose>--%>
-    <%--                    <c:when test="${order.collageFlag eq 1 && (order.status eq 31 || order.status eq 32 || order.status eq 33)}">--%>
-    <%--                        <font color="${order.collageStatus eq 1?'#00CC66':(order.collageStatus eq 2?'red':'')}">--%>
-    <%--                                ${order.collageStatus eq 1?'拼团中':(order.collageStatus eq 2?'已拼成':'-')}--%>
-    <%--                        </font>--%>
-    <%--                    </c:when>--%>
-    <%--                    <c:otherwise>--%>
-    <%--                        ---%>
-    <%--                    </c:otherwise>--%>
-    <%--                </c:choose>--%>
-    <%--            </td>--%>
-    <%--        </c:if>--%>
-    <%--        <td>--%>
-    <%--            付款状态：&lt;%&ndash;${fns:getDictLabel(order.payStatus,'payStatus' ,'' )}&ndash;%&gt;--%>
-    <%--            <c:if test="${order.payStatus == 1}">--%>
-    <%--                <font color="red">待付款</font>--%>
-    <%--            </c:if>--%>
-    <%--            <c:if test="${order.payStatus == 2}">--%>
-    <%--                <font color="#ff8c00">部分付款</font>--%>
-    <%--            </c:if>--%>
-    <%--            <c:if test="${order.payStatus == 3}">--%>
-    <%--                <font color="green">已付款</font>--%>
-    <%--            </c:if>--%>
-
-    <%--            <c:if test="${order.zeroCostFlag eq 1}">--%>
-    <%--                <a href="javascript:;" class="zeroCost"><span><img src="/static/images/info.jpg" style="width: 15px;margin-bottom: 4px"></span>--%>
-    <%--                    <div class="message">--%>
-    <%--                        <span>商品成本为0，直接置为已付款，无需付款供应商</span>--%>
-    <%--                    </div>--%>
-    <%--                </a>--%>
-    <%--            </c:if>--%>
-    <%--        </td>--%>
-    <%--        <c:if test="${order.onlinePayFlag == 0}">--%>
-    <%--        <td>--%>
-    <%--            结算状态：--%>
-    <%--            <c:if test="${order.settleStatus == 1}">--%>
-    <%--                <font color="red">待结算</font>--%>
-    <%--            </c:if>--%>
-    <%--            <c:if test="${order.settleStatus == 2}">--%>
-    <%--                <font color="#ff8c00">部分结算</font>--%>
-    <%--            </c:if>--%>
-    <%--            <c:if test="${order.settleStatus == 3}">--%>
-    <%--                <font color="green">已结算</font>--%>
-    <%--            </c:if>--%>
-    <%--        </td>--%>
-    <%--        </c:if>--%>
-    <%--        <td>--%>
-    <%--&lt;%&ndash;            退款（退货）状态：${fns:getDictLabel(order.refundType,'refundType' ,'' )}&ndash;%&gt;--%>
-    <%--    <c:if test="${order.refundType == 1}">--%>
-    <%--        <font color="red">待发货</font>--%>
-    <%--    </c:if>--%>
-    <%--    <c:if test="${order.refundType == 2}">--%>
-    <%--        <font color="#ff8c00">部分发货</font>--%>
-    <%--    </c:if>--%>
-    <%--    <c:if test="${order.refundType == 3}">--%>
-    <%--        <font color="green">已发货</font>--%>
-    <%--    </c:if>--%>
-    <%--        </td>--%>
-    <%--    </tr>--%>
-    <%--    <tr>--%>
-    <%--        <td>--%>
-    <%--            机构：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"></c:if>--%>
-    <%--        </td>--%>
-    <%--        <td>--%>
-    <%--            收货人：${order.bpOrderUserinfo.shouHuoRen}--%>
-    <%--        </td>--%>
-    <%--        <td>--%>
-    <%--            手机：${order.bpOrderUserinfo.mobile}--%>
-    <%--        </td>--%>
-    <%--        <td>--%>
-    <%--            地址：${order.bpOrderUserinfo.province}${order.bpOrderUserinfo.city}${order.bpOrderUserinfo.town}${order.bpOrderUserinfo.address}--%>
-    <%--        </td>--%>
-    <%--    </tr>--%>
-    <%--    <tr>--%>
-    <%--        <td>--%>
-    <%--            订单金额：￥${order.payTotalFee}--%>
-    <%--            <c:if test="${not empty order.couponOrderRecord}">--%>
-    <%--                <c:if test="${order.couponOrderRecord.couponType eq 0}">--%>
-    <%--                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（活动券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>--%>
-    <%--                </c:if>--%>
-    <%--                <c:if test="${order.couponOrderRecord.couponType eq 1}">--%>
-    <%--                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（品类券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>--%>
-    <%--                </c:if>--%>
-    <%--                <c:if test="${order.couponOrderRecord.couponType eq 2}">--%>
-    <%--                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（用户专享券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>--%>
-    <%--                </c:if>--%>
-    <%--                <c:if test="${order.couponOrderRecord.couponType eq 3}">--%>
-    <%--                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（店铺券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>--%>
-    <%--                </c:if>--%>
-    <%--                <c:if test="${order.couponOrderRecord.couponType eq 4}">--%>
-    <%--                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（新用户券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>--%>
-    <%--                </c:if>--%>
-    <%--            </c:if>--%>
-    <%--            <c:if test="${not empty order.heheCouponRecord}">--%>
-    <%--                <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">--%>
-    <%--                    <font color="red">--%>
-    <%--                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':order.heheCouponRecord.couponType eq 5?'好友消费':'消费分享'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）--%>
-    <%--                    </font>--%>
-    <%--                </a>--%>
-    <%--            </c:if>--%>
-    <%--            <c:if test="${order.reductionAmount > 0}">--%>
-    <%--                （分享减免￥${order.reductionAmount},满${order.reductionTouchPrice}减${order.reductionAmount}）--%>
-    <%--            </c:if>--%>
-    <%--        </td>--%>
-    <%--        <td>--%>
-    <%--            应收总额：￥${order.payableAmount}--%>
-    <%--        </td>--%>
-    <%--        <c:if test="${order.organizeID != 4}">--%>
-    <%--            <td>--%>
-    <%--                经理折扣：￥${order.discountFee}--%>
-    <%--            </td>--%>
-    <%--        </c:if>--%>
-    <%--        &lt;%&ndash;<td>--%>
-    <%--            运费：--%>
-    <%--            <c:if test="${order.organizeID != 4}">--%>
-
-    <%--                <c:if test="${order.freePostFlag == 0}">--%>
-    <%--                    包邮--%>
-    <%--                </c:if>--%>
-    <%--                <c:if test="${order.freePostFlag == -1}">--%>
-    <%--                    到付--%>
-    <%--                </c:if>--%>
-    <%--                <c:if test="${order.freePostFlag == -2}">--%>
-    <%--                    仪器到付-产品包邮--%>
-    <%--                </c:if>--%>
-    <%--                <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">--%>
-    <%--                    ¥<fmt:formatNumber value="${order.freight}" pattern="0.00"/>--%>
-    <%--                </c:if>--%>
-    <%--                <c:if test="${order.userBeans > 0}">--%>
-    <%--                    <font color="red">（采美豆抵用：${order.userBeans}）</font>--%>
-    <%--                </c:if>--%>
-    <%--            </c:if>--%>
-    <%--            <c:if test="${order.organizeID == 4}">--%>
-    <%--                ${postageInfo}--%>
-    <%--            </c:if>--%>
-    <%--        </td>&ndash;%&gt;--%>
-    <%--    </tr>--%>
-    <%--    <tr>--%>
-    <%--        <c:if test="${order.organizeID != 4}">--%>
-    <%--            <td>优惠券：${order.couponAmount}</td>--%>
-    <%--        </c:if>--%>
-    <%--        <td>退款总额:￥${refundFee}</td>--%>
-    <%--        <td COLSPAN="3">--%>
-
-    <%--        </td>--%>
-    <%--    </tr>--%>
-
-
     <c:forEach items="${order.newShopOrders}" var="shopOrder" varStatus="s">
-
         <tr>
             <td>
                 下单时间：${shopOrder.orderTime}
@@ -321,9 +137,6 @@
                 <td>
                     <c:if test="${order.organizeID != 1}">
                         订单类型：${fns:getDictLabel(shopOrder.orderType,'order_type' ,'' )}
-                        <%--                        <c:if test="${shopOrder.orderType eq 2}">--%>
-                        <%--                            ${order.collageFlag eq 1?'拼团订单':'独立订单'}--%>
-                        <%--                        </c:if>--%>
                     </c:if>
                 </td>
             </c:if>
@@ -351,23 +164,6 @@
                     <font color="green">已收款</font>
                 </c:if>
             </td>
-
-                <%--            <c:if test="${order.orderType eq 2}">--%>
-                <%--                <td>--%>
-                <%--                    拼团状态：--%>
-                <%--                    <c:choose>--%>
-                <%--                        <c:when test="${order.collageFlag eq 1 && (order.status eq 31 || order.status eq 32 || order.status eq 33)}">--%>
-                <%--                            <font color="${order.collageStatus eq 1?'#00CC66':(order.collageStatus eq 2?'red':'')}">--%>
-                <%--                                    ${order.collageStatus eq 1?'拼团中':(order.collageStatus eq 2?'已拼成':'-')}--%>
-                <%--                            </font>--%>
-                <%--                        </c:when>--%>
-                <%--                        <c:otherwise>--%>
-                <%--                            ---%>
-                <%--                        </c:otherwise>--%>
-                <%--                    </c:choose>--%>
-                <%--                </td>--%>
-                <%--            </c:if>--%>
-
             <td>
                 付款状态：<%--${fns:getDictLabel(order.payStatus,'payStatus' ,'' )}--%>
                 <c:if test="${shopOrder.payStatus == 1}">
@@ -381,16 +177,19 @@
                 </c:if>
             </td>
             <td>
-                结算状态：
-                <c:if test="${shopOrder.settleStatus == 1}">
-                    <font color="red">待结算</font>
-                </c:if>
-                <c:if test="${shopOrder.settleStatus == 2}">
-                    <font color="#ff8c00">部分结算</font>
-                </c:if>
-                <c:if test="${shopOrder.settleStatus == 3}">
-                    <font color="green">已结算</font>
-                </c:if>
+<%--                <a href="${ctx}/shopOrder/settleRecord?shopOrderID=${shopOrder.shopOrderID}"--%>
+<%--                   style="text-decoration: underline">--%>
+                    结算状态：
+                    <c:if test="${shopOrder.settleStatus == 1}">
+                        <font color="red">待结算</font>
+                    </c:if>
+                    <c:if test="${shopOrder.settleStatus == 2}">
+                        <font color="#ff8c00">部分结算</font>
+                    </c:if>
+                    <c:if test="${shopOrder.settleStatus == 3}">
+                        <font color="green">已结算</font>
+                    </c:if>
+<%--                </a>--%>
             </td>
             <td>
                     <%--            退款（退货）状态：${fns:getDictLabel(order.refundType,'refundType' ,'' )}--%>
@@ -457,41 +256,12 @@
                     <%--    </c:if>--%>
             </td>
             <td>
-                应收总额：￥
+                应收总额：
                 <c:if test="${shopOrder.realPay!=null}"><fmt:formatNumber value="${shopOrder.realPay}"
-                                                                                  type="currency"/></c:if>
+                                                                          type="currency"/></c:if>
                 <c:if test="${shopOrder.realPay==null}"><fmt:formatNumber value="${shopOrder.needPayAmount}"
                                                                           type="currency"/></c:if>
             </td>
-                <%--    <c:if test="${order.organizeID != 4}">--%>
-                <%--        <td>--%>
-                <%--            经理折扣：￥${order.discountFee}--%>
-                <%--        </td>--%>
-                <%--    </c:if>--%>
-                <%--<td>
-                    运费：
-                    <c:if test="${order.organizeID != 4}">
-
-                        <c:if test="${order.freePostFlag == 0}">
-                            包邮
-                        </c:if>
-                        <c:if test="${order.freePostFlag == -1}">
-                            到付
-                        </c:if>
-                        <c:if test="${order.freePostFlag == -2}">
-                            仪器到付-产品包邮
-                        </c:if>
-                        <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">
-                            ¥<fmt:formatNumber value="${order.freight}" pattern="0.00"/>
-                        </c:if>
-                        <c:if test="${order.userBeans > 0}">
-                            <font color="red">（采美豆抵用：${order.userBeans}）</font>
-                        </c:if>
-                    </c:if>
-                    <c:if test="${order.organizeID == 4}">
-                        ${postageInfo}
-                    </c:if>
-                </td>--%>
         </tr>
         <tr>
 
@@ -514,9 +284,10 @@
         <c:forEach items="${receipt}" var="receipt" varStatus="s">
             <tr>
                 <td>${s.index + 1}</td>
-                <td><a href="${ctx}/order/cmDiscernReceipt/detail?id=${receipt.receiptID}&shopOrderId=${receipt.shopOrderId}"
+                <td>
+                    <a href="${ctx}/order/cmDiscernReceipt/detail?id=${receipt.receiptID}&shopOrderId=${receipt.shopOrderId}"
                        style="cursor: pointer">${receipt.receiptID}</a></td>
-<%--                <td>${receipt.payType}</td>--%>
+                    <%--                <td>${receipt.payType}</td>--%>
                 <td>
                     <c:if test="${receipt.payWay==1}">线上收款</c:if>
                     <c:if test="${receipt.payWay==2}">线下收款</c:if>
@@ -596,27 +367,27 @@
                 <td><a href="${ctx}/order/cmPayShop/applyDetail?id=${p.payShopID}">${p.payShopID}</a></td>
                 <td>${p.payTime}</td>
                 <td>${p.bankNameType}
-                    <%--<c:if test="${p.payType == '1'}">
-                        建设银行7297
-                    </c:if>
-                    <c:if test="${p.payType == '2'}">
-                        中信银行0897
-                    </c:if>
-                    <c:if test="${p.payType == '3'}">
-                        中信银行7172
-                    </c:if>
-                    <c:if test="${p.payType == '4'}">
-                        广发银行0115
-                    </c:if>
-                    <c:if test="${p.payType == '5'}">
-                        广发银行5461
-                    </c:if>
-                    <c:if test="${p.payType == '7'}">
-                        华夏银行2400
-                    </c:if>
-                    <c:if test="${p.payType == '8'}">
-                        中国银行9452
-                    </c:if>--%>
+                        <%--<c:if test="${p.payType == '1'}">
+                            建设银行7297
+                        </c:if>
+                        <c:if test="${p.payType == '2'}">
+                            中信银行0897
+                        </c:if>
+                        <c:if test="${p.payType == '3'}">
+                            中信银行7172
+                        </c:if>
+                        <c:if test="${p.payType == '4'}">
+                            广发银行0115
+                        </c:if>
+                        <c:if test="${p.payType == '5'}">
+                            广发银行5461
+                        </c:if>
+                        <c:if test="${p.payType == '7'}">
+                            华夏银行2400
+                        </c:if>
+                        <c:if test="${p.payType == '8'}">
+                            中国银行9452
+                        </c:if>--%>
                 </td>
                 <td>${p.payAmount}</td>
             </tr>
@@ -624,8 +395,7 @@
         </tbody>
     </table>
 </c:if>
-    <br>
-
+<br>
 
 
 <script type="text/javascript" src="${ctxStatic}/modules/bulkpurchase/loadAddress.js"></script>

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

@@ -398,9 +398,12 @@
                         </c:if>
                     </td>
                     <td colspan="2">
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+                           style="text-decoration: underline">
                         <c:if test="${s.shopReceiptStatus == 1}"><font color="red">待收款</font></c:if>
                         <c:if test="${s.shopReceiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
                         <c:if test="${s.shopReceiptStatus == 3}"><font color="green">已收款</font></c:if>
+                        </a>
                     </td>
                     <td colspan="3">
                             ${s.receiptAmount}
@@ -464,10 +467,13 @@
                                                           pattern="#,##0.00"/></td>
 
                     <td>
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+                           style="text-decoration: underline">
                         <c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
                                 color="red">待付款</font></c:if>
                         <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
                         <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
+                        </a>
                     </td>
 
                     <td colspan="3" class="supplier-fee">

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

@@ -5,62 +5,259 @@
     <title>付款单表管理</title>
     <meta name="decorator" content="default"/>
     <style>
-        .table th{text-align:center}
-        .table td{text-align:center}
-        .payment-form h4{width:96%;margin-left:2%;padding-bottom:20px;text-align:center;border-bottom:1px solid #eee}
-        .required{color:red}
-        .payment-form label{width:100px;text-align:right;vertical-align:middle;font-weight:600}
-        .payment-form-top{padding:10px 0}
-        .payment-form-top > div,.payment-form-bottom > div{width:94%;margin-left:3%;height:50px;line-height:50px;border-bottom:1px solid #eee;white-space:nowrap}
-        .payment-form-top input{vertical-align:baseline}
-        .payment-form-top > div:last-child span{margin-left:15px}
-        .payment-form-top > div:last-child span:nth-of-type(1){margin-left:0}
-        .pay-list-item{margin-bottom:30px}
-        .pay-table{width:96%;margin-left:2%;margin-bottom:10px}
-        .pay-table th{background:#f9f9f9}
-        .pay-table tr:first-child th{background:#eee !important}
-        .pay-table td{background:#fff !important}
-        .check-btn{width:96%;margin-left:2%;text-align:center;height:60px;line-height:60px;margin-top:30px}
-        .check-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px solid #ddd}
-        .need-to-pay{width:50px}
-        .payment-form-bottom label{width:140px}
-        .used-amount{width:80px;margin-top:6px}
-        .process-details span{width:140px;margin-left:50px;font-weight:600}
-        .process-for-label{margin-left:0 !important}
-        .process-details div{display:inline-block}
-        .payment-btn{width:96%;margin-left:2%;text-align:center;height:60px;line-height:60px;margin-top:30px}
-        .payment-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px solid #ddd}
-        .mask{width:100%;height:100%;position:fixed;top:0;background:rgba(0,0,0,0.7);display:none}
-        .tips-popup-content{width:40%;height:auto;padding-bottom:30px;background:#fff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}
-        .tips-popup-content div{width:100%;text-align:center}
-        .tips-popup-content p{text-align:center;padding:80px;font-size:20px}
-        .tips-popup-content h4{padding-left:10px;height:40px;line-height:40px;border-bottom:1px solid #eee;margin-bottom:20px}
-		.red{color:red;}
-		.payment-form-bottom .wipeImgs{height:auto;padding:8px 0;}
-		.wipeImgs img{width:120px;height:90px;background-color:#eee;margin-right:15px;}
-        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
-        .clubFreight{display: none}
-        .discountFee{display: none}
+        .table th {
+            text-align: center
+        }
+
+        .table td {
+            text-align: center
+        }
+
+        .payment-form h4 {
+            width: 96%;
+            margin-left: 2%;
+            padding-bottom: 20px;
+            text-align: center;
+            border-bottom: 1px solid #eee
+        }
+
+        .required {
+            color: red
+        }
+
+        .payment-form label {
+            width: 100px;
+            text-align: right;
+            vertical-align: middle;
+            font-weight: 600
+        }
+
+        .payment-form-top {
+            padding: 10px 0
+        }
+
+        .payment-form-top > div, .payment-form-bottom > div {
+            width: 94%;
+            margin-left: 3%;
+            height: 50px;
+            line-height: 50px;
+            border-bottom: 1px solid #eee;
+            white-space: nowrap
+        }
+
+        .payment-form-top input {
+            vertical-align: baseline
+        }
+
+        .payment-form-top > div:last-child span {
+            margin-left: 15px
+        }
+
+        .payment-form-top > div:last-child span:nth-of-type(1) {
+            margin-left: 0
+        }
+
+        .pay-list-item {
+            margin-bottom: 30px
+        }
+
+        .pay-table {
+            width: 96%;
+            margin-left: 2%;
+            margin-bottom: 10px
+        }
+
+        .pay-table th {
+            background: #f9f9f9
+        }
+
+        .pay-table tr:first-child th {
+            background: #eee !important
+        }
+
+        .pay-table td {
+            background: #fff !important
+        }
+
+        .check-btn {
+            width: 96%;
+            margin-left: 2%;
+            text-align: center;
+            height: 60px;
+            line-height: 60px;
+            margin-top: 30px
+        }
+
+        .check-btn button {
+            width: 100px;
+            height: 35px;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px;
+            border: none;
+            border: 1px solid #ddd
+        }
+
+        .need-to-pay {
+            width: 50px
+        }
+
+        .payment-form-bottom label {
+            width: 140px
+        }
+
+        .used-amount {
+            width: 80px;
+            margin-top: 6px
+        }
+
+        .process-details span {
+            width: 140px;
+            margin-left: 50px;
+            font-weight: 600
+        }
+
+        .process-for-label {
+            margin-left: 0 !important
+        }
+
+        .process-details div {
+            display: inline-block
+        }
+
+        .payment-btn {
+            width: 96%;
+            margin-left: 2%;
+            text-align: center;
+            height: 60px;
+            line-height: 60px;
+            margin-top: 30px
+        }
+
+        .payment-btn button {
+            width: 100px;
+            height: 35px;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px;
+            border: none;
+            border: 1px solid #ddd
+        }
+
+        .mask {
+            width: 100%;
+            height: 100%;
+            position: fixed;
+            top: 0;
+            background: rgba(0, 0, 0, 0.7);
+            display: none
+        }
+
+        .tips-popup-content {
+            width: 40%;
+            height: auto;
+            padding-bottom: 30px;
+            background: #fff;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%)
+        }
+
+        .tips-popup-content div {
+            width: 100%;
+            text-align: center
+        }
+
+        .tips-popup-content p {
+            text-align: center;
+            padding: 80px;
+            font-size: 20px
+        }
+
+        .tips-popup-content h4 {
+            padding-left: 10px;
+            height: 40px;
+            line-height: 40px;
+            border-bottom: 1px solid #eee;
+            margin-bottom: 20px
+        }
+
+        .red {
+            color: red;
+        }
+
+        .payment-form-bottom .wipeImgs {
+            height: auto;
+            padding: 8px 0;
+        }
+
+        .wipeImgs img {
+            width: 120px;
+            height: 90px;
+            background-color: #eee;
+            margin-right: 15px;
+        }
+
+        .weishaIcon {
+            background: darkorange;
+            color: white;
+            margin: 0 0px;
+            padding: 0 3px;
+            font-style: normal;
+            font-size: 12px;
+            display: inline-block;
+            border-radius: 2px
+        }
+
+        .clubFreight {
+            display: none
+        }
+
+        .discountFee {
+            display: none
+        }
     </style>
     <style media="print">
-        .styleWidth{width:6%;word-break:break-all}
-        .styleWidth3{width:10%;word-break:break-all}
-        .table{margin-left:0;margin-bottom:20px;padding-bottom:2px;border-bottom:1px solid #ddd;box-sizing:border-box}
-        .export{display:none}
+        .styleWidth {
+            width: 6%;
+            word-break: break-all
+        }
+
+        .styleWidth3 {
+            width: 10%;
+            word-break: break-all
+        }
+
+        .table {
+            margin-left: 0;
+            margin-bottom: 20px;
+            padding-bottom: 2px;
+            border-bottom: 1px solid #ddd;
+            box-sizing: border-box
+        }
+
+        .export {
+            display: none
+        }
     </style>
 </head>
 <body>
 <ul class="nav nav-tabs">
-    <c:if test="${cmPayShop.redirectType == 2}" >
+    <c:if test="${cmPayShop.redirectType == 2}">
         <li><a href="${ctx}/order/cmPayShop/payList">付款管理</a></li>
     </c:if>
-    <c:if test="${cmPayShop.redirectType != 2}" >
+    <c:if test="${cmPayShop.redirectType != 2}">
         <li><a href="${ctx}/order/cmPayShop/">付款管理</a></li>
     </c:if>
     <li class="active"><a href="${ctx}/order/cmPayShop/applyCompile?id=${cmPayShop.id}">编辑</a></li>
 </ul>
 <br/>
-<form:form id="inputForm" modelAttribute="cmPayShop" action="${ctx}/order/cmPayShop/applyCompileSave?id=${cmPayShop.id}" method="post"
+<form:form id="inputForm" modelAttribute="cmPayShop" action="${ctx}/order/cmPayShop/applyCompileSave?id=${cmPayShop.id}"
+           method="post"
            class="form-horizontal">
     <div class="payment-form">
         <h4>付款单</h4>
@@ -120,41 +317,41 @@
                             <%--                                    <span style="color: red">(含返佣服务费￥${s.rebateFee})</span>--%>
                             <%--                            </c:if>--%>
                             <%--                        </td>--%>
-                                <td colspan="4">${s.allServeAmount}</td>
-                                <c:if test="${empty s.brokerage}">
-                                <td class="payCm-t"></td>
-                                </c:if>
-                                <c:if test="${not empty s.brokerage}">
-                                <td class="">
-                                    <c:if test="${s.differenceType ne 1 && s.differenceType ne 2}">
-                                        <fmt:formatNumber value="${s.brokerage}" type="number" pattern="#,##0.00"/>
-                                    </c:if>
-                                    <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                        <fmt:formatNumber value="${s.brokerage-s.differencePrice}" type="number"
-                                                          pattern="#,##0.00"/>
-                                    </c:if>
-                                    <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                        <fmt:formatNumber value="${s.brokerage+s.differencePrice}" type="number"
-                                                          pattern="#,##0.00"/>
-                                    </c:if>
-                                </td>
-                                </c:if>
-                                <td>
-                                    <c:if test="${s.differenceType ne 1 && s.differenceType ne 2}">
-                                        <fmt:formatNumber value="${s.brokerage + s.allServeAmount}" type="number"
-                                                          pattern="#,##0.00"/>
-                                    </c:if>
-                                    <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                        <fmt:formatNumber value="${s.brokerage + s.allServeAmount - s.differencePrice}"
-                                                          type="number"
-                                                          pattern="#,##0.00"/>
-                                    </c:if>
-                                    <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                        <fmt:formatNumber value="${s.brokerage + s.allServeAmount + s.differencePrice}"
-                                                          type="number"
-                                                          pattern="#,##0.00"/>
-                                    </c:if>
-                                </td>
+                        <td colspan="4">${s.allServeAmount}</td>
+                        <c:if test="${empty s.brokerage}">
+                        <td class="payCm-t"></td>
+                        </c:if>
+                        <c:if test="${not empty s.brokerage}">
+                        <td class="">
+                            <c:if test="${s.differenceType ne 1 && s.differenceType ne 2}">
+                                <fmt:formatNumber value="${s.brokerage}" type="number" pattern="#,##0.00"/>
+                            </c:if>
+                            <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
+                                <fmt:formatNumber value="${s.brokerage-s.differencePrice}" type="number"
+                                                  pattern="#,##0.00"/>
+                            </c:if>
+                            <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
+                                <fmt:formatNumber value="${s.brokerage+s.differencePrice}" type="number"
+                                                  pattern="#,##0.00"/>
+                            </c:if>
+                        </td>
+                        </c:if>
+                        <td>
+                            <c:if test="${s.differenceType ne 1 && s.differenceType ne 2}">
+                                <fmt:formatNumber value="${s.brokerage + s.allServeAmount}" type="number"
+                                                  pattern="#,##0.00"/>
+                            </c:if>
+                            <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
+                                <fmt:formatNumber value="${s.brokerage + s.allServeAmount - s.differencePrice}"
+                                                  type="number"
+                                                  pattern="#,##0.00"/>
+                            </c:if>
+                            <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
+                                <fmt:formatNumber value="${s.brokerage + s.allServeAmount + s.differencePrice}"
+                                                  type="number"
+                                                  pattern="#,##0.00"/>
+                            </c:if>
+                        </td>
                             <%--<td>
                                 <label class="clubFreight"  style="display: none">
                                     <c:choose>
@@ -184,51 +381,51 @@
                                 </c:if>
                             </td>--%>
                         <td colspan="2">
-                            <%--<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
+                            <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
                                style="text-decoration: underline">
-                                </a>--%>
-                            <c:if test="${s.shopReceiptStatus == 1}"><font color="red">待收款</font></c:if>
-                            <c:if test="${s.shopReceiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-                            <c:if test="${s.shopReceiptStatus == 3}"><font color="green">已收款</font></c:if>
+                                <c:if test="${s.shopReceiptStatus == 1}"><font color="red">待收款</font></c:if>
+                                <c:if test="${s.shopReceiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                                <c:if test="${s.shopReceiptStatus == 3}"><font color="green">已收款</font></c:if>
+                            </a>
                         </td>
                         <td colspan="3">
-                            <%--<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline"></a>--%>
-                            ${s.receiptAmount}
+                                <%--<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline"></a>--%>
+                                ${s.receiptAmount}
                             <c:if test="${s.accountAmount>0}">(余额抵扣 ￥${s.accountAmount})</c:if>
                         </td>
                         <td colspan="2">
                             <fmt:formatNumber value="${s.promotionFullReduction}" type="number" pattern="#,##0.00"/>
-                            <%--<label class="discountFee">
-                                <c:choose>
-                                    <c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
-                                        <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>
-                                    </c:when>
-                                    <c:otherwise>
-                                        0
-                                    </c:otherwise>
-                                </c:choose>
-                            </label>
-                            <c:if test="${s.discountTotalFee gt 0}">
-                                <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
-                                    <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"
-                                                      type="currency"/>
-                                </c:if>
-                                <c:if test="${s.discountTotalFee le s.returnedPurchaseTotalFee}">
-                                    ¥0.00
-                                </c:if>
-                                <c:if test="${s.returnedPurchaseTotalFee gt 0}">
-                                <span style="color: red">
-                                    (原<fmt:formatNumber value="${s.discountTotalFee}" type="currency"/>，因退货折扣取消
+                                <%--<label class="discountFee">
+                                    <c:choose>
+                                        <c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
+                                            <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>
+                                        </c:when>
+                                        <c:otherwise>
+                                            0
+                                        </c:otherwise>
+                                    </c:choose>
+                                </label>
+                                <c:if test="${s.discountTotalFee gt 0}">
                                     <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
-                                        <fmt:formatNumber value="${s.returnedPurchaseTotalFee}" type="currency"/>
+                                        <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"
+                                                          type="currency"/>
                                     </c:if>
                                     <c:if test="${s.discountTotalFee le s.returnedPurchaseTotalFee}">
-                                        <fmt:formatNumber value="${s.discountTotalFee}" type="currency"/>
-                                    </c:if>)
-                                </span>
+                                        ¥0.00
+                                    </c:if>
+                                    <c:if test="${s.returnedPurchaseTotalFee gt 0}">
+                                    <span style="color: red">
+                                        (原<fmt:formatNumber value="${s.discountTotalFee}" type="currency"/>，因退货折扣取消
+                                        <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
+                                            <fmt:formatNumber value="${s.returnedPurchaseTotalFee}" type="currency"/>
+                                        </c:if>
+                                        <c:if test="${s.discountTotalFee le s.returnedPurchaseTotalFee}">
+                                            <fmt:formatNumber value="${s.discountTotalFee}" type="currency"/>
+                                        </c:if>)
+                                    </span>
+                                    </c:if>
                                 </c:if>
-                            </c:if>
-                            <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>--%>
+                                <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>--%>
                         </td>
                         <td class="couponAmount" colspan="2">${s.couponAmount} </td>
                         <td class="eachDiscount" style="display: none">${s.eachDiscount}</td>
@@ -243,7 +440,7 @@
                         <th>付款状态</th>
                         <th colspan="3">付供应商</th>
                         <th colspan="2">付第三方</th>
-                        <%--<th>成本类型</th>--%>
+                            <%--<th>成本类型</th>--%>
                     </tr>
                     <tr>
                         <td> ${s.buyer}</td>
@@ -254,7 +451,7 @@
                             <fmt:formatNumber value="${s.shopTaxFee}" type="number" pattern="#,##0.00"/>
                         </td>
                         <td>
-                            <label class="clubFreight"  style="display: none">
+                            <label class="clubFreight" style="display: none">
                                 <c:choose>
                                     <c:when test="${s.shopPostFlag != 2 && s.shopPostFlag != 0 && s.shopPostFlag != -2 && s.returnedFreightFlag ne true}">
                                         <fmt:formatNumber value="${s.shopPostFee}"/>
@@ -285,10 +482,13 @@
                                                               pattern="#,##0.00"/></td>
 
                         <td>
-                            <c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
-                                    color="red">待付款</font></c:if>
-                            <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
-                            <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
+                            <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+                               style="text-decoration: underline">
+                                <c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
+                                        color="red">待付款</font></c:if>
+                                <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
+                                <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
+                            </a>
                         </td>
 
                         <td colspan="3" class="supplier-fee">
@@ -297,10 +497,12 @@
                                 应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
 							<c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber
+                                        value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                             </c:if>
 							<c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber
+                                        value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                             </c:if>
 							，</span>
                                 <span class="nowrap">已付：${s.payedShopAmount}，</span></div>
@@ -318,10 +520,10 @@
 
                         <td colspan="2" class="third-party-fee">${s.shopOtherFee}</td>
 
-                        <%--<td>
-                            <c:if test="${empty s.costType || s.costType == '1'}">固定成本</c:if>
-                            <c:if test="${s.costType == '2'}">比例成本</c:if>
-                        </td>--%>
+                            <%--<td>
+                                <c:if test="${empty s.costType || s.costType == '1'}">固定成本</c:if>
+                                <c:if test="${s.costType == '2'}">比例成本</c:if>
+                            </td>--%>
                     </tr>
                     <tr>
                         <th>商品名</th>
@@ -377,7 +579,9 @@
                                     type="number" pattern="#,##0.00"/></td>
                             <td>
                                 <c:if test="${p.productType == 0}">
-                                    <fmt:formatNumber value="${p.oldDiscountPrice - (p.costPrice + p.cmCostPrice + p.organizeCostPrice)}" pattern="#,##0.00"/>
+                                    <fmt:formatNumber
+                                            value="${p.oldDiscountPrice - (p.costPrice + p.cmCostPrice + p.organizeCostPrice)}"
+                                            pattern="#,##0.00"/>
                                 </c:if>
                                 <c:if test="${p.productType != 0}">
                                     0.00
@@ -386,13 +590,16 @@
 
                             <td class="payCm">
                                 <c:if test="${p.productType == 0}">
-                                    <fmt:formatNumber value="${(p.oldDiscountPrice - (p.costPrice + p.cmCostPrice + p.organizeCostPrice)) * (p.num + p.presentNum - p.returnedNum)}" pattern="#,##0.00"/>
+                                    <fmt:formatNumber
+                                            value="${(p.oldDiscountPrice - (p.costPrice + p.cmCostPrice + p.organizeCostPrice)) * (p.num + p.presentNum - p.returnedNum)}"
+                                            pattern="#,##0.00"/>
                                 </c:if>
                                 <c:if test="${p.productType != 0}">
                                     0.00
                                 </c:if>
                             </td>
-                            <td><fmt:formatNumber value="${p.returnedNum == p.num ? 0.00 : p.cmCostPrice}" type="number" pattern="#,##0.00"/></td>
+                            <td><fmt:formatNumber value="${p.returnedNum == p.num ? 0.00 : p.cmCostPrice}" type="number"
+                                                  pattern="#,##0.00"/></td>
                             <td class="p-taxes">${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.supplierTaxRate?0.0:p.supplierTaxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
                             <td class="p-taxes">${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.singleShouldPayTotalTax ?0.00:p.singleShouldPayTotalTax}</td>
                             <td class="p-taxes-t"><c:choose>
@@ -417,17 +624,19 @@
         <div class="payment-form-bottom">
             <div>
                 <label style="font-weight: bold; font-size:18px">${cmPayShop.paymentType eq 2 ? "需补供应商差价":"付供应商总金额"}：</label>
-                <span id="totalAmount" style="font-weight: bold; font-size:18px"><fmt:formatNumber value="${cmPayShop.totalAmount}" pattern="#,##0.00"/> </span>
-				<c:if test="${cmPayShop.wipePayment > 0}">
-					<span class="red">（付款抹平总额：￥<fmt:formatNumber value="${cmPayShop.wipePayment}" pattern="#,##0.00"/>）</span>
-				</c:if>
-			</div>
-			<c:if test="${cmPayShop.wipePayment > 0}">
-				<div>
-					<label>抹平备注：</label>
-					<span>${cmPayShop.wipeRemarks}</span>
-				</div>
-				<c:if test="${not empty cmPayShop.wipeImages}">
+                <span id="totalAmount" style="font-weight: bold; font-size:18px"><fmt:formatNumber
+                        value="${cmPayShop.totalAmount}" pattern="#,##0.00"/> </span>
+                <c:if test="${cmPayShop.wipePayment > 0}">
+                    <span class="red">（付款抹平总额：￥<fmt:formatNumber value="${cmPayShop.wipePayment}"
+                                                                 pattern="#,##0.00"/>）</span>
+                </c:if>
+            </div>
+            <c:if test="${cmPayShop.wipePayment > 0}">
+                <div>
+                    <label>抹平备注：</label>
+                    <span>${cmPayShop.wipeRemarks}</span>
+                </div>
+                <c:if test="${not empty cmPayShop.wipeImages}">
                     <div class="wipeImgs">
                         <label>图片：</label>
                         <c:forEach items="${cmPayShop.wipeImages}" var="wi" varStatus="wIndex">
@@ -435,7 +644,7 @@
                         </c:forEach>
                     </div>
                 </c:if>
-			</c:if>
+            </c:if>
             <div>
                 <label>欠款抵扣：</label>
                 总欠款：<span id="rebateAmount">${empty cmPayShop.rebateAmount ? 0 : cmPayShop.rebateAmount}</span>，
@@ -495,8 +704,8 @@
             </div>
             <div class="form-actions">
                 <shiro:hasPermission name="order:cmPayShop:edit"><input id="btnSubmit" class="btn btn-primary"
-                                                                              type="submit"
-                                                                              value="确  认"/>&nbsp;</shiro:hasPermission>
+                                                                        type="submit"
+                                                                        value="确  认"/>&nbsp;</shiro:hasPermission>
                 <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
             </div>
         </div>
@@ -526,12 +735,12 @@
                 totalComissionVal = 0,
                 resVal = '';
             totalComissionEle = thisEle.find('.payCm'),
-            comissionEle = thisEle.find('.payCm-t'),
-            thirdPartyVal = thisEle.find('.third-party-fee').text().replace(',', ''),
-            freightVal = thisEle.find('.freight').text().replace(',', ''),
-            clubFreight = Number(thisEle.find('.clubFreight').text().replace(',','')),
-            discountFee = Number(thisEle.find('.discountFee').text().replace(',','')),
-            eachDiscount = Number(thisEle.find('.eachDiscount').text().replace(',',''));//分摊优惠
+                comissionEle = thisEle.find('.payCm-t'),
+                thirdPartyVal = thisEle.find('.third-party-fee').text().replace(',', ''),
+                freightVal = thisEle.find('.freight').text().replace(',', ''),
+                clubFreight = Number(thisEle.find('.clubFreight').text().replace(',', '')),
+                discountFee = Number(thisEle.find('.discountFee').text().replace(',', '')),
+                eachDiscount = Number(thisEle.find('.eachDiscount').text().replace(',', ''));//分摊优惠
             totalComissionEle.each(function () {
                 totalComissionVal += Number($(this).text().replace(',', ''));
             })

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

@@ -523,12 +523,12 @@
                                 </c:if>
                             </td>--%>
                         <td colspan="2">
-                                <%--<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
-                                   style="text-decoration: underline">
-                                    </a>--%>
-                            <c:if test="${s.shopReceiptStatus == 1}"><font color="red">待收款</font></c:if>
-                            <c:if test="${s.shopReceiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-                            <c:if test="${s.shopReceiptStatus == 3}"><font color="green">已收款</font></c:if>
+                            <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+                               style="text-decoration: underline">
+                                <c:if test="${s.shopReceiptStatus == 1}"><font color="red">待收款</font></c:if>
+                                <c:if test="${s.shopReceiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                                <c:if test="${s.shopReceiptStatus == 3}"><font color="green">已收款</font></c:if>
+                            </a>
                         </td>
                         <td colspan="3">
                                 <%--<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline"></a>--%>
@@ -626,10 +626,12 @@
                                                               pattern="#,##0.00"/></td>
 
                         <td>
-                            <c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
-                                    color="red">待付款</font></c:if>
-                            <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
-                            <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
+                            <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+                               style="text-decoration: underline">
+                                <c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font color="red">待付款</font></c:if>
+                                <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
+                                <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
+                            </a>
                         </td>
 
                         <td colspan="3" class="supplier-fee">

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

@@ -432,10 +432,13 @@
                     <td colspan="2"><fmt:formatNumber value="${s.totalAmount}" type="number" pattern="#,##0.00"/></td>
                     <td colspan="3">${s.orderTime}</td>
                         <%--此处对应订单列表收款状态--%>
-                    <td><%--<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline"></a>--%>
-                        <c:if test="${s.shopReceiptStatus == 1}"><font color="red">待收款</font></c:if>
-                        <c:if test="${s.shopReceiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-                        <c:if test="${s.shopReceiptStatus == 3}"><font color="green">已收款</font></c:if>
+                    <td>
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+                           style="text-decoration: underline">
+                            <c:if test="${s.shopReceiptStatus == 1}"><font color="red">待收款</font></c:if>
+                            <c:if test="${s.shopReceiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                            <c:if test="${s.shopReceiptStatus == 3}"><font color="green">已收款</font></c:if>
+                        </a>
                     </td>
                     <td><%--<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline"></a></td>--%>
                             ${s.receiptAmount}
@@ -512,10 +515,14 @@
                                                           pattern="#,##0.00"/></td>
                     <td colspan="3" class="product-fee"><fmt:formatNumber value="${s.shopProductAmount}" type="number"
                                                                           pattern="#,##0.00"/></td>
-                    <td colspan="2"><c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
-                            color="red">待付款</font></c:if>
+                    <td colspan="2">
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+                           style="text-decoration: underline">
+                        <c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font color="red">待付款</font></c:if>
                         <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
-                        <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if></td>
+                        <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
+                        </a>
+                    </td>
                     <td colspan="3" class="taxes"><fmt:formatNumber value="${s.shopTaxFee}" type="number"
                                                                     pattern="#,##0.00"/></td>
                     <td class="supplier-fee">
@@ -551,7 +558,7 @@
                     <input type="hidden" class="modifyShouldPayNote" value="${s.modifyShouldPayNote}">
                     <td class="third-party-fee">
                         <fmt:formatNumber value="${s.shopOtherFee + s.cmShopOtherFee}" type="number"
-                                                                  pattern="#,##0.00"/>
+                                          pattern="#,##0.00"/>
                         <c:if test="${s.shopOtherFee > 0 and s.cmShopOtherFee > 0}">
                             <font color="red">（采美中介费￥${s.cmShopOtherFee}，第三方中介费￥${s.shopOtherFee}）</font>
                         </c:if>

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

@@ -496,9 +496,12 @@
                     <td colspan="2">${s.totalAmount}</td>
                     <td colspan="4">${s.allServeAmount}</td>
                     <td colspan="2">
-                        <c:if test="${s.shopReceiptStatus == 1}"><font color="red">待收款</font></c:if>
-                        <c:if test="${s.shopReceiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-                        <c:if test="${s.shopReceiptStatus == 3}"><font color="green">已收款</font></c:if>
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+                           style="text-decoration: underline">
+                            <c:if test="${s.shopReceiptStatus == 1}"><font color="red">待收款</font></c:if>
+                            <c:if test="${s.shopReceiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                            <c:if test="${s.shopReceiptStatus == 3}"><font color="green">已收款</font></c:if>
+                        </a>
                     </td>
                     <td colspan="3">
                             ${s.receiptAmount}
@@ -527,7 +530,7 @@
                     <th>供应商运费</th>
                     <th colspan="4">商品费</th>
                     <th colspan="2">付款状态</th>
-<%--                    <th colspan="2">采美佣金</th>--%>
+                        <%--                    <th colspan="2">采美佣金</th>--%>
                     <th colspan="3">应付税费</th>
                     <th colspan="4">付供应商</th>
                 </tr>
@@ -566,16 +569,20 @@
                             (采美豆抵用${s.userBeans})
                         </c:if>
                     </td>
-                    <td class="freight"><fmt:formatNumber value="${empty s.supplierFreight ? 0 : s.supplierFreight}" type="number"
+                    <td class="freight"><fmt:formatNumber value="${empty s.supplierFreight ? 0 : s.supplierFreight}"
+                                                          type="number"
                                                           pattern="#,##0.00"/></td>
                     <td colspan="4" class="product-fee"><fmt:formatNumber value="${s.shopProductAmount}" type="number"
                                                                           pattern="#,##0.00"/></td>
-                    <td colspan="2"><c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
-                            color="red">待付款</font></c:if>
-                        <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
-                        <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
+                    <td colspan="2">
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+                           style="text-decoration: underline">
+                            <c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font color="red">待付款</font></c:if>
+                            <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
+                            <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
+                        </a>
                     </td>
-<%--                    <td colspan="2" class="payCm-t"></td>--%>
+                        <%--                    <td colspan="2" class="payCm-t"></td>--%>
                     <td colspan="3" class="taxes"><fmt:formatNumber value="${s.shopTaxFee}" type="number"
                                                                     pattern="#,##0.00"/></td>
                     <td colspan="4" class="supplier-fee">
@@ -725,7 +732,8 @@
                 <div>
                     <label style="font-weight: bold; font-size:18px">转账支付：</label>
                     <span id="transferAmount" style="font-weight: bold; font-size:18px"><fmt:formatNumber
-                            value="${cmPayShop.shopOrders[0].cmShopOtherFee + cmPayShop.shopOrders[0].shopOtherFee}" pattern="#,##0.00"/></span>
+                            value="${cmPayShop.shopOrders[0].cmShopOtherFee + cmPayShop.shopOrders[0].shopOtherFee}"
+                            pattern="#,##0.00"/></span>
                     <c:if test="${cmPayShop.status != '2'}">
                         <c:if test="${not empty cmPayShop.payType }">
                             <label>付款银行：</label>
@@ -766,7 +774,8 @@
                 <div>
                     <label style="font-weight: bold; font-size:18px">转账支付：</label>
                     <span id="transferAmount" style="font-weight: bold; font-size:18px"><fmt:formatNumber
-                            value="${cmPayShop.shopOrders[0].cmShopOtherFee + cmPayShop.shopOrders[0].shopOtherFee}" pattern="#,##0.00"/></span>
+                            value="${cmPayShop.shopOrders[0].cmShopOtherFee + cmPayShop.shopOrders[0].shopOtherFee}"
+                            pattern="#,##0.00"/></span>
                     <c:if test="${cmPayShop.status != '2'}">
                         <c:if test="${not empty cmPayShop.cmOtherPayType }">
                             <label>付款银行：</label>

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

@@ -425,13 +425,19 @@
                             (采美豆抵用${s.userBeans})
                         </c:if>
                     </td>
-                    <td class="freight"><fmt:formatNumber value="${empty s.supplierFreight ? 0 : s.supplierFreight}" type="number"
+                    <td class="freight"><fmt:formatNumber value="${empty s.supplierFreight ? 0 : s.supplierFreight}"
+                                                          type="number"
                                                           pattern="#,##0.00"/></td>
                     <td class="product-fee"><fmt:formatNumber value="${s.shopProductAmount}" type="number"
                                                               pattern="#,##0.00"/>
-                    <td><c:if test="${s.payStatus == 1}"><font color="red">待付款</font></c:if>
-                        <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
-                        <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if></td>
+                    <td>
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+                           style="text-decoration: underline">
+                            <c:if test="${s.payStatus == 1}"><font color="red">待付款</font></c:if>
+                            <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
+                            <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
+                        </a>
+                    </td>
                     <td class="taxes"><fmt:formatNumber value="${s.shopTaxFee}" type="number" pattern="#,##0.00"/></td>
                     <td class="supplier-fee">
                         <div>
@@ -537,7 +543,8 @@
                 <div>
                     <label style="font-weight: bold; font-size:18px">转账支付：</label>
                     <span id="transferAmount" style="font-weight: bold; font-size:18px"><fmt:formatNumber
-                            value="${cmPayShop.shopOrders[0].cmShopOtherFee + cmPayShop.shopOrders[0].shopOtherFee}" pattern="#,##0.00"/> </span>
+                            value="${cmPayShop.shopOrders[0].cmShopOtherFee + cmPayShop.shopOrders[0].shopOtherFee}"
+                            pattern="#,##0.00"/> </span>
                     <c:if test="${not empty cmPayShop.payType }">
                         <label>付款银行：</label>
                         <span id="payType">
@@ -575,7 +582,8 @@
                 <div>
                     <label style="font-weight: bold; font-size:18px">转账支付：</label>
                     <span id="transferAmount" style="font-weight: bold; font-size:18px"><fmt:formatNumber
-                            value="${cmPayShop.shopOrders[0].cmShopOtherFee + cmPayShop.shopOrders[0].shopOtherFee}" pattern="#,##0.00"/></span>
+                            value="${cmPayShop.shopOrders[0].cmShopOtherFee + cmPayShop.shopOrders[0].shopOtherFee}"
+                            pattern="#,##0.00"/></span>
                     <c:if test="${cmPayShop.status != '2'}">
                         <c:if test="${not empty cmPayShop.cmOtherPayType }">
                             <label>付款银行：</label>

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

@@ -1,338 +1,579 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-	<title>退款表--供应商退款给采美管理</title>
-	<meta name="decorator" content="default"/>
-	<style>
-		.table th{text-align:center}
-		.table td{text-align:center}
-		.refund-form h4{width:96%;margin-left:2%;padding-bottom:20px;text-align:center;border-bottom:1px solid #eee}
-		.required{color:red}
-		.refund-form label{width:100px;text-align:right;vertical-align:middle;font-weight:600}
-		.refund-form-top{padding:10px 0}
-		.refund-form-top>div,.refund-form-bottom>div{width:94%;margin-left:3%;height:50px;line-height:50px;border-bottom:1px solid #eee;white-space:nowrap}
-		.refund-form-top input{vertical-align:baseline}
-		.refund-form-top>div:last-child span{margin-left:15px}
-		.refund-form-top>div:last-child span:nth-of-type(1){margin-left:0}
-		.pay-list-item{margin-bottom:30px}
-		.pay-table{width:96%;margin-left:2%;margin-bottom:10px}
-		.pay-table th{background:#f9f9f9}
-		.pay-table tr:first-child th{background:#eee !important}
-		.pay-table td{background:#fff !important}
-		/*.supplier-fee{text-align:left !important;padding-top:20px !important;padding-left:20px !important}*/
-		.need-to-pay{width:90px}
-		.refund-form-bottom label{width:110px}
-		.used-amount{width:80px;margin-top:6px}
-		.process-details span{width:140px;margin-left:50px;font-weight:600}
-		.process-for-label{margin-left:0 !important}
-		.process-details div{display:inline-block}
-		.refund-btn{width:96%;margin-left:2%;text-align:center;height:60px;line-height:60px;margin-top:30px}
-		.refund-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px solid #ddd}
-		.refund-cfm-btn{background:#3daae9;color:#fff}
-		.cfm-btn:active,.return-btn:active{background:#ddd;color:#fff}
-		.mask{width:100%;height:100%;position:fixed;top:0;background:rgba(0,0,0,0.7);display:none}
-		.tips-popup-content{width:40%;height:auto;padding-bottom:30px;background:#fff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}
-		.tips-popup-content div{width:100%;text-align:center}
-		.tips-popup-content{width:30%}
-		.tips-popup-content p{text-align:center;padding:80px;font-size:20px}
-		.tips-popup-content h4{padding-left:10px;height:40px;line-height:40px;border-bottom:1px solid #eee;margin-bottom:20px}
-		.tips-cfm-btn,.tips-cancel-btn{width:100px;height:40px;margin:auto;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#3daae9;color:#fff;border:none}
-		.return-btn,.tips-cancel-btn{background:#fff;color:#555;margin-left:50px}
-		.tips-cancel-btn{border:1px solid #ddd;margin-left:20px;display:none}
-		.tips-cancel-btn.tips-show{display:block}
-		#close-btn1{top:8px;right:10px;width:18px;position:absolute;cursor:pointer}
-		.remark-wrapper{height:auto !important;padding:0px 0 8px 0}
-		.remark-wrapper textarea{width:400px;height:150px;vertical-align:text-top;resize:none}
-		.refund-methods{height:auto !important}
-		.refund-methods>div{display:inline-block}
-		.refund-methods label{vertical-align:top;line-height:50px}
-		.refund-amount{width:80px;vertical-align:bottom !important;margin-left:5px;position:relative;top:2px}
-		.weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
-
-	</style>
-	<script type="text/javascript">
-		$(document).ready(function() {
-			//$("#name").focus();
-			$("#inputForm").validate({
-				submitHandler: function(form){
-					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>
+    <title>退款表--供应商退款给采美管理</title>
+    <meta name="decorator" content="default"/>
+    <style>
+        .table th {
+            text-align: center
+        }
+
+        .table td {
+            text-align: center
+        }
+
+        .refund-form h4 {
+            width: 96%;
+            margin-left: 2%;
+            padding-bottom: 20px;
+            text-align: center;
+            border-bottom: 1px solid #eee
+        }
+
+        .required {
+            color: red
+        }
+
+        .refund-form label {
+            width: 100px;
+            text-align: right;
+            vertical-align: middle;
+            font-weight: 600
+        }
+
+        .refund-form-top {
+            padding: 10px 0
+        }
+
+        .refund-form-top > div, .refund-form-bottom > div {
+            width: 94%;
+            margin-left: 3%;
+            height: 50px;
+            line-height: 50px;
+            border-bottom: 1px solid #eee;
+            white-space: nowrap
+        }
+
+        .refund-form-top input {
+            vertical-align: baseline
+        }
+
+        .refund-form-top > div:last-child span {
+            margin-left: 15px
+        }
+
+        .refund-form-top > div:last-child span:nth-of-type(1) {
+            margin-left: 0
+        }
+
+        .pay-list-item {
+            margin-bottom: 30px
+        }
+
+        .pay-table {
+            width: 96%;
+            margin-left: 2%;
+            margin-bottom: 10px
+        }
+
+        .pay-table th {
+            background: #f9f9f9
+        }
+
+        .pay-table tr:first-child th {
+            background: #eee !important
+        }
+
+        .pay-table td {
+            background: #fff !important
+        }
+
+        /*.supplier-fee{text-align:left !important;padding-top:20px !important;padding-left:20px !important}*/
+        .need-to-pay {
+            width: 90px
+        }
+
+        .refund-form-bottom label {
+            width: 110px
+        }
+
+        .used-amount {
+            width: 80px;
+            margin-top: 6px
+        }
+
+        .process-details span {
+            width: 140px;
+            margin-left: 50px;
+            font-weight: 600
+        }
+
+        .process-for-label {
+            margin-left: 0 !important
+        }
+
+        .process-details div {
+            display: inline-block
+        }
+
+        .refund-btn {
+            width: 96%;
+            margin-left: 2%;
+            text-align: center;
+            height: 60px;
+            line-height: 60px;
+            margin-top: 30px
+        }
+
+        .refund-btn button {
+            width: 100px;
+            height: 35px;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px;
+            border: none;
+            border: 1px solid #ddd
+        }
+
+        .refund-cfm-btn {
+            background: #3daae9;
+            color: #fff
+        }
+
+        .cfm-btn:active, .return-btn:active {
+            background: #ddd;
+            color: #fff
+        }
+
+        .mask {
+            width: 100%;
+            height: 100%;
+            position: fixed;
+            top: 0;
+            background: rgba(0, 0, 0, 0.7);
+            display: none
+        }
+
+        .tips-popup-content {
+            width: 40%;
+            height: auto;
+            padding-bottom: 30px;
+            background: #fff;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%)
+        }
+
+        .tips-popup-content div {
+            width: 100%;
+            text-align: center
+        }
+
+        .tips-popup-content {
+            width: 30%
+        }
+
+        .tips-popup-content p {
+            text-align: center;
+            padding: 80px;
+            font-size: 20px
+        }
+
+        .tips-popup-content h4 {
+            padding-left: 10px;
+            height: 40px;
+            line-height: 40px;
+            border-bottom: 1px solid #eee;
+            margin-bottom: 20px
+        }
+
+        .tips-cfm-btn, .tips-cancel-btn {
+            width: 100px;
+            height: 40px;
+            margin: auto;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px;
+            background: #3daae9;
+            color: #fff;
+            border: none
+        }
+
+        .return-btn, .tips-cancel-btn {
+            background: #fff;
+            color: #555;
+            margin-left: 50px
+        }
+
+        .tips-cancel-btn {
+            border: 1px solid #ddd;
+            margin-left: 20px;
+            display: none
+        }
+
+        .tips-cancel-btn.tips-show {
+            display: block
+        }
+
+        #close-btn1 {
+            top: 8px;
+            right: 10px;
+            width: 18px;
+            position: absolute;
+            cursor: pointer
+        }
+
+        .remark-wrapper {
+            height: auto !important;
+            padding: 0px 0 8px 0
+        }
+
+        .remark-wrapper textarea {
+            width: 400px;
+            height: 150px;
+            vertical-align: text-top;
+            resize: none
+        }
+
+        .refund-methods {
+            height: auto !important
+        }
+
+        .refund-methods > div {
+            display: inline-block
+        }
+
+        .refund-methods label {
+            vertical-align: top;
+            line-height: 50px
+        }
+
+        .refund-amount {
+            width: 80px;
+            vertical-align: bottom !important;
+            margin-left: 5px;
+            position: relative;
+            top: 2px
+        }
+
+        .weishaIcon {
+            background: darkorange;
+            color: white;
+            margin: 0 0px;
+            padding: 0 3px;
+            font-style: normal;
+            font-size: 12px;
+            display: inline-block;
+            border-radius: 2px
+        }
+
+    </style>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            //$("#name").focus();
+            $("#inputForm").validate({
+                submitHandler: function (form) {
+                    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>
 <ul class="nav nav-tabs">
-	<li><a href="${ctx}/order/cmRefundShop/">退款列表</a></li>
-	<li class="active"><a href="${ctx}/order/cmRefundShop/toRefund?&shopOrderIDs=${cmRefundShop.shopOrderIDs}">提交退款</a></li>
-</ul><br/>
+    <li><a href="${ctx}/order/cmRefundShop/">退款列表</a></li>
+    <li class="active"><a href="${ctx}/order/cmRefundShop/toRefund?&shopOrderIDs=${cmRefundShop.shopOrderIDs}">提交退款</a>
+    </li>
+</ul>
+<br/>
 <div class="refund-form">
-	<div class="refund-form-top">
-		<div>
-			<label>退款供应商：</label>
-			<span>${cmRefundShop.shopName}</span>
-		</div>
-	</div>
-	<form id="refundForm" action="${ctx}/order/cmRefundShop/refund" method="post">
-		<div class="refund-form-content">
-			<c:forEach items="${cmRefundShop.shopOrders}" var="s">
-				<table class="table table-striped table-bordered table-condensed pay-table">
-					<tr>
-						<th>订单编号(ID)</th>
-						<th colspan="3">客户</th>
-						<th colspan="2">下单时间</th>
-						<th>订单金额</th>
-						<th colspan="3">所有子订单</th>
-						<th>订单总佣金</th>
-						<th>机构运费</th>
-						<th>收款状态</th>
-						<th colspan="3">收款金额</th>
-						<th>经理折扣</th>
-						<th>优惠券</th>
-					</tr>
-					<tr>
-						<td> ${s.orderNo}(${s.orderID})</td>
-						<td colspan="3"> ${s.buyer}</td>
-						<td colspan="2"> ${s.orderTime}</td>
-						<td>${s.payTotalFee}</td>
-						<td colspan="3">
-							<c:forEach items="${s.shopOrderNos}" var="cs">
-								${cs}<br/>
-							</c:forEach>
-						</td>
-						<td>
-							<c:if test="${empty s.brokerage}">0.00</c:if>
-							<c:if test="${not empty s.brokerage}">${s.brokerage}</c:if>
-						</td>
-						<td>
-							<label class="clubFreight"  style="display: none">
-								<c:choose>
-									<c:when test="${s.freight != -1 && s.freight != 0 && s.freight != -2 && s.returnedFreightFlag ne true}">
-										<fmt:formatNumber value="${s.freight}"/>
-									</c:when>
-									<c:otherwise>
-										<fmt:formatNumber value="0"/>
-									</c:otherwise>
-								</c:choose>
-							</label>
-							<c:if test="${s.freight == 0}">
-								包邮
-							</c:if>
-							<c:if test="${s.freight == -1}">
-								到付
-							</c:if>
-							<c:if test="${s.freight == -2}">
-								仪器到付-产品包邮
-							</c:if>
-							<c:if test="${s.freight != -1 && s.freight != 0 && s.freight != -2}">
-								<fmt:formatNumber value="${s.freight}" type="currency"/>
-								<c:if test="${s.returnedFreightFlag eq true}"><font color="red">(已退)</font></c:if>
-							</c:if>
-							<c:if test="${s.userBeans gt 0}">
-								(采美豆抵用${s.userBeans})
-							</c:if>
-						</td>
-						<td>
-							<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
-							   style="text-decoration: underline">
-								<c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
-								<c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-								<c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a>
-						</td>
-						<td colspan="3">
-							<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
-							   style="text-decoration: underline">${s.receiptTotalFee}</a>
-						</td>
-						<td>
-							<label class="discountFee"  style="display: none">
-								<c:choose>
-									<c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
-										<fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>
-									</c:when>
-									<c:otherwise>
-										0
-									</c:otherwise>
-								</c:choose>
-							</label>
-							<c:if test="${s.discountTotalFee gt 0}">
-								<c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
-									<fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"
-													  type="currency"/>
-								</c:if>
-								<c:if test="${s.discountTotalFee le s.returnedPurchaseTotalFee}">
-									¥0.00
-								</c:if>
-								<c:if test="${s.returnedPurchaseTotalFee gt 0}">
+    <div class="refund-form-top">
+        <div>
+            <label>退款供应商：</label>
+            <span>${cmRefundShop.shopName}</span>
+        </div>
+    </div>
+    <form id="refundForm" action="${ctx}/order/cmRefundShop/refund" method="post">
+        <div class="refund-form-content">
+            <c:forEach items="${cmRefundShop.shopOrders}" var="s">
+                <table class="table table-striped table-bordered table-condensed pay-table">
+                    <tr>
+                        <th>订单编号(ID)</th>
+                        <th colspan="3">客户</th>
+                        <th colspan="2">下单时间</th>
+                        <th>订单金额</th>
+                        <th colspan="3">所有子订单</th>
+                        <th>订单总佣金</th>
+                        <th>机构运费</th>
+                        <th>收款状态</th>
+                        <th colspan="3">收款金额</th>
+                        <th>经理折扣</th>
+                        <th>优惠券</th>
+                    </tr>
+                    <tr>
+                        <td> ${s.orderNo}(${s.orderID})</td>
+                        <td colspan="3"> ${s.buyer}</td>
+                        <td colspan="2"> ${s.orderTime}</td>
+                        <td>${s.payTotalFee}</td>
+                        <td colspan="3">
+                            <c:forEach items="${s.shopOrderNos}" var="cs">
+                                ${cs}<br/>
+                            </c:forEach>
+                        </td>
+                        <td>
+                            <c:if test="${empty s.brokerage}">0.00</c:if>
+                            <c:if test="${not empty s.brokerage}">${s.brokerage}</c:if>
+                        </td>
+                        <td>
+                            <label class="clubFreight" style="display: none">
+                                <c:choose>
+                                    <c:when test="${s.freight != -1 && s.freight != 0 && s.freight != -2 && s.returnedFreightFlag ne true}">
+                                        <fmt:formatNumber value="${s.freight}"/>
+                                    </c:when>
+                                    <c:otherwise>
+                                        <fmt:formatNumber value="0"/>
+                                    </c:otherwise>
+                                </c:choose>
+                            </label>
+                            <c:if test="${s.freight == 0}">
+                                包邮
+                            </c:if>
+                            <c:if test="${s.freight == -1}">
+                                到付
+                            </c:if>
+                            <c:if test="${s.freight == -2}">
+                                仪器到付-产品包邮
+                            </c:if>
+                            <c:if test="${s.freight != -1 && s.freight != 0 && s.freight != -2}">
+                                <fmt:formatNumber value="${s.freight}" type="currency"/>
+                                <c:if test="${s.returnedFreightFlag eq true}"><font color="red">(已退)</font></c:if>
+                            </c:if>
+                            <c:if test="${s.userBeans gt 0}">
+                                (采美豆抵用${s.userBeans})
+                            </c:if>
+                        </td>
+                        <td>
+                            <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+                               style="text-decoration: underline">
+                                <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
+                                <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                                <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if>
+                            </a>
+                        </td>
+                        <td colspan="3">
+                            <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
+                               style="text-decoration: underline">${s.receiptTotalFee}</a>
+                        </td>
+                        <td>
+                            <label class="discountFee" style="display: none">
+                                <c:choose>
+                                    <c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
+                                        <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>
+                                    </c:when>
+                                    <c:otherwise>
+                                        0
+                                    </c:otherwise>
+                                </c:choose>
+                            </label>
+                            <c:if test="${s.discountTotalFee gt 0}">
+                                <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
+                                    <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"
+                                                      type="currency"/>
+                                </c:if>
+                                <c:if test="${s.discountTotalFee le s.returnedPurchaseTotalFee}">
+                                    ¥0.00
+                                </c:if>
+                                <c:if test="${s.returnedPurchaseTotalFee gt 0}">
                                 <span style="color: red">
                                     (原<fmt:formatNumber value="${s.discountTotalFee}" type="currency"/>，因退货折扣取消
                                     <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
-										<fmt:formatNumber value="${s.returnedPurchaseTotalFee}" type="currency"/>
-									</c:if>
+                                        <fmt:formatNumber value="${s.returnedPurchaseTotalFee}" type="currency"/>
+                                    </c:if>
                                     <c:if test="${s.discountTotalFee le s.returnedPurchaseTotalFee}">
-										<fmt:formatNumber value="${s.discountTotalFee}" type="currency"/>
-									</c:if>)
+                                        <fmt:formatNumber value="${s.discountTotalFee}" type="currency"/>
+                                    </c:if>)
                                 </span>
-								</c:if>
-							</c:if>
-							<c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
-						</td>
-						<td>${s.couponAmount} </td>
-					<tr/>
-					<tr>
-						<th>子订单编号(ID)</th>
-						<th colspan="3"> 供应商</th>
-						<th colspan="3">子订单佣金</th>
-						<th colspan="3">商品费</th>
-						<th>应付税费</th>
-						<th>供应商运费</th>
-						<th>付款状态</th>
-						<th colspan="3">付供应商</th>
-						<th>付第三方</th>
-						<th>成本类型</th>
-					</tr>
-					<tr>
-						<td>${s.shopOrderNo}(${s.shopOrderID})</td>
-						<td colspan="3">${s.shopName}</td>
-						<c:if test="${empty s.brokerage}"><td colspan="3" class="">0.00</td></c:if>
-						<c:if test="${not empty s.brokerage}"><td colspan="3" class="">${s.brokerage}</td></c:if>
-						<td colspan="3" class="product-fee">${s.shopProductAmount}</td>
-						<td class="taxes">
-							<fmt:formatNumber value="${s.shopTaxFee}" type="number" pattern="#,##0.00"/>
-						</td>
-
-						<td class="freight"><fmt:formatNumber value="${s.shopPostFee}" type="number"
-															  pattern="#,##0.00"/></td>
-
-						<td>
-							<c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
-									color="red">待付款</font></c:if>
-							<c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
-							<c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
-						</td>
-						<td colspan="3" class="supplier-fee">
-							<div>应付：${s.shouldPayShopAmount-s.shopOtherFee}， 已付：${s.payedShopAmount}
-								<c:if test="${s.wipePayment > 0}"><font color="red">(付款抹平￥${s.wipePayment})</font></c:if>
-							</div>
-							<div>已退：${s.refundsAmount}<%--， 待退：<span class="need-refund"><fmt:formatNumber value="${s.payedShopAmount-s.refundsAmount-s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/></span>--%></div>
-							<div>退款：<input type="number" value="0" class="refund refundMoneyInput" ></div>
-							<input type="hidden" data-shoporderid="${s.shopOrderID}" name="refundInfo" class="refundInfo" value="${s.shopOrderID}_${s.payedShopAmount-s.refundsAmount-s.shouldPayShopAmount}">
-							<input type="hidden" class="need-refund" value="${s.payedShopAmount-s.refundsAmount}">
-						</td>
-						<td class="third-party-fee">${s.shopOtherFee}</td>
-						<td>
-							<c:if test="${empty s.costType || s.costType == '1'}">固定成本</c:if>
-							<c:if test="${s.costType == '2'}">比例成本</c:if>
-						</td>
-					</tr>
-					<tr>
-						<th>商品名</th>
-						<th>规格</th>
-						<th>数量<%--（赠品）--%></th>
-						<th>退货</th>
-						<th colspan="3">单价</th>
-						<th colspan="3">机构税率 / 单税费 / 总税费</th>
-						<th>总价</th>
-						<th>利润(单)</th>
-						<th>利润(总)</th>
-						<th colspan="3">供应商税率 / 单税费 / 总税费</th>
-						<th>成本(单)</th>
-						<th>成本(总)</th>
-					</tr>
-					<c:forEach items="${s.newOrderProducts}" var="p" varStatus="pIndex">
-						<tr class="pay-product-item">
-							<input type="hidden" class="p-copId" value="${p.orderProductID}">
-							<td style="width:300px;" class="p-name">
-								<c:if test="${p.productType eq 1}"><font color="red">协商赠品:</font></c:if>
-								<c:if test="${p.productType eq 2}"><font color="red">促销赠品:</font></c:if>
-									${p.name}
-							</td>
-							<td style="width:80px;">${p.unit}</td>
-							<td class="p-num" data-num="${p.num + p.presentNum}">
-									${p.num}
-								<c:if test="${p.presentNum > 0}">(赠:${p.presentNum})</c:if>
-							</td>
-							<td><font color="${p.returnedNum>0?'red':''}">${p.returnedNum}</font></td>
-							<td colspan="3"><fmt:formatNumber value="${empty p.touchPrice?p.discountPrice:p.touchPrice}" type="number" pattern="#,##0.00"/>
-								<c:if test="${p.includedTax != null and p.includedTax != '' and p.includedTax ne 2}">
-									<font color="red">
-										（${p.includedTax eq 1?'含税':(p.invoiceType eq 1 or p.invoiceType eq 2)?'不含税-能开票':'不含税-不能开票'}）
-									</font>
-								</c:if>
-							</td>
-							<td>${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.taxRate?0.0:p.taxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
-							<td>${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.addedValueTax ?0.00:p.addedValueTax}</td>
-							<td><c:choose>
-								<c:when test="${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))}">
-									---
-								</c:when>
-								<c:otherwise>
-									<fmt:formatNumber value="${empty p.totalAddedValueTax ?0.00:(p.addedValueTax * (p.num+p.presentNum-p.returnedNum))}" type="number" pattern="#,##0.00"/>
-								</c:otherwise>
-							</c:choose></td>
-							<td><fmt:formatNumber value="${((empty p.touchPrice?p.discountPrice:p.touchPrice) + p.addedValueTax)*(p.num+p.presentNum-p.returnedNum)}" type="number" pattern="#,##0.00"/></td>
-
-							<td>
-								<c:if test="${p.productType == 0}">
-									<fmt:formatNumber value="${(empty p.touchPrice?p.discountPrice:p.touchPrice) - (p.costPrice + p.cmCostPrice + p.organizeCostPrice)}" pattern="#,##0.00"/>
-								</c:if>
-								<c:if test="${p.productType != 0}">
-									0.00
-								</c:if>
-							</td>
-
-							<td class="payCm">
-								<c:if test="${p.productType == 0}">
-									<fmt:formatNumber value="${((empty p.touchPrice?p.discountPrice:p.touchPrice) - (p.costPrice + p.cmCostPrice + p.organizeCostPrice)) * (p.num + p.presentNum - p.returnedNum)}" pattern="#,##0.00"/>
-								</c:if>
-								<c:if test="${p.productType != 0}">
-									0.00
-								</c:if>
-							</td>
-
-							<td class="p-taxes">${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.supplierTaxRate?0.0:p.supplierTaxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
-							<td class="p-taxes">${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.singleShouldPayTotalTax ?0.00:p.singleShouldPayTotalTax}</td>
-							<td class="p-taxes-t"><c:choose>
-								<c:when test="${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))}">
-									---
-								</c:when>
-								<c:otherwise>
-									<fmt:formatNumber value="${empty p.shouldPayTotalTax ?0.00:(p.singleShouldPayTotalTax * (p.num+p.presentNum-p.returnedNum))}" type="number" pattern="#,##0.00"/>
-								</c:otherwise>
-							</c:choose></td>
-							<td class="p-costprice"><fmt:formatNumber value="${p.costPrice}" type="number" pattern="#,##0.00"/></td>
-							<td><fmt:formatNumber value="${p.costPrice * (p.num + p.presentNum - p.returnedNum)}" type="number" pattern="#,##0.00"/></td>
-						</tr>
-					</c:forEach>
-				</table>
-			</c:forEach>
-		</div>
-		<div class="refund-form-bottom">
-			<div style="text-align: center">
-				<label style="text-align: right">退款总金额：</label><span id="totalRefundAmount">${cmRefundShop.refundAmount}</span>
-				<input type="hidden" id="totalAmount-hidden" name="totalAmount" value="${cmRefundShop.refundAmount}">
-			</div>
-			<div class="refund-methods">
-				<label>接收退款方式：</label>
-				<div class="refund-wrapper">
-					欠款账簿
-					<input type="number" name="refundBalanceAmount" id="refundBalanceAmount" class="refund-amount" value="0">
-					<br>
-					<%--虚拟银行--%>
-					<input type="hidden" name="refundAmount" id="refundAmount" class="refund-amount" value="0">
-				</div>
-				<%--<div class="refund-wrapper">
+                                </c:if>
+                            </c:if>
+                            <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
+                        </td>
+                        <td>${s.couponAmount} </td>
+                    <tr/>
+                    <tr>
+                        <th>子订单编号(ID)</th>
+                        <th colspan="3"> 供应商</th>
+                        <th colspan="3">子订单佣金</th>
+                        <th colspan="3">商品费</th>
+                        <th>应付税费</th>
+                        <th>供应商运费</th>
+                        <th>付款状态</th>
+                        <th colspan="3">付供应商</th>
+                        <th>付第三方</th>
+                        <th>成本类型</th>
+                    </tr>
+                    <tr>
+                        <td>${s.shopOrderNo}(${s.shopOrderID})</td>
+                        <td colspan="3">${s.shopName}</td>
+                        <c:if test="${empty s.brokerage}">
+                            <td colspan="3" class="">0.00</td>
+                        </c:if>
+                        <c:if test="${not empty s.brokerage}">
+                            <td colspan="3" class="">${s.brokerage}</td>
+                        </c:if>
+                        <td colspan="3" class="product-fee">${s.shopProductAmount}</td>
+                        <td class="taxes">
+                            <fmt:formatNumber value="${s.shopTaxFee}" type="number" pattern="#,##0.00"/>
+                        </td>
+
+                        <td class="freight"><fmt:formatNumber value="${s.shopPostFee}" type="number"
+                                                              pattern="#,##0.00"/></td>
+
+                        <td>
+                            <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+                               style="text-decoration: underline">
+                                <c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
+                                        color="red">待付款</font></c:if>
+                                <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
+                                <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
+                            </a>
+                        </td>
+                        <td colspan="3" class="supplier-fee">
+                            <div>应付：${s.shouldPayShopAmount-s.shopOtherFee}， 已付：${s.payedShopAmount}
+                                <c:if test="${s.wipePayment > 0}"><font
+                                        color="red">(付款抹平￥${s.wipePayment})</font></c:if>
+                            </div>
+                            <div>
+                                已退：${s.refundsAmount}<%--， 待退：<span class="need-refund"><fmt:formatNumber value="${s.payedShopAmount-s.refundsAmount-s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/></span>--%></div>
+                            <div>退款：<input type="number" value="0" class="refund refundMoneyInput"></div>
+                            <input type="hidden" data-shoporderid="${s.shopOrderID}" name="refundInfo"
+                                   class="refundInfo"
+                                   value="${s.shopOrderID}_${s.payedShopAmount-s.refundsAmount-s.shouldPayShopAmount}">
+                            <input type="hidden" class="need-refund" value="${s.payedShopAmount-s.refundsAmount}">
+                        </td>
+                        <td class="third-party-fee">${s.shopOtherFee}</td>
+                        <td>
+                            <c:if test="${empty s.costType || s.costType == '1'}">固定成本</c:if>
+                            <c:if test="${s.costType == '2'}">比例成本</c:if>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>商品名</th>
+                        <th>规格</th>
+                        <th>数量<%--（赠品）--%></th>
+                        <th>退货</th>
+                        <th colspan="3">单价</th>
+                        <th colspan="3">机构税率 / 单税费 / 总税费</th>
+                        <th>总价</th>
+                        <th>利润(单)</th>
+                        <th>利润(总)</th>
+                        <th colspan="3">供应商税率 / 单税费 / 总税费</th>
+                        <th>成本(单)</th>
+                        <th>成本(总)</th>
+                    </tr>
+                    <c:forEach items="${s.newOrderProducts}" var="p" varStatus="pIndex">
+                        <tr class="pay-product-item">
+                            <input type="hidden" class="p-copId" value="${p.orderProductID}">
+                            <td style="width:300px;" class="p-name">
+                                <c:if test="${p.productType eq 1}"><font color="red">协商赠品:</font></c:if>
+                                <c:if test="${p.productType eq 2}"><font color="red">促销赠品:</font></c:if>
+                                    ${p.name}
+                            </td>
+                            <td style="width:80px;">${p.unit}</td>
+                            <td class="p-num" data-num="${p.num + p.presentNum}">
+                                    ${p.num}
+                                <c:if test="${p.presentNum > 0}">(赠:${p.presentNum})</c:if>
+                            </td>
+                            <td><font color="${p.returnedNum>0?'red':''}">${p.returnedNum}</font></td>
+                            <td colspan="3"><fmt:formatNumber value="${empty p.touchPrice?p.discountPrice:p.touchPrice}"
+                                                              type="number" pattern="#,##0.00"/>
+                                <c:if test="${p.includedTax != null and p.includedTax != '' and p.includedTax ne 2}">
+                                    <font color="red">
+                                        （${p.includedTax eq 1?'含税':(p.invoiceType eq 1 or p.invoiceType eq 2)?'不含税-能开票':'不含税-不能开票'}）
+                                    </font>
+                                </c:if>
+                            </td>
+                            <td>${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.taxRate?0.0:p.taxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
+                            <td>${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.addedValueTax ?0.00:p.addedValueTax}</td>
+                            <td><c:choose>
+                                <c:when test="${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))}">
+                                    ---
+                                </c:when>
+                                <c:otherwise>
+                                    <fmt:formatNumber
+                                            value="${empty p.totalAddedValueTax ?0.00:(p.addedValueTax * (p.num+p.presentNum-p.returnedNum))}"
+                                            type="number" pattern="#,##0.00"/>
+                                </c:otherwise>
+                            </c:choose></td>
+                            <td><fmt:formatNumber
+                                    value="${((empty p.touchPrice?p.discountPrice:p.touchPrice) + p.addedValueTax)*(p.num+p.presentNum-p.returnedNum)}"
+                                    type="number" pattern="#,##0.00"/></td>
+
+                            <td>
+                                <c:if test="${p.productType == 0}">
+                                    <fmt:formatNumber
+                                            value="${(empty p.touchPrice?p.discountPrice:p.touchPrice) - (p.costPrice + p.cmCostPrice + p.organizeCostPrice)}"
+                                            pattern="#,##0.00"/>
+                                </c:if>
+                                <c:if test="${p.productType != 0}">
+                                    0.00
+                                </c:if>
+                            </td>
+
+                            <td class="payCm">
+                                <c:if test="${p.productType == 0}">
+                                    <fmt:formatNumber
+                                            value="${((empty p.touchPrice?p.discountPrice:p.touchPrice) - (p.costPrice + p.cmCostPrice + p.organizeCostPrice)) * (p.num + p.presentNum - p.returnedNum)}"
+                                            pattern="#,##0.00"/>
+                                </c:if>
+                                <c:if test="${p.productType != 0}">
+                                    0.00
+                                </c:if>
+                            </td>
+
+                            <td class="p-taxes">${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.supplierTaxRate?0.0:p.supplierTaxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
+                            <td class="p-taxes">${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.singleShouldPayTotalTax ?0.00:p.singleShouldPayTotalTax}</td>
+                            <td class="p-taxes-t"><c:choose>
+                                <c:when test="${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))}">
+                                    ---
+                                </c:when>
+                                <c:otherwise>
+                                    <fmt:formatNumber
+                                            value="${empty p.shouldPayTotalTax ?0.00:(p.singleShouldPayTotalTax * (p.num+p.presentNum-p.returnedNum))}"
+                                            type="number" pattern="#,##0.00"/>
+                                </c:otherwise>
+                            </c:choose></td>
+                            <td class="p-costprice"><fmt:formatNumber value="${p.costPrice}" type="number"
+                                                                      pattern="#,##0.00"/></td>
+                            <td><fmt:formatNumber value="${p.costPrice * (p.num + p.presentNum - p.returnedNum)}"
+                                                  type="number" pattern="#,##0.00"/></td>
+                        </tr>
+                    </c:forEach>
+                </table>
+            </c:forEach>
+        </div>
+        <div class="refund-form-bottom">
+            <div style="text-align: center">
+                <label style="text-align: right">退款总金额：</label><span
+                    id="totalRefundAmount">${cmRefundShop.refundAmount}</span>
+                <input type="hidden" id="totalAmount-hidden" name="totalAmount" value="${cmRefundShop.refundAmount}">
+            </div>
+            <div class="refund-methods">
+                <label>接收退款方式：</label>
+                <div class="refund-wrapper">
+                    欠款账簿
+                    <input type="number" name="refundBalanceAmount" id="refundBalanceAmount" class="refund-amount"
+                           value="0">
+                    <br>
+                    <%--虚拟银行--%>
+                    <input type="hidden" name="refundAmount" id="refundAmount" class="refund-amount" value="0">
+                </div>
+                <%--<div class="refund-wrapper">
                     <select name="refundType" id="">
                         &lt;%&ndash;<option value="6">账户余额</option>&ndash;%&gt;
                         <option value="1">建设银行7297</option>
@@ -343,206 +584,206 @@
                         <option value="6">虚拟银行0000</option>
                     </select>
                 </div>--%>
-				<input type="hidden" name="shopID" value="${cmRefundShop.shopID}">
-			</div>
-		</div>
-		<div class="remark-wrapper">
-			<label>备注：</label>
-			<textarea id="refund-remark" name="remark" maxlength="200" cols="30" rows="10"></textarea>
-			<i><span class="count-change">0</span>/200</i>
-		</div>
+                <input type="hidden" name="shopID" value="${cmRefundShop.shopID}">
+            </div>
+        </div>
+        <div class="remark-wrapper">
+            <label>备注：</label>
+            <textarea id="refund-remark" name="remark" maxlength="200" cols="30" rows="10"></textarea>
+            <i><span class="count-change">0</span>/200</i>
+        </div>
 </div>
 </form>
 </div>
 <div class="refund-btn">
-	<button class="refund-cfm-btn">确定</button>
-	<button class="return-btn" onclick="javascript:history.go(-1);">返回</button>
+    <button class="refund-cfm-btn">确定</button>
+    <button class="return-btn" onclick="javascript:history.go(-1);">返回</button>
 </div>
 <div class="mask tips-popup">
-	<div class="tips-popup-content">
-		<h4>信息提示</h4>
-		<p></p>
-		<div>
-			<button class="tips-cfm-btn tips-cfm-directly" type="button">确定</button>
-			<button class="tips-cancel-btn" type="button">取消</button>
-		</div>
-		<img id="close-btn1" src="/static/images/close-btn.png" alt="close-btn">
-	</div>
+    <div class="tips-popup-content">
+        <h4>信息提示</h4>
+        <p></p>
+        <div>
+            <button class="tips-cfm-btn tips-cfm-directly" type="button">确定</button>
+            <button class="tips-cancel-btn" type="button">取消</button>
+        </div>
+        <img id="close-btn1" src="/static/images/close-btn.png" alt="close-btn">
+    </div>
 </div>
 
 <script>
-	//监测从后台获取的可编辑文字、键盘输入的文字字数的变化，并赋值给span
-	$(function () {
-		var text = $('#refund-remark').val();
-		var len = text.length;
-		$('#refund-remark').next().find('span').html(len);
-		$('textarea').keyup(function () {
-			var text = $(this).val();
-			len = text.length;
-			if (len > 200) {
-				return false;
-			}
-			$(this).next().find('span').html(len);
-		})
-	});
+    //监测从后台获取的可编辑文字、键盘输入的文字字数的变化，并赋值给span
+    $(function () {
+        var text = $('#refund-remark').val();
+        var len = text.length;
+        $('#refund-remark').next().find('span').html(len);
+        $('textarea').keyup(function () {
+            var text = $(this).val();
+            len = text.length;
+            if (len > 200) {
+                return false;
+            }
+            $(this).next().find('span').html(len);
+        })
+    });
 </script>
 
 <script>
-	(function () {
-		var nullInputEle = '',
-				refundValArr =[],
-				isflg = false;
-		//合并单元格
-		var payTableEle = $('.pay-table'),
-				payProductEle = $('.pay-product-item');
-		payTableEle.each(function (i,l) {
-			var leftLength = $(this).find('tr').length,
-					productLength = $(this).find('.pay-product-item').length;
-			$(this).find('.mergeRows').attr('rowspan',productLength);
-		});
-
-		$('.tips-cancel-btn, #close-btn1').on('click',function() {
-			$('.tips-popup').hide();
-			if(isflg) {
-				nullInputEle.select();
-			}
-		});
-		$('.refund').each(function (index,item) {
-			var _value = parseFloat($(this).val()).toFixed(2);
-			refundValArr.push(_value);
-		});
-		$.each(refundValArr,function(i,ele){
-			$('.refund').eq(i).val(ele);
-		})
-		$('body').on('input propertychange','.refund',function() {
-			var thisEle = $(this), wrapper = thisEle.parents(".supplier-fee"),
-					thisVal = thisEle.val(),
-					totalAmount = 0,
-					alreadyPaid = Number(wrapper.find('.need-refund').val());
-			if(thisVal.length > 8){
-				wrapper.find('.refund').val(thisVal.slice(0,8));
-			}
-			if((thisVal > alreadyPaid) ) {
-				thisEle.val(alreadyPaid);
-				thisVal = alreadyPaid;
-			}
-			$('.refund').each(function (index, ele) {
-				totalAmount+= Number($(this).val());
-			});
-			$('#totalRefundAmount').text(totalAmount.toFixed(2));
-			$('#refundBalanceAmount').val(totalAmount);
-			/*$('#totalRefundAmount-hidden').val(totalAmount);
+    (function () {
+        var nullInputEle = '',
+            refundValArr = [],
+            isflg = false;
+        //合并单元格
+        var payTableEle = $('.pay-table'),
+            payProductEle = $('.pay-product-item');
+        payTableEle.each(function (i, l) {
+            var leftLength = $(this).find('tr').length,
+                productLength = $(this).find('.pay-product-item').length;
+            $(this).find('.mergeRows').attr('rowspan', productLength);
+        });
+
+        $('.tips-cancel-btn, #close-btn1').on('click', function () {
+            $('.tips-popup').hide();
+            if (isflg) {
+                nullInputEle.select();
+            }
+        });
+        $('.refund').each(function (index, item) {
+            var _value = parseFloat($(this).val()).toFixed(2);
+            refundValArr.push(_value);
+        });
+        $.each(refundValArr, function (i, ele) {
+            $('.refund').eq(i).val(ele);
+        })
+        $('body').on('input propertychange', '.refund', function () {
+            var thisEle = $(this), wrapper = thisEle.parents(".supplier-fee"),
+                thisVal = thisEle.val(),
+                totalAmount = 0,
+                alreadyPaid = Number(wrapper.find('.need-refund').val());
+            if (thisVal.length > 8) {
+                wrapper.find('.refund').val(thisVal.slice(0, 8));
+            }
+            if ((thisVal > alreadyPaid)) {
+                thisEle.val(alreadyPaid);
+                thisVal = alreadyPaid;
+            }
+            $('.refund').each(function (index, ele) {
+                totalAmount += Number($(this).val());
+            });
+            $('#totalRefundAmount').text(totalAmount.toFixed(2));
+            $('#refundBalanceAmount').val(totalAmount);
+            /*$('#totalRefundAmount-hidden').val(totalAmount);
             $('.refund-amount').val(totalAmount);*/
-			var refundInfo = wrapper.find('.refundInfo');
-			refundInfo.val(refundInfo.attr('data-shoporderid') + '_' + thisVal);
-		});
-		$('body').on('input propertychange','#refundBalanceAmount',function() {
-			var thisVal = $(this).val()*1;
-			var totalAmount = $('#totalRefundAmount').text()*1;
-			if (thisVal > totalAmount) {
-				alertx("金额不能大于退款总金额", function(){
-					$('#refundBalanceAmount').val(totalAmount);
-					$('#refundAmount').val(0);
-				});
-			} else {
-				if(thisVal < 0) {
-					$(this).val(0);
-				}
-				var totalAmount = $('#totalRefundAmount').text()*1;
-				$('#refundAmount').val(totalAmount - thisVal);
-			}
-		});
-		$('body').on('input propertychange','#refundAmount',function() {
-			var thisVal = $(this).val()*1;
-			var totalAmount = $('#totalRefundAmount').text()*1;
-			if (thisVal > totalAmount) {
-				alertx("金额不能大于退款总金额",function(){
-					$('#refundAmount').val(totalAmount);
-					$('#refundBalanceAmount').val(0);
-				});
-			} else {
-				if(thisVal < 0) {
-					$(this).val(0);
-				}
-				$('#refundBalanceAmount').val(totalAmount - thisVal);
-			}
-		});
-
-		function showTips(title,text) {
-			$('.tips-popup h4').text(title);
-			$('.tips-popup p').text(text);
-			$('.tips-popup').show();
-		}
-
-		$('.tips-cfm-directly').on('click',function() {
-			if($('.tips-cfm-btn').hasClass('tips-cfm-directly')) {
-				$('.tips-popup').hide();
-			} else {
-				$('#refundForm').submit();
-			}
-			if(isflg) {
-				nullInputEle.select();
-			}
-		})
-		$('.refund-cfm-btn').on('click',function() {
-			var isNullFlag = false;
-			$('.refund').each(function (index, ele) {
-				var _thisVal = $(this).val();
-				if( _thisVal <= 0){
-					isflg =true;
-					isNullFlag = true;
-					nullInputEle = $(this);
-				}
-			});
-
-			if(isNullFlag){
-				$('.tips-cfm-btn').addClass('tips-cfm-directly');
-				$('.tips-cancel-btn').hide();
-				showTips('信息提示','退款金额不能为空');
-				return false;
-			}
-			$('.tips-cfm-btn').removeClass('tips-cfm-directly');
-			$('.tips-cancel-btn').show();
-			showTips('确认提示','确定操作已退付款？');
-		})
-
-		var payTableEle = $('.pay-table'),
-				payProductEle = $('.pay-product-item');
-		payTableEle.each(function (i,l) {
-			var productLength = $(this).find('.pay-product-item').length;
-			// 商品列表合并单元格
-			$(this).find('.mergeRows').attr('rowspan',productLength);
-		});
-
-		$('.tips-cancel-btn, #close-btn1').on('click',function() {
-			$('.tips-popup').hide();
-		})
-		$('.tips-cfm-directly').on('click',function() {
-			if($('.tips-cfm-btn').hasClass('tips-cfm-directly')) {
-				$('.tips-popup').hide();
-			}
-		})
-		$('.pay-table').each(function(){
-			var thisEle = $(this),
-					totalComissionVal = 0,
-					resVal = '';
-			totalComissionEle = thisEle.find('.payCm'),
-					comissionEle = thisEle.find('.payCm-t'),
-					thirdPartyVal = thisEle.find('.third-party-fee').text().replace(',',''),
-					freightVal = thisEle.find('.freight').text().replace(',',''),
-					clubFreight = Number(thisEle.find('.clubFreight').text().replace(',','')),
-					discountFee = Number(thisEle.find('.discountFee').text().replace(',',''));
-			totalComissionEle.each(function(){
-				totalComissionVal += Number($(this).text().replace(',',''));
-			})
-			resVal = (totalComissionVal + clubFreight - discountFee - thirdPartyVal - freightVal).toFixed(2);
-			comissionEle.text(resVal);
-		})
-
-		$('.export').on('click',function() {
-			window.print();
-		})
-	})()
+            var refundInfo = wrapper.find('.refundInfo');
+            refundInfo.val(refundInfo.attr('data-shoporderid') + '_' + thisVal);
+        });
+        $('body').on('input propertychange', '#refundBalanceAmount', function () {
+            var thisVal = $(this).val() * 1;
+            var totalAmount = $('#totalRefundAmount').text() * 1;
+            if (thisVal > totalAmount) {
+                alertx("金额不能大于退款总金额", function () {
+                    $('#refundBalanceAmount').val(totalAmount);
+                    $('#refundAmount').val(0);
+                });
+            } else {
+                if (thisVal < 0) {
+                    $(this).val(0);
+                }
+                var totalAmount = $('#totalRefundAmount').text() * 1;
+                $('#refundAmount').val(totalAmount - thisVal);
+            }
+        });
+        $('body').on('input propertychange', '#refundAmount', function () {
+            var thisVal = $(this).val() * 1;
+            var totalAmount = $('#totalRefundAmount').text() * 1;
+            if (thisVal > totalAmount) {
+                alertx("金额不能大于退款总金额", function () {
+                    $('#refundAmount').val(totalAmount);
+                    $('#refundBalanceAmount').val(0);
+                });
+            } else {
+                if (thisVal < 0) {
+                    $(this).val(0);
+                }
+                $('#refundBalanceAmount').val(totalAmount - thisVal);
+            }
+        });
+
+        function showTips(title, text) {
+            $('.tips-popup h4').text(title);
+            $('.tips-popup p').text(text);
+            $('.tips-popup').show();
+        }
+
+        $('.tips-cfm-directly').on('click', function () {
+            if ($('.tips-cfm-btn').hasClass('tips-cfm-directly')) {
+                $('.tips-popup').hide();
+            } else {
+                $('#refundForm').submit();
+            }
+            if (isflg) {
+                nullInputEle.select();
+            }
+        })
+        $('.refund-cfm-btn').on('click', function () {
+            var isNullFlag = false;
+            $('.refund').each(function (index, ele) {
+                var _thisVal = $(this).val();
+                if (_thisVal <= 0) {
+                    isflg = true;
+                    isNullFlag = true;
+                    nullInputEle = $(this);
+                }
+            });
+
+            if (isNullFlag) {
+                $('.tips-cfm-btn').addClass('tips-cfm-directly');
+                $('.tips-cancel-btn').hide();
+                showTips('信息提示', '退款金额不能为空');
+                return false;
+            }
+            $('.tips-cfm-btn').removeClass('tips-cfm-directly');
+            $('.tips-cancel-btn').show();
+            showTips('确认提示', '确定操作已退付款？');
+        })
+
+        var payTableEle = $('.pay-table'),
+            payProductEle = $('.pay-product-item');
+        payTableEle.each(function (i, l) {
+            var productLength = $(this).find('.pay-product-item').length;
+            // 商品列表合并单元格
+            $(this).find('.mergeRows').attr('rowspan', productLength);
+        });
+
+        $('.tips-cancel-btn, #close-btn1').on('click', function () {
+            $('.tips-popup').hide();
+        })
+        $('.tips-cfm-directly').on('click', function () {
+            if ($('.tips-cfm-btn').hasClass('tips-cfm-directly')) {
+                $('.tips-popup').hide();
+            }
+        })
+        $('.pay-table').each(function () {
+            var thisEle = $(this),
+                totalComissionVal = 0,
+                resVal = '';
+            totalComissionEle = thisEle.find('.payCm'),
+                comissionEle = thisEle.find('.payCm-t'),
+                thirdPartyVal = thisEle.find('.third-party-fee').text().replace(',', ''),
+                freightVal = thisEle.find('.freight').text().replace(',', ''),
+                clubFreight = Number(thisEle.find('.clubFreight').text().replace(',', '')),
+                discountFee = Number(thisEle.find('.discountFee').text().replace(',', ''));
+            totalComissionEle.each(function () {
+                totalComissionVal += Number($(this).text().replace(',', ''));
+            })
+            resVal = (totalComissionVal + clubFreight - discountFee - thirdPartyVal - freightVal).toFixed(2);
+            comissionEle.text(resVal);
+        })
+
+        $('.export').on('click', function () {
+            window.print();
+        })
+    })()
 </script>
 </body>
 </html>

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

@@ -367,11 +367,13 @@
                     <td colspan="2"><fmt:formatNumber value="${s.payTotalFee}" type="number" pattern="#,##0.00"/></td>
                     <td colspan="3">${s.orderTime}</td>
                         <%--此处对应订单列表收款状态--%>
-                    <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
+                    <td>
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
                            style="text-decoration: underline">
-                        <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
-                        <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-                        <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a>
+                            <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
+                            <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                            <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if>
+                        </a>
                     </td>
                     <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
                            style="text-decoration: underline">${s.receiptTotalFee}</a></td>
@@ -445,11 +447,15 @@
                                                           pattern="#,##0.00"/></td>
                     <td colspan="3" class="product-fee"><fmt:formatNumber value="${s.shopProductAmount}" type="number"
                                                                           pattern="#,##0.00"/></td>
-                    <td colspan="2"><c:if test="${s.settleStatus == 1}"><font
-                            color="red">待结算</font></c:if>
-                        <c:if test="${s.settleStatus == 2}"><font color="#ff8c00">部分结算</font></c:if>
-                        <c:if test="${s.settleStatus == 3 || empty s.settleStatus}"><font
-                                color="green">已结算</font></c:if></td>
+                    <td colspan="2">
+                        <a href="${ctx}/shopOrder/settleRecord?shopOrderID=${s.shopOrderID}"
+                           style="text-decoration: underline">
+                            <c:if test="${s.settleStatus == 1}"><font color="red">待结算</font></c:if>
+                            <c:if test="${s.settleStatus == 2}"><font color="#ff8c00">部分结算</font></c:if>
+                            <c:if test="${s.settleStatus == 3 || empty s.settleStatus}"><font
+                                    color="green">已结算</font></c:if>
+                        </a>
+                    </td>
                     <td colspan="3" class="taxes"><fmt:formatNumber value="${s.shopTaxFee}" type="number"
                                                                     pattern="#,##0.00"/></td>
                     <td class="supplier-fee">
@@ -474,7 +480,8 @@
                     <input type="hidden" class="proportional" value="${s.proportional}">
                     <input type="hidden" class="modifyShouldPayNote" value="${s.modifyShouldPayNote}">
                     <td class="third-party-fee">
-                        <fmt:formatNumber value="${s.shopOtherFee + s.cmShopOtherFee}" type="number" pattern="#,##0.00"/>
+                        <fmt:formatNumber value="${s.shopOtherFee + s.cmShopOtherFee}" type="number"
+                                          pattern="#,##0.00"/>
                         <c:if test="${s.shopOtherFee > 0 and s.cmShopOtherFee > 0}">
                             <font color="red">（采美中介费￥${s.cmShopOtherFee}，第三方中介费￥${s.shopOtherFee}）</font>
                         </c:if>

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

@@ -278,7 +278,16 @@
             margin-left: 10px
         }
 
-        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
+        .weishaIcon {
+            background: darkorange;
+            color: white;
+            margin: 0 0px;
+            padding: 0 3px;
+            font-style: normal;
+            font-size: 12px;
+            display: inline-block;
+            border-radius: 2px
+        }
 
     </style>
     <script type="text/javascript">
@@ -292,9 +301,9 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-     <shiro:hasPermission name="order:cmPayShop:split">
-         <li class="active tab-li"><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
-     </shiro:hasPermission>
+    <shiro:hasPermission name="order:cmPayShop:split">
+        <li class="active tab-li"><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
+    </shiro:hasPermission>
 </ul>
 <form:form id="searchForm"
            action="${ctx}/splitAccount/split" method="post" class="breadcrumb form-search">
@@ -302,7 +311,7 @@
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <div class="pay-status">
         <span style="color: red">每次选择一个子订单申请分账，系统将佣金分账给采美，付供应商的金额依然还在合利宝账户，需要再进行手动结算。 </span>
-<%--        <input id="btnSubmit" class="btn btn-primary" type="submit" onclick="return confirmx('确定将展示的子订单全部分账吗？', '${ctx}/splitAccount/split')" value="手动分账"/>--%>
+            <%--        <input id="btnSubmit" class="btn btn-primary" type="submit" onclick="return confirmx('确定将展示的子订单全部分账吗？', '${ctx}/splitAccount/split')" value="手动分账"/>--%>
     </div>
 </form:form>
 <sys:message content="${message}"/>
@@ -313,7 +322,8 @@
             <table class="table table-striped table-bordered table-condensed pay-table">
                 <tr>
                     <th style="width:20px;" rowspan="6">
-                        <input type="checkbox" class="checkShop" data-shoporderid="${s.shopOrderID}" data-shopid="${s.shopID}" onclick="changeCheck(this)"/>
+                        <input type="checkbox" class="checkShop" data-shoporderid="${s.shopOrderID}"
+                               data-shopid="${s.shopID}" onclick="changeCheck(this)"/>
                     </th>
                     <th>子订单编号(ID)</th>
                     <th colspan="3">订单编号(ID)</th>
@@ -331,12 +341,16 @@
                     <td colspan="2"><fmt:formatNumber value="${s.payTotalFee}" type="number" pattern="#,##0.00"/></td>
                     <td colspan="3">${s.orderTime}</td>
                         <%--此处对应订单列表收款状态--%>
-                    <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">
-                        <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
-                        <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-                        <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a>
+                    <td>
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+                           style="text-decoration: underline">
+                            <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
+                            <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                            <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if>
+                        </a>
                     </td>
-                    <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">${s.receiptTotalFee}</a></td>
+                    <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
+                           style="text-decoration: underline">${s.receiptTotalFee}</a></td>
                     <td colspan="3">
                         <c:if test="${s.discountTotalFee gt 0}">
                             <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
@@ -407,21 +421,30 @@
                                                           pattern="#,##0.00"/></td>
                     <td colspan="3" class="product-fee"><fmt:formatNumber value="${s.shopProductAmount}" type="number"
                                                                           pattern="#,##0.00"/></td>
-                    <td colspan="2"><c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
-                            color="red">待付款</font></c:if>
-                        <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
-                        <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if></td>
+                    <td colspan="2">
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+                           style="text-decoration: underline">
+                            <c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font color="red">待付款</font></c:if>
+                            <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
+                            <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
+                        </a>
+                    </td>
                     <td colspan="3" class="taxes"><fmt:formatNumber value="${s.shopTaxFee}" type="number"
                                                                     pattern="#,##0.00"/></td>
                     <td class="supplier-fee">
                         <c:if test="${s.differenceType ne 1 && s.differenceType ne 2 }">
-                            <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount-s.shopOtherFee}" type="number" pattern="#,##0.00"/></font>
+                            <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount-s.shopOtherFee}"
+                                                                    type="number" pattern="#,##0.00"/></font>
                         </c:if>
                         <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                            <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice-s.shopOtherFee}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                            <font color="black"><fmt:formatNumber
+                                    value="${s.shouldPayShopAmount+s.differencePrice-s.shopOtherFee}"/></font><font
+                                color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                         </c:if>
                         <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                            <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice-s.shopOtherFee}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                            <font color="black"><fmt:formatNumber
+                                    value="${s.shouldPayShopAmount-s.differencePrice-s.shopOtherFee}"/></font><font
+                                color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                         </c:if>
                     </td>
                     <input type="hidden" class="payedShopAmount" value="${s.payedShopAmount}">
@@ -430,7 +453,8 @@
                     <input type="hidden" class="proportional" value="${s.proportional}">
                     <input type="hidden" class="modifyShouldPayNote" value="${s.modifyShouldPayNote}">
                     <td class="third-party-fee">
-                        <fmt:formatNumber value="${s.shopOtherFee + s.cmShopOtherFee}" type="number" pattern="#,##0.00"/>
+                        <fmt:formatNumber value="${s.shopOtherFee + s.cmShopOtherFee}" type="number"
+                                          pattern="#,##0.00"/>
                         <c:if test="${s.shopOtherFee > 0 and s.cmShopOtherFee > 0}">
                             <font color="red">（采美中介费￥${s.cmShopOtherFee}，第三方中介费￥${s.shopOtherFee}）</font>
                         </c:if>
@@ -513,7 +537,8 @@
                                               type="number" pattern="#,##0.00"/></td>
                     </tr>
                     <div class="pay-more-func">
-                        <a id="applyShopOtherFee" href="${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=${s.shopOrderID}&payType=2">付第三方申请</a>
+                        <a id="applyShopOtherFee"
+                           href="${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=${s.shopOrderID}&payType=2">付第三方申请</a>
                     </div>
                 </c:forEach>
             </table>
@@ -605,7 +630,7 @@
     <p style="text-align: center;"><font color="#1e90ff">暂无待分账子订单……</font></p>
 </c:if>
 <script>
-    function changeCheck(el){
+    function changeCheck(el) {
         var checked = $('input[type=checkbox]:checked');
         // if (checked.length > 1) {
         //     // $(".checkShop").attr('disabled','true');
@@ -803,8 +828,8 @@
         });
 
         $('#apply').on('click', function () {
-            top.$.jBox.confirm('确定对该子订单申请分账吗?','系统提示',function(v,h,f){
-                if(v=="ok"){
+            top.$.jBox.confirm('确定对该子订单申请分账吗?', '系统提示', function (v, h, f) {
+                if (v == "ok") {
                     var checked = $('.pay-wrapper input[type=checkbox]:checked'), params = '?';
                     for (var i = 0; i < checked.length; i++) {
                         var shoporderId = $(checked[i]).attr('data-shoporderid');
@@ -825,7 +850,6 @@
             });
 
 
-
         });
 
         <%--//付第三方--%>

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

@@ -325,7 +325,7 @@
                     <td colspan="2"><fmt:formatNumber value="${s.payTotalFee}" type="number" pattern="#,##0.00"/></td>
                     <td colspan="3">${s.orderTime}</td>
                         <%--此处对应订单列表收款状态--%>
-                    <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">
+                    <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1" style="text-decoration: underline">
                         <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
                         <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
                         <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a>
@@ -402,10 +402,13 @@
                                                           pattern="#,##0.00"/></td>
                     <td colspan="3" class="product-fee"><fmt:formatNumber value="${s.shopProductAmount}" type="number"
                                                                           pattern="#,##0.00"/></td>
-                    <td colspan="2"><c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
-                            color="red">待付款</font></c:if>
+                    <td colspan="2">
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1" style="text-decoration: underline">
+                        <c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font color="red">待付款</font></c:if>
                         <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
-                        <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if></td>
+                        <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
+                        </a>
+                    </td>
                     <td colspan="3" class="taxes"><fmt:formatNumber value="${s.shopTaxFee}" type="number"
                                                                     pattern="#,##0.00"/></td>
                     <td class="supplier-fee">

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

@@ -121,11 +121,12 @@
         <td colspan="3"><a href="${ctx}/order/detail?id=${s.orderID}">${s.orderNo}(${s.orderID})</a></td>
         <td colspan="2">${s.payTotalFee}</td>
         <td colspan="3">${s.orderTime}</td>
-        <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
+        <td>
+            <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
                style="text-decoration: underline">
-            <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
-            <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-            <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a></td>
+                <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
+                <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a></td>
         <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
                style="text-decoration: underline">${s.receiptTotalFee}</a></td>
         <td colspan="2">
@@ -202,19 +203,23 @@
         </td>
         <td class="freight"><fmt:formatNumber value="${s.shopPostFee}" type="number" pattern="#,##0.00"/></td>
         <td colspan="3" class="product-fee">${s.shopProductAmount}</td>
-        <td colspan="2"><c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
-                color="red">待付款</font></c:if>
-            <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
-            <c:if test="${s.payStatus == 3}"><font color="green">已付款</font>
-                <c:if test="${s.zeroCostFlag eq 1}">
-                    <a href="javascript:;" class="zeroCost"><span><img src="/static/images/info.jpg"
-                                                                       style="width: 15px;margin-bottom: 4px"></span>
-                        <div class="message">
-                            <span>商品成本为0，直接置为已付款，无需付款供应商</span>
-                        </div>
-                    </a>
+        <td colspan="2">
+            <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
+               style="text-decoration: underline">
+                <c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
+                        color="red">待付款</font></c:if>
+                <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
+                <c:if test="${s.payStatus == 3}"><font color="green">已付款</font>
+                    <c:if test="${s.zeroCostFlag eq 1}">
+                        <a href="javascript:;" class="zeroCost"><span><img src="/static/images/info.jpg"
+                                                                           style="width: 15px;margin-bottom: 4px"></span>
+                            <div class="message">
+                                <span>商品成本为0，直接置为已付款，无需付款供应商</span>
+                            </div>
+                        </a>
+                    </c:if>
                 </c:if>
-            </c:if>
+            </a>
         </td>
         <td colspan="3" class="taxes"><fmt:formatNumber value="${s.shopTaxFee}" type="number" pattern="#,##0.00"/></td>
         <td colspan="2" class="supplier-fee">

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

@@ -79,7 +79,7 @@
 <body>
 <ul class="nav nav-tabs">
     <li><a href="${ctx}/shopOrder/settlement">子订单手动结算</a></li>
-    <li class="active"><a href="${ctx}/shopOrder/settleRecord?shopOrderID=${s.shopOrderID}">退/付款记录</a></li>
+    <li class="active"><a href="${ctx}/shopOrder/settleRecord?shopOrderID=${s.shopOrderID}">结算记录</a></li>
 </ul>
 <table class="table table-striped table-bordered table-condensed pay-table">
     <tr>