商品详情显示、银行账户显示

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

@@ -86,7 +86,7 @@ public class CmDiscernReceipt extends DataEntity<CmDiscernReceipt> {
     private String receiptID;//收款id
     private String linkMan;
 
-    private String bankNameType;
+    private String bankNameType; // 银行账户名称
 
 
 
@@ -629,4 +629,6 @@ public class CmDiscernReceipt extends DataEntity<CmDiscernReceipt> {
     public void setBankNameType(String bankNameType) {
         this.bankNameType = bankNameType;
     }
+
+
 }

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

@@ -33,6 +33,7 @@ public class ReceiptDetailVo {
     private ReceipCouponInfoVo couponInfo;//优惠券购买记录
     private boolean receiptOrderFlag;// 判断订单中抹平的订单是否是和多个订单一起支付的，
     private String shopName;
+    private String bankNameType;// 银行账户名称
 
     public String getShopName() {
         return shopName;
@@ -185,4 +186,12 @@ public class ReceiptDetailVo {
     public void setCouponInfo(ReceipCouponInfoVo couponInfo) {
         this.couponInfo = couponInfo;
     }
+
+    public String getBankNameType() {
+        return bankNameType;
+    }
+
+    public void setBankNameType(String bankNameType) {
+        this.bankNameType = bankNameType;
+    }
 }

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

@@ -34,6 +34,7 @@ public class ReceiptRecordVo {
     private Double orderReceivedAmount;//订单已收金额（此收款只计算线上线下收款记录表金额）
     private Double returnBalanceAmount;// 退款余额金额
     private String associationType;//订单关联方式: 1手动 2自动
+    private String bankNameType;// 银行账户名称
 
     /**
      * 米花科技平台唯一流水号
@@ -223,4 +224,12 @@ public class ReceiptRecordVo {
     public void setAssociationType(String associationType) {
         this.associationType = associationType;
     }
+
+    public String getBankNameType() {
+        return bankNameType;
+    }
+
+    public void setBankNameType(String bankNameType) {
+        this.bankNameType = bankNameType;
+    }
 }

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -470,10 +470,6 @@ public class ProductNewController extends BaseController {
     @RequestMapping(value = "productSave")
     public String productSave(Product product, ProductDetailInfo productDetailInfo, RedirectAttributes redirectAttributes) {
 
-       if("2".equals(product.getProductType())){
-           product.setVisibility("3");
-           product.setPriceFlag("3");
-       }
         // 组合搜索关键词
         List<String> searchKeyList = product.getSearchKeyList();
         String searchKeyStr = "";

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

@@ -115,6 +115,7 @@
         cso_s.orderID AS orderID,
         cso_s.shopOrderNo as shopOrderNos,
         cso.shopOrderId as shopOrderId,
+        cof.bankAccount AS bankNameType,
         s.checkMan,
         IF(crr.relationType = '1', s.name,IFNULL(s_a.name,'')) AS shopName,
         (case when crr.relationType = '1' then u_cr.userName else u.userName
@@ -138,6 +139,7 @@
         LEFT JOIN cm_shop_order cso_s ON cso_s.shopOrderID = a.shopOrderID
         LEFT JOIN cm_shop_order cso_a ON cso_a.shopOrderID = crr.shopOrderID
         LEFT JOIN shop s_a ON s_a.shopID = cso_a.shopID
+        LEFT JOIN cm_offline_collection cof ON a.payType = cof.type
         <where>
             <if test="id != null and id != '' and id != 0 ">
                 AND a.id = #{id}
@@ -625,6 +627,7 @@
 	    cdr.receiptType AS  receiptType,
 	    cdr.confirmType AS  confirmType,
 	    cdr.payType AS  payType,
+        cof.bankAccount AS bankNameType,
 	    cdr.receiptAmount AS receiptAmount,
 	    cdr.receiptDate AS receiptDate,
 	    cdr.receiptStatus AS receiptStatus,
@@ -639,6 +642,7 @@
 	    from
 		cm_discern_receipt cdr
 		left join receipt_user_permission rup on cdr.confirmUserPermissionID = rup.id
+        LEFT JOIN cm_offline_collection cof ON cdr.payType = cof.type
 		where cdr.id = #{receiptID}
 	</select>
 
@@ -709,6 +713,7 @@
         cdr.confirmType AS confirmType,
         cdr.receiptType AS receiptType,
         cdr.payType AS payType,
+        cof.bankAccount AS bankNameType,
         cdr.receiptAmount AS receiptAmount,
         cror.associationType AS associationType,
         cdr.payWay AS payWay,
@@ -727,6 +732,7 @@
         cdr.cancelReason AS cancelReason
         from cm_receipt_order_relation cror
         join cm_discern_receipt cdr on cdr.id = cror.receiptID
+        join cm_offline_collection cof on cdr.payType = cof.type
         where cror.delFlag = '0' and cdr.delFlag = '0'
         <if test="relationType == 1">
             and cror.orderID in (select shopOrderID from cm_shop_order where orderID = #{orderID}) and cror.relationType

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

@@ -191,7 +191,8 @@
                             优惠券购买费
                         </c:if>
 					</span>
-            <span><label>收款类型：</label>${fns:getPayTypeStr(vo.payType)}</span>
+            <span><label>收款类型：</label>${vo.bankNameType}</span>
+
             <span><label>收款方：</label>
                 <c:if test="${(cmDiscernReceipt.payWay == '3' || cmDiscernReceipt.payWay == '2') && (cmDiscernReceipt.receiptType==1 || cmDiscernReceipt.receiptType==2 || cmDiscernReceipt.receiptType==3 || cmDiscernReceipt.receiptType==4) || cmDiscernReceipt.newReceiptType == 3 && cmDiscernReceipt.payWay ==2}">
                 采美
@@ -301,12 +302,12 @@
                             <span class="row4-time">${receiptRecord.receiptTime}</span>
                             <c:if test="${receiptRecord.payWay == 1}">
                                 <%--线上收款--%>
-                                <span>线上&nbsp;${fns:getPayTypeStr(receiptRecord.payType)}</span>
+                                <span>线上&nbsp;${receiptRecord.bankNameType}</span>
                                 <span>${receiptRecord.receiptAmount}</span>
                                 <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
                             </c:if>
                             <c:if test="${receiptRecord.payWay == 2}">
-                                <span>线下&nbsp;${fns:getPayTypeStr(receiptRecord.payType)}</span>
+                                <span>线下&nbsp;${receiptRecord.bankNameType}</span>
                                 <span>${receiptRecord.receiptAmount}</span>
                                 <c:if test="${not empty receiptRecord.confirmUserPermissionID}">
                                     <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>
@@ -492,12 +493,12 @@
                                 <span class="row4-time">${receiptRecord.receiptTime}</span>
                                 <c:if test="${receiptRecord.payWay == 1}">
                                     <%--线上收款--%>
-                                    <span>线上&nbsp;${fns:getPayTypeStr(receiptRecord.payType)}</span>
+                                    <span>线上&nbsp;${receiptRecord.bankNameType}</span>
                                     <span>${receiptRecord.receiptAmount}</span>
                                     <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
                                 </c:if>
                                 <c:if test="${receiptRecord.payWay == 2}">
-                                    <span>线下&nbsp;${fns:getPayTypeStr(receiptRecord.payType)}</span>
+                                    <span>线下&nbsp;${receiptRecord.bankNameType}</span>
                                     <span>${receiptRecord.receiptAmount}</span>
                                     <c:if test="${not empty receiptRecord.confirmUserPermissionID}">
                                         <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>

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

@@ -272,7 +272,7 @@
                         <c:if test="${cmDiscernReceipt.newReceiptType eq 5}">-其他</c:if>
                         </c:if>
             </td>
-            <td>${fns:getDictLabel(cmDiscernReceipt.payType, 'payType', null)}</td>
+            <td>${cmDiscernReceipt.bankNameType}</td>
             <td>
                 <c:if test="${cmDiscernReceipt.payWay == 2 && cmDiscernReceipt.newReceiptType == 3}">
                     <c:if test="${empty cmDiscernReceipt.receiptStatus}"><strong>____</strong></c:if>

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

@@ -6,7 +6,12 @@
     <title>线下收款账号配置</title>
     <meta name="decorator" content="default"/>
     <style>
-
+        .table th{
+            text-align: center;
+        }
+        .table td{
+            text-align: center;
+        }
     </style>
 </head>
 <body>