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

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

@@ -182,6 +182,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/orderConfirmReturnRecord.jsp

@@ -207,6 +207,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/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/order/cmPayShopCheck.jsp

@@ -609,6 +609,7 @@
 						<option value="3">中信银行7172</option>
 						<option value="4">广发银行0115</option>
 						<option value="5">广发银行5461</option>
+						<option value="7">华夏银行2400</option>
 					</select>
 				</span>
             <label>付款时间：</label>

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

@@ -635,6 +635,9 @@
                             </c:if>
 							<c:if test="${cmPayShop.payType eq 5}">
                                 广发银行5461
+                            </c:if>
+                            <c:if test="${cmPayShop.payType eq 7}">
+                                华夏银行2400
                             </c:if>
 						</span>
                     </c:if>

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

@@ -369,6 +369,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>
                 </c:if>
                 <label>付款时间：</label>

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

@@ -595,6 +595,7 @@
 						<option value="3">中信银行7172</option>
 						<option value="4">广发银行0115</option>
 						<option value="5">广发银行5461</option>
+						<option value="7">华夏银行2400</option>
 					</select>
 				</span>
             <label>付款时间：</label>

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

@@ -85,6 +85,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>
             <label>付款时间：</label>

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

@@ -730,6 +730,9 @@
                             </c:if>
 							<c:if test="${cmPayShop.payType eq 5}">
                                 广发银行5461
+                            </c:if>
+							<c:if test="${cmPayShop.payType eq 7}">
+                                华夏银行2400
                             </c:if>
 						</span>
                     </c:if>

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

@@ -509,6 +509,9 @@
                         </c:if>
 						<c:if test="${cmPayShop.payType eq 5}">
                             广发银行5461
+                        </c:if>
+                        <c:if test="${cmPayShop.payType eq 7}">
+                            华夏银行2400
                         </c:if>
 					</span>
                 </c:if>

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

@@ -389,6 +389,9 @@
 						<c:if test="${cmPayShop.payType eq 5}">
 							广发银行5461
 						</c:if>
+						<c:if test="${cmPayShop.payType eq 7}">
+							华夏银行2400
+						</c:if>
 					</span>
 					</c:if>
 					<label>付款时间：</label>

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

@@ -329,6 +329,9 @@
                             <c:if test="${cmRefundShop.refundType == '6'}">
                                 虚拟银行0000
                             </c:if>
+                            <c:if test="${cmRefundShop.refundType == '7'}">
+                                华夏银行2400
+                            </c:if>
                             ，￥${cmRefundShop.refundAmount}
                         </c:if>
                     </div>
@@ -378,6 +381,9 @@
                             <c:if test="${cmRefundShop.refundType == '6'}">
                                 虚拟银行0000
                             </c:if>
+                            <c:if test="${cmRefundShop.refundType == '7'}">
+                                华夏银行2400
+                            </c:if>
                             ，￥${cmRefundShop.refundAmount}
                         </c:if>
                     </div>

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

@@ -340,6 +340,7 @@
                         <option value="4">广发银行0115</option>
                         <option value="5">广发银行5461</option>
                         <option value="6">虚拟银行0000</option>
+                        <option value="7">华夏银行2400</option>
                     </select>
                     <input type="number" name="refundAmount" class="refund-amount" value="0.00">
                 </div><br>

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

@@ -144,6 +144,9 @@
                                 <c:if test="${difference.refundShop.refundType == '6'}">
                                     虚拟银行0000
                                 </c:if>
+                                <c:if test="${difference.refundShop.refundType == '7'}">
+                                    华夏银行2400
+                                </c:if>
                                 ，￥${difference.refundShop.refundAmount}
                             </c:if>
                         </div>

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

@@ -305,8 +305,8 @@
             <td><a href="${ctx}/order/cmPayShop/applyDetail?id=${p.payShopID}">${p.payShopID}</a></td>
             <td>${p.payTime}</td>
             <td><c:if test="${p.payType == '1'}">
-                建设银行7297
-            </c:if>
+                    建设银行7297
+                </c:if>
                 <c:if test="${p.payType == '2'}">
                     中信银行0897
                 </c:if>
@@ -319,6 +319,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>
@@ -361,6 +364,9 @@
                     <c:if test="${r.payType == '5'}">
                         广发银行5461
                     </c:if>
+                    <c:if test="${r.payType == '7'}">
+                        华夏银行2400
+                    </c:if>
                     &nbsp&nbsp
                     ¥${r.receiptAmount}<br>
                 </div>
@@ -391,6 +397,9 @@
                     <c:if test="${r.cmRefundShop.refundType == '5'}">
                         广发银行5461
                     </c:if>
+                    <c:if test="${r.cmRefundShop.refundType == '7'}">
+                        华夏银行2400
+                    </c:if>
                     &nbsp&nbsp
                     <c:if test="${r.cmRefundShop.refundAmount > 0}">
                         ¥${r.cmRefundShop.refundAmount}<br>

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

@@ -325,9 +325,10 @@
                 <td>${p.id}</td>
                 <td><a href="${ctx}/order/cmPayShop/applyDetail?id=${p.payShopID}">${p.payShopID}</a></td>
                 <td>${p.payTime}</td>
-                <td><c:if test="${p.payType == '1'}">
-                    建设银行7297
-                </c:if>
+                <td>
+                    <c:if test="${p.payType == '1'}">
+                        建设银行7297
+                    </c:if>
                     <c:if test="${p.payType == '2'}">
                         中信银行0897
                     </c:if>
@@ -340,6 +341,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>
@@ -382,6 +386,9 @@
                         <c:if test="${r.payType == '5'}">
                             广发银行5461
                         </c:if>
+                        <c:if test="${r.payType == '7'}">
+                            华夏银行2400
+                        </c:if>
                         &nbsp&nbsp
                         ¥${r.receiptAmount}<br>
                     </div>
@@ -412,6 +419,9 @@
                         <c:if test="${r.cmRefundShop.refundType == '5'}">
                             广发银行5461
                         </c:if>
+                        <c:if test="${r.cmRefundShop.refundType == '7'}">
+                            华夏银行2400
+                        </c:if>
                         &nbsp&nbsp
                         <c:if test="${r.cmRefundShop.refundAmount > 0}">
                             ¥${r.cmRefundShop.refundAmount}<br>

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>