zhijiezhao 3 tahun lalu
induk
melakukan
dbea12269b

+ 1 - 1
src/main/java/com/caimei/modules/order/service/SplitAccountService.java

@@ -216,7 +216,7 @@ public class SplitAccountService {
                     splitAccount.setType(4);
                     splitAccount.setSubUserNo(orderProduct.getSplitCode());
                 }
-                logger.info("成本分账参数------------->" + splitAccount);
+                logger.info("成本分账参数------------->" + splitAccount.toString());
                 list.add(splitAccount);
             }
             if (MathUtil.compare(splitAmount, 0) == 0) {

+ 3 - 0
src/main/java/com/caimei/modules/order/utils/OrderUtil.java

@@ -330,6 +330,9 @@ public class OrderUtil {
         if ("19".equals(payType)) {
             return "建设银行6256";
         }
+        if ("20".equals(payType)) {
+            return "大额银联转账";
+        }
         return "";
     }
 

+ 1 - 0
src/main/webapp/WEB-INF/views/modules/order/cmPayFormList.jsp

@@ -43,6 +43,7 @@
             <li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
 			<li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
         </shiro:hasPermission>
+			<li><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
 	</ul>
 	<form:form id="searchForm" modelAttribute="cmPayShop" action="${ctx}/order/cmPayShop/" method="post" class="breadcrumb form-search">
 		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>

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

@@ -301,6 +301,7 @@
         <li><a href="${ctx}/order/cmRefundShop/">退款列表</a></li>
         <li class="active tab-li"><a href="${ctx}/shopOrder/refundRecordList?operatingMode=2">记录退款</a></li>
     </c:if>
+        <li><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
 </ul>
 <form:form id="searchForm" onsubmit="submitFunc()" modelAttribute="newShopOrder"
            action="${ctx}/shopOrder/payOrderList?operatingMode=${operatingMode

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

@@ -252,6 +252,7 @@
     <li><a href="${ctx}/order/cmPayShop">付款列表</a></li>
     <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
     <li class="active tab-li"><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
+    <li><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
 </ul>
 <form:form id="searchForm" onsubmit="submitFunc()" modelAttribute="newShopOrder"
            action="${ctx}/shopOrder/payOrderList?operatingMode=${operatingMode