Merge remote-tracking branch 'origin/developerD' into developer

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

@@ -42,6 +42,8 @@ public interface CmPayShopRecordDao extends CrudDao<CmPayShopRecord> {
 
     void applyCompileSave(CmPayShop cmPayShop);
 
+    void applyCompileRecordSave(CmPayShop cmPayShop);
+
     Double sumWipePayment(@Param("shopOrderID") Integer shopOrderID);
 
     Double sumWipePaymentNoStatus(@Param("shopOrderID") Integer shopOrderID);

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

@@ -896,6 +896,7 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
     @Transactional(readOnly = false)
     public void applyCompileSave(CmPayShop cmPayShop) {
         cmPayShopRecordDao.applyCompileSave(cmPayShop);
+        cmPayShopRecordDao.applyCompileRecordSave(cmPayShop);
     }
 
     @Transactional(readOnly = false)

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

@@ -228,6 +228,9 @@
 	<update id="applyCompileSave" parameterType="com.caimei.modules.order.entity.CmPayShop">
 		UPDATE cm_pay_shop SET payType = #{payType},payTime = #{payTime} WHERE id = #{id}
 	</update>
+	<update id="applyCompileRecordSave">
+		update cm_pay_shop_record SET payType = #{payType},payTime = #{payTime} WHERE payShopID = #{id}
+	</update>
 
 	<select id="findShopOtherFee" resultType="com.caimei.modules.order.entity.ChangePayShopOther">
 		SELECT

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

@@ -603,7 +603,8 @@
             <span id="transferPayFee" style="font-weight: bold; font-size:18px"><fmt:formatNumber
                     value="${cmPayShop.transferPayFee}" pattern="#,##0.00"/> </span>
             <label>付款银行：</label><span>
-					<select name="payType" style="width: 200px">
+					<select name="payType" class="input-medium required" style="width: 200px">
+                        <option value="">请选择</option>
                         <c:forEach  items="${offlineCollections}" var="offlineCollections" varStatus="index">
                             <option value="${offlineCollections.type}">${offlineCollections.bankAccount}</option>
                         </c:forEach>

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

@@ -589,18 +589,18 @@
             <label style="font-weight: bold; font-size:18px">转账支付：</label>
             <span id="transferPayFee" style="font-weight: bold; font-size:18px"><fmt:formatNumber value="${cmPayShop.transferPayFee}" pattern="#,##0.00"/> </span>
             <label>付款银行：</label><span>
-            <c:forEach  items="${offlineCollections}" var="offlineCollections" varStatus="index">
-                <option value="${offlineCollections.type}">${offlineCollections.bankAccount}</option>
-            </c:forEach>
-					<%--<select name="payType">
-						<option value="1">建设银行7297</option>
-						<option value="2">中信银行0897</option>
-						<option value="3">中信银行7172</option>
-						<option value="4">广发银行0115</option>
-						<option value="5">广发银行5461</option>
-						<option value="7">华夏银行2400</option>
-						<option value="8">中国银行9452</option>
-					</select>--%>
+<%--                <select name="payType" class="input-medium" style="width: 200px">
+                    <option value="">请选择</option>
+                    <c:forEach items="${offlineCollections}" var="offlineCollections">
+                        <option value="${offlineCollections.type}">${offlineCollections.bankAccount}</option>
+                    </c:forEach>
+                </select>--%>
+					<select name="payType" style="width: 200px">
+						<option value="">请选择</option>
+                        <c:forEach items="${offlineCollections}" var="offlineCollections">
+                            <option value="${offlineCollections.type}">${offlineCollections.bankAccount}</option>
+                        </c:forEach>
+					</select>
 				</span>
             <label>付款时间：</label>
             <span>${cmPayShop.payTime}</span>
@@ -709,7 +709,7 @@
         }
 
         $('.check-cfm-btn').on('click',function(e) {
-            var payType = $('select[name="payType"]').val(),
+            var payType = $('select[path="payType"]').val(),
                 id = $('#id').val();
             if($(this).hasClass('check-blue-btn')) {
                 var textareaVal = $('#refuse-reasn').val();

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

@@ -78,16 +78,20 @@
         </div>
         <div>
             <label>付款银行：</label><span>
-					 <form:select path="payType" class="input-medium required">
-                         <form:option value="" label="请选择"/>
+					 <select path="payType" class="input-medium required" style="width: 200px">
+                         <option value="">请选择</option>
+                         <c:forEach  items="${offlineCollections}" var="offlineCollections" varStatus="index">
+                             <option value="${offlineCollections.type}">${offlineCollections.bankAccount}</option>
+                         </c:forEach>
+                     </select>
+                         <%--<form:option value="" label="请选择"/>
                          <form:option value="1" label="建设银行7297"/>
                          <form:option value="2" label="中信银行0897"/>
                          <form:option value="3" label="中信银行7172"/>
                          <form:option value="4" label="广发银行0115"/>
                          <form:option value="5" label="广发银行5461"/>
                          <form:option value="7" label="华夏银行2400"/>
-                         <form:option value="8" label="中国银行9452"/>
-                     </form:select>
+                         <form:option value="8" label="中国银行9452"/>--%>
 				</span>
             <label>付款时间：</label>
             <span><form:input path="payTime" type="text" maxlength="20" class="input-medium Wdate" value="${cmPayShop.payTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/></span>

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

@@ -716,7 +716,8 @@
                     <c:if test="${not empty cmPayShop.payType }">
                         <label>付款银行：</label>
                         <span id="payType">
-							<c:if test="${cmPayShop.payType eq 1}">
+                            ${cmPayShop.bankNameType}
+							<%--<c:if test="${cmPayShop.payType eq 1}">
                                 建设银行7297
                             </c:if>
 							<c:if test="${cmPayShop.payType eq 2}">
@@ -733,7 +734,7 @@
                             </c:if>
 							<c:if test="${cmPayShop.payType eq 7}">
                                 华夏银行2400
-                            </c:if>
+                            </c:if>--%>
 						</span>
                     </c:if>
                     <c:if test="${cmPayShop.status != '0'}">

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

@@ -495,7 +495,8 @@
                 <c:if test="${not empty cmPayShop.payType }">
                     <label>付款银行：</label>
                     <span id="payType">
-						<c:if test="${cmPayShop.payType eq 1}">
+                        ${cmPayShop.bankNameType}
+						<%--<c:if test="${cmPayShop.payType eq 1}">
                             建设银行7297
                         </c:if>
 						<c:if test="${cmPayShop.payType eq 2}">
@@ -512,7 +513,7 @@
                         </c:if>
                         <c:if test="${cmPayShop.payType eq 7}">
                             华夏银行2400
-                        </c:if>
+                        </c:if>--%>
 					</span>
                 </c:if>
                 <label>付款时间：</label>