退款bugfix/华夏银行付款卡

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

@@ -101,6 +101,9 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 if (l.getPayType().equals("6")) {
                     l.setPayBank("线上分账");
                 }
+                if (l.getPayType().equals("7")) {
+                    l.setPayBank("华夏银行2400");
+                }
             }
             //付款类型: 1子订单付款 2供应商差价 3付第三方
             if (l.getPaymentType() == 1) {

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

@@ -181,6 +181,9 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
         if (num <= 0) {
             return "请填写退货/取消数量";
         }
+        if(null!=cmReturnedPurchase.getRefundType()&&2==cmReturnedPurchase.getRefundType()){
+            cmReturnedPurchase.setRefundFee(cmReturnedPurchase.getFreeRefundFee());
+        }
         String id = cmReturnedPurchase.getId();//存在Id则是重申或者再次申请
         if (StringUtils.isEmpty(id)) {
             //正常插入数据流程---新申请

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

@@ -340,6 +340,9 @@
                             <c:if test="${cmReturnedPurchase.payType == '6'}">
                                 虚拟银行0000
                             </c:if>
+                            <c:if test="${cmReturnedPurchase.payType == '7'}">
+                                华夏银行2400
+                            </c:if>
                         </c:if>
                         <c:if test="${empty cmReturnedPurchase.refundFee or cmReturnedPurchase.refundFee eq 0}">
                             暂无支付方式

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

@@ -271,6 +271,7 @@
                             <form:option value="4" label="广发银行0115"/>
                             <form:option value="5" label="广发银行5461"/>
                             <form:option value="6" label="虚拟银行0000"/>
+                            <form:option value="7" label="华夏银行2400"/>
                         </form:select>
                     </c:if>
                     <c:if test="${empty cmReturnedPurchase.refundFee or cmReturnedPurchase.refundFee eq 0}">

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

@@ -353,6 +353,9 @@
                             <c:if test="${cmReturnedPurchase.payType == '5'}">
                                 广发银行5461
                             </c:if>
+                            <c:if test="${cmReturnedPurchase.payType == '7'}">
+                                华夏银行2400
+                            </c:if>
                         </c:if>
                         <c:if test="${empty cmReturnedPurchase.refundFee or cmReturnedPurchase.refundFee eq 0}">
                             暂无支付方式

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

@@ -399,6 +399,9 @@
                     <c:if test="${p.payType == '5'}">
                         广发银行5461
                     </c:if>
+                    <c:if test="${p.payType == '7'}">
+                        华夏银行2400
+                    </c:if>
                 </td>
                 <td>${p.payAmount}</td>
             </tr>

src/main/webapp/WEB-INF/views/modules/user/userBalanceWithdrawalsEdit.jsp

@@ -118,6 +118,7 @@
                     <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:select>
             </span>
             </div>

src/main/webapp/WEB-INF/views/modules/user/userBalanceWithdrawalsReview.jsp

@@ -111,6 +111,7 @@
 						<option value="3">中信银行7172</option>
 						<option value="4">广发银行0115</option>
 						<option value="5">广发银行5461</option>
+						<option value="7">华夏银行2400</option>
 					</select>
 				</span>
         </div>