银行账号显示修复

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

@@ -46,4 +46,7 @@ public interface CmOfflineCollectionDao extends CrudDao<CmOfflineCollection> {
 
     // 下拉获取所有银行
     List<CmReceiType> downAllList();
+
+    // 判断银行名称
+    CmReceiType oneData(@Param("id") String id);
 }

src/main/java/com/caimei/modules/order/entity/CmDiscernReceipt.java

@@ -86,6 +86,8 @@ public class CmDiscernReceipt extends DataEntity<CmDiscernReceipt> {
     private String receiptID;//收款id
     private String linkMan;
 
+    private String bankNameType;
+
 
 
     public String getPaYee() {
@@ -619,4 +621,12 @@ public class CmDiscernReceipt extends DataEntity<CmDiscernReceipt> {
     public void setLinkMan(String linkMan) {
         this.linkMan = linkMan;
     }
+
+    public String getBankNameType() {
+        return bankNameType;
+    }
+
+    public void setBankNameType(String bankNameType) {
+        this.bankNameType = bankNameType;
+    }
 }

src/main/java/com/caimei/modules/order/entity/CmReturnedPurchase.java

@@ -75,6 +75,8 @@ public class CmReturnedPurchase extends DataEntity<CmReturnedPurchase> {
     private String endTime;        //时间结束  查询条件 申请时间
     private Integer onlineShopOrderId; //子订单id
 
+    private String bankNameType;
+
     public Integer getOnlineShopOrderId() {
         return onlineShopOrderId;
     }
@@ -506,4 +508,12 @@ public class CmReturnedPurchase extends DataEntity<CmReturnedPurchase> {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    public String getBankNameType() {
+        return bankNameType;
+    }
+
+    public void setBankNameType(String bankNameType) {
+        this.bankNameType = bankNameType;
+    }
 }

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

@@ -1,8 +1,10 @@
 package com.caimei.modules.order.service;
 
 import com.caimei.constants.ReceivablesType;
+import com.caimei.modules.order.dao.CmOfflineCollectionDao;
 import com.caimei.modules.order.dao.CmReceiptOrderRelationDao;
 import com.caimei.modules.order.entity.CmPayShopRecord;
+import com.caimei.modules.order.entity.CmReceiType;
 import com.caimei.modules.order.entity.CmReceiptOrderRelation;
 import com.caimei.modules.order.utils.OrderUtil;
 import com.thinkgem.jeesite.common.persistence.Page;
@@ -29,6 +31,8 @@ public class CmReceiptOrderRelationService extends CrudService<CmReceiptOrderRel
     @Autowired
     private CmPayShopRecordService cmPayShopRecordService;
 
+    @Resource private CmOfflineCollectionDao collectionDao;
+
     public CmReceiptOrderRelation get(String id) {
         return super.get(id);
     }
@@ -58,7 +62,9 @@ public class CmReceiptOrderRelationService extends CrudService<CmReceiptOrderRel
     public List<CmReceiptOrderRelation> findByOrderID(String orderID) {
         List<CmReceiptOrderRelation> list = cmReceiptOrderRelationDao.findByOrderID(orderID);
         for (CmReceiptOrderRelation bean : list) {
-            bean.setPayType(OrderUtil.getPayTypeStr(bean.getPayType()));
+            CmReceiType cmReceiType = collectionDao.oneData(bean.getPayType());
+            bean.setPayType(cmReceiType.getType());
+//            bean.setPayType(OrderUtil.getPayTypeStr(bean.getPayType()));
         }
         return list;
     }
@@ -102,4 +108,4 @@ public class CmReceiptOrderRelationService extends CrudService<CmReceiptOrderRel
     public Double findPayFeeByOrderID(String orderID) {
         return cmReceiptOrderRelationDao.findPayFeeByOrderID(orderID);
     }
-}
+}

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

@@ -13,9 +13,6 @@
         FROM cm_offline_collection
         <where>
             isDisable != 0
-            <if test="id != null and id != ''">
-                AND id = #{id}
-            </if>
             <if test="bankAccount != null and bankAccount != ''">
                 AND bankAccount = #{bankAccount}
             </if>
@@ -74,5 +71,8 @@
         SELECT id,type FROM cm_receipt_type
     </select>
 
+    <select id="oneData" resultType="com.caimei.modules.order.entity.CmReceiType">
+        SELECT id,type FROM cm_receipt_type where id = #{id}
+    </select>
 
 </mapper>

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

@@ -270,10 +270,12 @@
 		  cdr.payType,
 		  cdr.receiptType,
 		  cdr.receiptAmount,
-		  cdr.receiptDate
+		  cdr.receiptDate,
+		  f.bankAccount as bankNameType
 		FROM
 		  cm_discern_receipt cdr
 		  LEFT JOIN cm_receipt_order_relation cror ON cdr.id = cror.receiptID
+		  LEFT JOIN cm_offline_collection f ON cdr.payType = f.type
 		WHERE
 		  cror.relationType = 1
 		  AND cror.delFlag = 0

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

@@ -182,8 +182,10 @@
 
 	<select id="getPayedRecords" resultType="CmPayShopRecord">
 		SELECT
+		f.bankAccount as bankNameType,
 		<include refid="cmPayShopRecordColumns"/>
 		FROM cm_pay_shop_record a
+		LEFT JOIN cm_offline_collection f ON a.payType = f.type
 		WHERE a.shopOrderID = #{shopOrderID} and a.delFlag = '0' and a.status = '1'
 		ORDER BY a.payTime DESC
 	</select>

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

@@ -100,11 +100,13 @@
 			<include refid="cmReturnedPurchaseColumns"/>
 		,s.name AS "applicationUserName",
 		s1.name AS "reviewUserName",
-		co.organizeID AS "organizeID"
+		co.organizeID AS "organizeID",
+		f.bankAccount as bankNameType
 		FROM cm_returned_purchase a
 		LEFT JOIN sys_user s on s.id = a.applicationUserID
 		LEFT JOIN sys_user s1 on s1.id = a.reviewUserID
 		LEFT JOIN cm_order co ON a.orderID=co.orderID
+		LEFT JOIN cm_offline_collection f ON a.payType = f.type
 		<include refid="cmReturnedPurchaseJoins"/>
 		<where>
 			<if test="organizeID != null and organizeID != ''">

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

@@ -188,28 +188,28 @@
                     <c:if test="${not empty cmReturnedPurchase.refundOfflineFee && cmReturnedPurchase.refundOfflineFee ne 0 }">
                         线下转账：<fmt:formatNumber type="number" pattern="#,##0.00"
                                                value="${cmReturnedPurchase.refundOfflineFee}"/>元&nbsp;&nbsp;&nbsp;&nbsp;
-                        采美退款银行：
-                        <c:if test="${cmReturnedPurchase.payType == '1'}">
-                            建设银行7297
-                        </c:if>
-                        <c:if test="${cmReturnedPurchase.payType == '2'}">
-                            中信银行0897
-                        </c:if>
-                        <c:if test="${cmReturnedPurchase.payType == '3'}">
-                            中信银行7172
-                        </c:if>
-                        <c:if test="${cmReturnedPurchase.payType == '4'}">
-                            广发银行0115
-                        </c:if>
-                        <c:if test="${cmReturnedPurchase.payType == '5'}">
-                            广发银行5461
-                        </c:if>
-                        <c:if test="${cmReturnedPurchase.payType == '6'}">
-                            虚拟银行0000
-                        </c:if>
-                        <c:if test="${cmReturnedPurchase.payType == '7'}">
-                            华夏银行2400
-                        </c:if>
+                        采美退款银行：${cmReturnedPurchase.bankNameType}
+<%--                        <c:if test="${cmReturnedPurchase.payType == '1'}">--%>
+<%--                            建设银行7297--%>
+<%--                        </c:if>--%>
+<%--                        <c:if test="${cmReturnedPurchase.payType == '2'}">--%>
+<%--                            中信银行0897--%>
+<%--                        </c:if>--%>
+<%--                        <c:if test="${cmReturnedPurchase.payType == '3'}">--%>
+<%--                            中信银行7172--%>
+<%--                        </c:if>--%>
+<%--                        <c:if test="${cmReturnedPurchase.payType == '4'}">--%>
+<%--                            广发银行0115--%>
+<%--                        </c:if>--%>
+<%--                        <c:if test="${cmReturnedPurchase.payType == '5'}">--%>
+<%--                            广发银行5461--%>
+<%--                        </c:if>--%>
+<%--                        <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

@@ -265,7 +265,7 @@
                         采美退款银行：
                         <form:select path="payType"  class="input-medium">
                             <form:option value="0" label="请选择"/>
-                            <form:options items="${offlineCollections}" itemLabel="bankAccount" itemValue="id"
+                            <form:options items="${offlineCollections}" itemLabel="bankAccount" itemValue="type"
                                           htmlEscape="false"/>
                         </form:select>
                     </c:if>

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

@@ -384,7 +384,8 @@
                 <td>${pp.index + 1}</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'}">
+                <td>${p.bankNameType}
+                    <%--<c:if test="${p.payType == '1'}">
                         建设银行7297
                     </c:if>
                     <c:if test="${p.payType == '2'}">
@@ -404,7 +405,7 @@
                     </c:if>
                     <c:if test="${p.payType == '8'}">
                         中国银行9452
-                    </c:if>
+                    </c:if>--%>
                 </td>
                 <td>${p.payAmount}</td>
             </tr>

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

@@ -16,8 +16,7 @@
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <div class="ul-form">
-        <label>ID：</label>
-        <form:input path="id" htmlEscape="false" maxlength="20" class="input-medium"/>
+
         <label>银行账号：</label>
         <form:input path="bankAccount" htmlEscape="false" maxlength="20" class="input-medium"/>&nbsp;&nbsp;
         <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>&nbsp;&nbsp;

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

@@ -621,24 +621,7 @@
                     <c:if test="${not empty cmPayShop.payType }">
                         <label>付款银行：</label>
                         <span id="payType">${cmPayShop.bankNameType}
-<%--							<c:if test="${cmPayShop.payType eq 1}">--%>
-<%--                                建设银行7297--%>
-<%--                            </c:if>--%>
-<%--							<c:if test="${cmPayShop.payType eq 2}">--%>
-<%--                                中信银行0897--%>
-<%--                            </c:if>--%>
-<%--							<c:if test="${cmPayShop.payType eq 3}">--%>
-<%--                                中信银行7172--%>
-<%--                            </c:if>--%>
-<%--							<c:if test="${cmPayShop.payType eq 4}">--%>
-<%--                                广发银行0115--%>
-<%--                            </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>
                     <c:if test="${cmPayShop.status != '0'}">

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

@@ -373,8 +373,8 @@
 					<span id="transferAmount" style="font-weight: bold; font-size:18px"><fmt:formatNumber value="${cmPayShop.transferPayFee}" pattern="#,##0.00"/> </span>
 					<c:if test="${not empty cmPayShop.payType }">
 						<label>付款银行：</label>
-						<span id="payType">
-						<c:if test="${cmPayShop.payType eq 1}">
+						<span id="payType">${cmPayShop.bankNameType}
+						<%--<c:if test="${cmPayShop.payType eq 1}">
 							建设银行7297
 						</c:if>
 						<c:if test="${cmPayShop.payType eq 2}">
@@ -391,7 +391,7 @@
 						</c:if>
 						<c:if test="${cmPayShop.payType eq 7}">
 							华夏银行2400
-						</c:if>
+						</c:if>--%>
 					</span>
 					</c:if>
 					<label>付款时间：</label>

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

@@ -304,7 +304,8 @@
             <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'}">
+            <td>${p.bankNameType}
+                <%--<c:if test="${p.payType == '1'}">
                     建设银行7297
                 </c:if>
                 <c:if test="${p.payType == '2'}">
@@ -321,7 +322,7 @@
                 </c:if>
                 <c:if test="${p.payType == '7'}">
                     华夏银行2400
-                </c:if>
+                </c:if>--%>
             </td>
             <td>${p.payAmount}</td>
         </tr>
@@ -348,8 +349,8 @@
             <td>${r.receiptDate}</td>
             <td>
                 <div class="text-left">
-                    线下转账:
-                    <c:if test="${r.payType == '1'}">
+                    线下转账: ${r.bankNameType}
+                    <%--<c:if test="${r.payType == '1'}">
                         建设银行7297
                     </c:if>
                     <c:if test="${r.payType == '2'}">
@@ -366,7 +367,7 @@
                     </c:if>
                     <c:if test="${r.payType == '7'}">
                         华夏银行2400
-                    </c:if>
+                    </c:if>--%>
                     &nbsp&nbsp
                     ¥${r.receiptAmount}<br>
                 </div>

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

@@ -325,8 +325,8 @@
                 <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'}">
+                <td>${p.bankNameType}
+                    <%--<c:if test="${p.payType == '1'}">
                         建设银行7297
                     </c:if>
                     <c:if test="${p.payType == '2'}">
@@ -343,7 +343,7 @@
                     </c:if>
                     <c:if test="${p.payType == '7'}">
                         华夏银行2400
-                    </c:if>
+                    </c:if>--%>
                 </td>
                 <td>${p.payAmount}</td>
             </tr>
@@ -370,8 +370,8 @@
                 <td>${r.receiptDate}</td>
                 <td>
                     <div class="text-left">
-                        线下转账:
-                        <c:if test="${r.payType == '1'}">
+                        线下转账: ${r.bankNameType}
+                        <%--<c:if test="${r.payType == '1'}">
                             建设银行7297
                         </c:if>
                         <c:if test="${r.payType == '2'}">
@@ -388,7 +388,7 @@
                         </c:if>
                         <c:if test="${r.payType == '7'}">
                             华夏银行2400
-                        </c:if>
+                        </c:if>--%>
                         &nbsp&nbsp
                         ¥${r.receiptAmount}<br>
                     </div>