分账页修改

src/main/resources/config/dev/caimei.properties

@@ -12,9 +12,10 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.cj.jdbc.Driver
-jdbc.url=jdbc:mysql://120.79.25.27:3306/caimei?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+jdbc.url=jdbc:mysql://192.168.2.100:3306/caimei?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
 jdbc.username=developer
-jdbc.password=J5p3tgOVazNl4ydf
+jdbc.password=05bZ/OxTB:X+yd%1
+
 
 #jdbc.url=jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
 #jdbc.username=developer

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

@@ -305,8 +305,8 @@
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
     <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="手动分账"/>
+        <span style="color: red">每次选择一个子订单申请分账，系统将佣金分账给采美，付供应商的金额依然还在合利宝账户，需要再进行手动结算。 </span>
+<%--        <input id="btnSubmit" class="btn btn-primary" type="submit" onclick="return confirmx('确定将展示的子订单全部分账吗？', '${ctx}/splitAccount/split')" value="手动分账"/>--%>
     </div>
 </form:form>
 <sys:message content="${message}"/>
@@ -504,25 +504,25 @@
                     </tr>
                 </c:forEach>
             </table>
-            <div class="pay-more-func">
-                <c:if test="${s.paying ne '1' and s.payStatus eq '1' and !s.modifyPayable}">
-                    <shiro:hasPermission name="order:cmPayShop:modifyPay">
-                        <a href="${ctx}/shopOrder/toChangePayShopAmount?shopOrderID=${s.shopOrderID}">修改成本</a>
-                    </shiro:hasPermission>
-                </c:if>
-                <c:if test="${(s.modifyPayable and s.paying ne '1') || s.payStatus eq '2'}">
-                    <a href="${ctx}/order/cmPayShop/differencePriceForm?shopOrderId=${s.shopOrderID}">供应商差价</a>
-                </c:if>
-                <c:if test="${s.paying ne '1' and s.payStatus eq '2'}">
-                    <c:if test="${!s.modifyPayable || s.receiptStatus eq '3'}">
-                        <shiro:hasPermission name="order:cmPayShop:modifyPay">
-                            <a href="${ctx}/shopOrder/toApplyPayWipe?shopOrderID=${s.shopOrderID}">付款抹平</a>
-                        </shiro:hasPermission>
-                    </c:if>
-                </c:if>
-                <a href="${ctx}/shopOrder/payShopRemark?shopOrderId=${s.shopOrderID}">应付备注</a>
-                <a href="${ctx}/shopOrder/payedAndRefundRecordList?shopOrderID=${s.shopOrderID}&operatingMode=${operatingMode}">退/付款记录</a>
-            </div>
+<%--            <div class="pay-more-func">--%>
+<%--                <c:if test="${s.paying ne '1' and s.payStatus eq '1' and !s.modifyPayable}">--%>
+<%--                    <shiro:hasPermission name="order:cmPayShop:modifyPay">--%>
+<%--                        <a href="${ctx}/shopOrder/toChangePayShopAmount?shopOrderID=${s.shopOrderID}">修改成本</a>--%>
+<%--                    </shiro:hasPermission>--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${(s.modifyPayable and s.paying ne '1') || s.payStatus eq '2'}">--%>
+<%--                    <a href="${ctx}/order/cmPayShop/differencePriceForm?shopOrderId=${s.shopOrderID}">供应商差价</a>--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${s.paying ne '1' and s.payStatus eq '2'}">--%>
+<%--                    <c:if test="${!s.modifyPayable || s.receiptStatus eq '3'}">--%>
+<%--                        <shiro:hasPermission name="order:cmPayShop:modifyPay">--%>
+<%--                            <a href="${ctx}/shopOrder/toApplyPayWipe?shopOrderID=${s.shopOrderID}">付款抹平</a>--%>
+<%--                        </shiro:hasPermission>--%>
+<%--                    </c:if>--%>
+<%--                </c:if>--%>
+<%--                <a href="${ctx}/shopOrder/payShopRemark?shopOrderId=${s.shopOrderID}">应付备注</a>--%>
+<%--                <a href="${ctx}/shopOrder/payedAndRefundRecordList?shopOrderID=${s.shopOrderID}&operatingMode=${operatingMode}">退/付款记录</a>--%>
+<%--            </div>--%>
         </div>
     </c:forEach>
 </div>