线下收款账号配置需求更新

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

@@ -1,6 +1,7 @@
 package com.caimei.modules.order.dao;
 
 import com.caimei.modules.order.entity.CmOfflineCollection;
+import com.caimei.modules.order.entity.CmReceiType;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import org.apache.ibatis.annotations.Param;
@@ -16,9 +17,15 @@ import java.util.List;
 @MyBatisDao
 public interface CmOfflineCollectionDao extends CrudDao<CmOfflineCollection> {
 
+    // 银行关联最大属性值
+    int typeMax();
+
     // 添加银行账号
     int insBank(CmOfflineCollection cmOfflineCollection);
 
+    // 旧表银行账号添加
+    void insReceipt(CmReceiType cmReceiType);
+
     // 设置商城显示完善信息
     int upBankDisplay(CmOfflineCollection cmOfflineCollection);
 
@@ -36,4 +43,7 @@ public interface CmOfflineCollectionDao extends CrudDao<CmOfflineCollection> {
 
     // 获取下拉列表
     List<CmOfflineCollection> downList();
+
+    // 下拉获取所有银行
+    List<CmReceiType> downAllList();
 }

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

@@ -15,7 +15,7 @@ public class CmOfflineCollection extends DataEntity<CmOfflineCollection> {
     private String bankAccount;    // 银行账号
     private String bankUserName;   // 银行开户名
     private String bankOfDeposit;  // 开户行
-    private Integer bankCardNo;    // 银行卡号
+    private String bankCardNo;    // 银行卡号
     private String creationTime;     // 创建时间
     private Integer isDisplay;     // 是否为商城显示：0不显示， 1显示
     private Integer isDisable;     // 是否禁用：0禁用，1启用
@@ -63,11 +63,11 @@ public class CmOfflineCollection extends DataEntity<CmOfflineCollection> {
         this.bankOfDeposit = bankOfDeposit;
     }
 
-    public Integer getBankCardNo() {
+    public String getBankCardNo() {
         return bankCardNo;
     }
 
-    public void setBankCardNo(Integer bankCardNo) {
+    public void setBankCardNo(String bankCardNo) {
         this.bankCardNo = bankCardNo;
     }
 

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

@@ -0,0 +1,29 @@
+package com.caimei.modules.order.entity;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2022/9/27
+ */
+public class CmReceiType {
+    private Integer Id;
+    private String type;
+
+
+    public Integer getId() {
+        return Id;
+    }
+
+    public void setId(Integer id) {
+        Id = id;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.caimei.modules.order.service;
 import com.caimei.modules.order.dao.CmOfflineCollectionDao;
 import com.caimei.modules.order.entity.CmDiscernReceipt;
 import com.caimei.modules.order.entity.CmOfflineCollection;
+import com.caimei.modules.order.entity.CmReceiType;
 import com.thinkgem.jeesite.common.service.CrudService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,8 +35,23 @@ public class CmOfflineCollectionService extends CrudService<CmOfflineCollectionD
 
     }
 
+    /**
+     * 添加新银行账号
+     * @param cmOfflineCollection
+     * @return
+     */
     @Transactional(readOnly = false)
     public Boolean insertBank(CmOfflineCollection cmOfflineCollection) {
+        // 查询最大关联号，设置新银行关联号
+        int typeMax = cmOfflineCollectionDao.typeMax();
+        typeMax = typeMax +1;
+        cmOfflineCollection.setType(typeMax);
+        // 酒标银行账号添加
+        CmReceiType receiType = new CmReceiType();
+        receiType.setId(cmOfflineCollection.getType());
+        receiType.setType(cmOfflineCollection.getBankAccount());
+        // 线下银行账号数据添加
+        cmOfflineCollectionDao.insReceipt(receiType);
         int i = cmOfflineCollectionDao.insBank(cmOfflineCollection);
         if (i > 0) {
             return true;
@@ -82,4 +98,9 @@ public class CmOfflineCollectionService extends CrudService<CmOfflineCollectionD
     public List<CmOfflineCollection> downListData() {
         return cmOfflineCollectionDao.downList();
     }
+
+    // 下拉列表获取所有线下收款账号
+    public List<CmReceiType> downAllListData() {
+        return cmOfflineCollectionDao.downAllList();
+    }
 }

src/main/java/com/caimei/modules/order/web/CmDiscernReceiptController.java

@@ -117,9 +117,9 @@ public class CmDiscernReceiptController extends BaseController {
         //获取组织列表
         List<CmUserOrganize> cmUserOrganizeList = cmUserOrganizeService.findOrganize();
         // 获取线下收款账号下拉列表
-        List<CmOfflineCollection> offlineCollections = cmOfflineCollectionService.downListData();
+        List<CmReceiType> cmReceiTypes = cmOfflineCollectionService.downAllListData();
         model.addAttribute("cmUserOrganizeList", cmUserOrganizeList);
-        model.addAttribute("offlineCollections", offlineCollections);
+        model.addAttribute("cmReceiTypes", cmReceiTypes);
 //        model.addAttribute("list", list);
         model.addAttribute("page", page);
         return "modules/order/cmDiscernReceiptList";

src/main/java/com/caimei/modules/order/web/CmOfflineCollectionController.java

@@ -117,33 +117,34 @@ public class CmOfflineCollectionController extends BaseController {
             return "redirect:" + Global.getAdminPath() +"/order/CmOfflineCollection/List";
         }
     }
-
-    /**
+/*
+    *//**
      * 设置商城显示页面回显
      * @param cmOfflineCollection
      * @param model
      * @return
-     */
+     *//*
     @RequestMapping(value = "upBankFrom")
     public String upBankRedirect(CmOfflineCollection cmOfflineCollection,Model model) {
         CmOfflineCollection editBankData = cmOfflineCollectionService.editBankData(cmOfflineCollection);
         model.addAttribute("editBankData",editBankData);
         model.addAttribute("cmOfflineCollection",cmOfflineCollection);
         return "modules/order/cmOfflineCollectionDisplayFrom";
-    }
+    }*/
 
     /**
-     * 设置商城显示完善信息
+     * 设置商城显示
      * @param cmOfflineCollection
      * @return
      */
     @RequestMapping(value = "upBankDisplay")
-    public String upBankDisplay(CmOfflineCollection cmOfflineCollection){
+    public String upBankDisplay(CmOfflineCollection cmOfflineCollection, RedirectAttributes redirectAttributes){
         Boolean BankDisplay = cmOfflineCollectionService.upBankDisplay(cmOfflineCollection);
         if (BankDisplay) {
             return "redirect:" + Global.getAdminPath() +"/order/CmOfflineCollection/List";
         }
-        return "redirect:" + Global.getAdminPath() +"/order/CmOfflineCollection/upBankFrom";
+        addMessage(redirectAttributes,"设置商城显示失败");
+        return "redirect:" + Global.getAdminPath() +"/order/CmOfflineCollection/List";
     }
 
     /**
@@ -159,8 +160,8 @@ public class CmOfflineCollectionController extends BaseController {
         if (noBankDisplay) {
             return "redirect:" + Global.getAdminPath() +"/order/CmOfflineCollection/List";
         }
-
-        return "redirect:" + Global.getAdminPath() +"/order/CmOfflineCollection/from";
+        addMessage(redirectAttributes,"设置商城不显示失败");
+        return "redirect:" + Global.getAdminPath() +"/order/CmOfflineCollection/List";
     }
 
     /**

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

@@ -20,19 +20,25 @@
                 AND bankAccount = #{bankAccount}
             </if>
         </where>
+        order by creationTime desc
+    </select>
+
+    <select id="typeMax" resultType="java.lang.Integer">
+        SELECT MAX(TYPE) AS typeMax FROM cm_offline_collection
     </select>
 
     <insert id="insBank">
-        INSERT INTO cm_offline_collection(bankAccount,creationTime,isDisplay,isDisable)
-        VALUES(#{bankAccount},NOW(),0,1)
+        INSERT INTO cm_offline_collection(type,bankAccount,bankUserName,bankOfDeposit,bankCardNo,creationTime,isDisplay,isDisable)
+        VALUES(#{type},#{bankAccount},#{bankUserName},#{bankOfDeposit},#{bankCardNo},NOW(),0,1)
+    </insert>
+
+    <insert id="insReceipt">
+        INSERT INTO cm_receipt_type VALUE(#{id},#{type})
     </insert>
 
     <update id="upBankDisplay">
         UPDATE cm_offline_collection
-        SET bankUserName = #{bankUserName},
-            bankOfDeposit = #{bankOfDeposit},
-            bankCardNo = #{bankCardNo},
-            isDisplay = 1
+        SET isDisplay = 1
         WHERE id = #{id}
     </update>
 
@@ -48,7 +54,10 @@
     </select>
     <update id="edit">
         UPDATE cm_offline_collection
-        SET bankAccount = #{bankAccount}
+        SET bankAccount = #{bankAccount},
+            bankUserName = #{bankUserName},
+            bankOfDeposit = #{bankOfDeposit},
+            bankCardNo = #{bankCardNo}
         WHERE id = #{id}
     </update>
 
@@ -61,5 +70,9 @@
         SELECT id,bankAccount,type FROM cm_offline_collection WHERE isDisable != 0
     </select>
 
+    <select id="downAllList" resultType="com.caimei.modules.order.entity.CmReceiType">
+        SELECT id,type FROM cm_receipt_type
+    </select>
+
 
 </mapper>

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

@@ -158,7 +158,7 @@
             <form:select path="payType" class="select-ele input-medium">
                 <form:option value="" label="全部"/>
 <%--                <c:forEach items="${offlineCollections}" var="offlineCollections" varStatus="index">--%>
-                    <form:options items="${offlineCollections}" itemLabel="bankAccount" itemValue="type"
+                    <form:options items="${cmReceiTypes}" itemLabel="type" itemValue="id"
                                   htmlEscape="false"/>
 <%--                </c:forEach>--%>
             </form:select>

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

@@ -24,13 +24,13 @@
             <form:hidden path="id"/><br/><br/>
     <%--            <input type="hidden" value="${editBankData.id}" /><br/><br/>--%>
             <label class="control-label"><font color="red">*</font>户名：</label>
-            <form:input path="bankUserName" htmlEscape="false" maxlength="10" class="input-xlarge required" required="true"
+            <form:input path="bankUserName" htmlEscape="false" class="input-xlarge required" required="true"
                         id="bankAccount"/><br/><br/>
             <label class="control-label"><font color="red">*</font>开户行：</label>
-            <form:input path="bankOfDeposit" htmlEscape="false" maxlength="10" class="input-xlarge required" required="true"
+            <form:input path="bankOfDeposit" htmlEscape="false" class="input-xlarge required" required="true"
                         id="bankAccount"/><br/><br/>
             <label class="control-label"><font color="red">*</font>银行卡号：</label>
-            <form:input path="bankCardNo" htmlEscape="false" maxlength="10" class="input-xlarge required" required="true"
+            <form:input path="bankCardNo" htmlEscape="false" maxlength="20" class="input-xlarge required" required="true"
                         id="bankAccount"/>
         </div>
 

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

@@ -22,7 +22,7 @@
 </ul>
 <form:form id="searchForm" class="breadcrumb form-search">
     <div class="ul-form">
-        <label><font color="red">银行账号请以银行名称加卡号后四位命名</font></label>
+        <label><font color="red">银行账号请以银行名称加卡号后4位命名，用于线下收款选择收款类型</font></label>
     </div>
 </form:form>
 
@@ -33,7 +33,17 @@
         <div class="control-group">
             <form:hidden path="id" />
             <label class="control-label"><font color="red">*</font>银行账号：</label>
-            <form:input path="bankAccount" htmlEscape="false" maxlength="10" class="input-xlarge required" required="true" id="bankAccount"/>
+            <form:input path="bankAccount" htmlEscape="false" maxlength="10" class="input-xlarge required" required="true"
+                        id="bankAccount"/><br/><br/>
+            <label class="control-label"><font color="red">*</font>户名：</label>
+            <form:input path="bankUserName" htmlEscape="false" class="input-xlarge required" required="true"
+                        id="bankAccount"/><br/><br/>
+            <label class="control-label"><font color="red">*</font>开户行：</label>
+            <form:input path="bankOfDeposit" htmlEscape="false" class="input-xlarge required" required="true"
+                        id="bankAccount"/><br/><br/>
+            <label class="control-label"><font color="red">*</font>银行卡号：</label>
+            <form:input path="bankCardNo" htmlEscape="false" maxlength="20" class="input-xlarge required" required="true"
+                        id="bankAccount"/>
         </div>
 
         <div class="form-actions">

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

@@ -29,7 +29,7 @@
     <table id="contentTable" class="table table-striped table-bordered table-condensed">
         <thead>
         <tr>
-            <th>ID</th>
+            <th>序号</th>
             <th>银行账号</th>
             <th>商城显示</th>
             <th>创建时间</th>
@@ -37,15 +37,13 @@
         </tr>
         </thead>
         <tbody>
-        <c:forEach items="${page.list}" var="cmOfflineCollections">
+        <c:forEach items="${page.list}" var="cmOfflineCollections" varStatus="Collections">
             <tr>
-                <td>${cmOfflineCollections.id}</td>
+                <td>${Collections.index + 1}</td>
                 <td>${cmOfflineCollections.bankAccount}</td>
                 <td>
                     <c:if test="${cmOfflineCollections.isDisplay == '1'}">
-                        <div style="width:20px;height:20px; background: #f1f1f1;">
-                            <font style="size: 100px; color: #00aa00">√</font>
-                        </div>
+                        <img alt="启用" src="/static/images/yes.gif" width="15px" border="none" title="启用">
                     </c:if>
                 </td>
                 <td>${cmOfflineCollections.creationTime}</td>
@@ -65,7 +63,7 @@
                                 onclick="return confirmx('确定取消该银行账号作为线下收款方式在商城进行展示吗？', this.href)">取消商城显示</a>
                         </c:if>
                         <c:if test="${cmOfflineCollections.isDisplay == '0'}">
-                            <a  href="${ctx}/order/CmOfflineCollection/upBankFrom?id=${cmOfflineCollections.id}"
+                            <a  href="${ctx}/order/CmOfflineCollection/upBankDisplay?id=${cmOfflineCollections.id}"
                                onclick="return confirmx('确定将该银行账号作为线下收款方式在商城进行展示吗？', this.href)">设为商城显示</a>
                         </c:if>
                     </c:if>&nbsp;&nbsp;