商品详情显示

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

@@ -97,40 +97,25 @@ public class CmOfflineCollectionController extends BaseController {
      * @return
      */
     @RequestMapping(value = "insBank")
-    public String insBank(CmOfflineCollection cmOfflineCollection,Model model, RedirectAttributes redirectAttributes){
+    public String insBank(CmOfflineCollection cmOfflineCollection,RedirectAttributes redirectAttributes){
         if (cmOfflineCollection.getId() == null || cmOfflineCollection.getId() == "") {
-            if (null == cmOfflineCollection.getBankAccount() || cmOfflineCollection.getBankAccount().equals("")) {
-                addMessage(redirectAttributes, "银行账户为空，添加失败！");
-                return "redirect:" + Global.getAdminPath() + "/order/CmOfflineCollection/from";
-            }
+
             Boolean insertBank = cmOfflineCollectionService.insertBank(cmOfflineCollection);
-            model.addAttribute("cmOfflineCollection", cmOfflineCollection);
+//            model.addAttribute("cmOfflineCollection", cmOfflineCollection);
             if (insertBank) {
                 addMessage(redirectAttributes, "银行账户添加成功");
-                return "redirect:" + Global.getAdminPath() + "/order/CmOfflineCollection/List";
+                return "redirect:" + Global.getAdminPath() +"/order/CmOfflineCollection/List";
+            } else {
+                addMessage(redirectAttributes, "银行账户添加失败！");
+                return "redirect:" + Global.getAdminPath() + "/order/CmOfflineCollection/from";
             }
-            addMessage(redirectAttributes, "银行账户添加失败！");
-            return "redirect:" + Global.getAdminPath() + "/order/CmOfflineCollection/from";
         } else {
             cmOfflineCollectionService.editData(cmOfflineCollection);
             addMessage(redirectAttributes, "银行账户修改成功");
+            // model.addAttribute("message", "银行账户修改成功");
             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";
-    }*/
 
     /**
      * 设置商城显示
@@ -141,6 +126,7 @@ public class CmOfflineCollectionController extends BaseController {
     public String upBankDisplay(CmOfflineCollection cmOfflineCollection, RedirectAttributes redirectAttributes){
         Boolean BankDisplay = cmOfflineCollectionService.upBankDisplay(cmOfflineCollection);
         if (BankDisplay) {
+            addMessage(redirectAttributes,"设置商城显示成功");
             return "redirect:" + Global.getAdminPath() +"/order/CmOfflineCollection/List";
         }
         addMessage(redirectAttributes,"设置商城显示失败");
@@ -158,6 +144,7 @@ public class CmOfflineCollectionController extends BaseController {
         Boolean noBankDisplay = cmOfflineCollectionService.NoBankDisplay(cmOfflineCollection);
         model.addAttribute("cmOfflineCollection",cmOfflineCollection);
         if (noBankDisplay) {
+            addMessage(redirectAttributes,"设置商城不显示成功");
             return "redirect:" + Global.getAdminPath() +"/order/CmOfflineCollection/List";
         }
         addMessage(redirectAttributes,"设置商城不显示失败");

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -189,6 +189,11 @@ public class Product extends DataEntity<Product> {
      */
     private String visibility;
 
+    /**
+     * 商品详情可见度：0所有人不可见，1所有人可见，2所有机构可见，3仅会员机构可见，4仅医美机构可见
+     */
+    private String commodityDetailsFlag;
+
     /**
      * 商品标签 用逗号隔开
      */
@@ -1220,6 +1225,14 @@ public class Product extends DataEntity<Product> {
         this.visibility = visibility;
     }
 
+    public String getCommodityDetailsFlag() {
+        return commodityDetailsFlag;
+    }
+
+    public void setCommodityDetailsFlag(String commodityDetailsFlag) {
+        this.commodityDetailsFlag = commodityDetailsFlag;
+    }
+
     public String getTags() {
         return tags;
     }

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -74,6 +74,7 @@
 		a.recommendType AS "recommendType",
 		a.aliasName as "aliasName",
 		a.visibility as "visibility",
+# 		a.commodityDetailsFlag as "commodityDetailsFlag",
 		a.productType as "productType",
 		a.qualificationImg as "qualificationImg",
 		a.includedTax as "includedTax",
@@ -395,6 +396,7 @@
                             costCheckFlag,
                             precisehKey,
                             visibility,
+							commodityDetailsFlag,
                             productType,
                             qualificationImg,
                             invoiceType,
@@ -485,6 +487,7 @@
         #{costCheckFlag},
         #{precisehKey},
         #{visibility},
+        #{commodityDetailsFlag}
         #{productType},
         #{qualificationImg},
         #{invoiceType},
@@ -1691,6 +1694,9 @@
 			<if test="visibility != null and visibility !=''">
 				visibility = #{visibility},
 			</if>
+		    <if test="commodityDetailsFlag != null and commodityDetailsFlag != ''">
+				commodityDetailsFlag = #{commodityDetailsFlag},
+			</if>
 			<if test="productType != null and productType !=''">
 				productType = #{productType},
 			</if>

src/main/resources/mappings/modules/product/ProductNewMapper.xml

@@ -77,6 +77,7 @@
         a.recommendType AS "recommendType",
         a.aliasName as "aliasName",
         a.visibility as "visibility",
+        a.commodityDetailsFlag as "commodityDetailsFlag",
         a.productType as "productType",
         a.qualificationImg as "qualificationImg",
         a.includedTax as "includedTax",

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

@@ -5,12 +5,9 @@
     <title>添加</title>
     <meta name="decorator" content="default"/>
     <script type="text/javascript">
-        function required() {
-            var bankAccount = document.getElementById('bankAccount').val();
-            if (bankAccount == null || bankAccount == '') {
-                alert('请输入银行账号')
-                return ;
-            }
+        // 输入框只能输入数字
+        function onlynum(obj) {
+            obj.value = obj.value.replace(/[^\d]/g, ""); //清除"数字"以外的字符
         }
     </script>
 </head>
@@ -42,17 +39,12 @@
             <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"
+            <form:input path="bankCardNo" htmlEscape="false" maxlength="20" class="input-xlarge required" required="true" onchange="onlynum(this)"
                         id="bankAccount"/>
         </div>
 
         <div class="form-actions">
-<%--            <c:if test="${cmOfflineCollection.id eq '0'}">--%>
-                <input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
-<%--            </c:if>--%>
-<%--            <c:if test="${cmOfflineCollection.id ne '0'}">--%>
-<%--                <input id="btnSubmit" class="btn btn-primary" style="width: 30px" onclick="window.location='${ctx}/order/CmOfflineCollection/edit'" value="保存"/>&nbsp;--%>
-<%--            </c:if>--%>
+            <input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
             <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
         </div>
     </form:form>

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

@@ -1,10 +1,13 @@
-<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ page import="com.thinkgem.jeesite.common.config.Global" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
     <title>线下收款账号配置</title>
     <meta name="decorator" content="default"/>
+    <style>
 
+    </style>
 </head>
 <body>
 <ul class="nav nav-tabs">
@@ -16,7 +19,6 @@
     <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>银行账号：</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;
@@ -24,58 +26,68 @@
         <div class="clearfix"></div>
     </div>
 </form:form>
-<%--<sys:message content="${message}"/>--%>
-    <table id="contentTable" class="table table-striped table-bordered table-condensed">
-        <thead>
+<sys:message content="${message}"/>
+<table id="contentTable" class="table table-striped table-bordered table-condensed">
+    <thead>
+    <tr>
+        <th>序号</th>
+        <th>银行账号</th>
+        <th>商城显示</th>
+        <th>创建时间</th>
+        <th>操作</th>
+    </tr>
+    </thead>
+    <tbody>
+    <c:forEach items="${page.list}" var="cmOfflineCollections" varStatus="Collections">
         <tr>
-            <th>序号</th>
-            <th>银行账号</th>
-            <th>商城显示</th>
-            <th>创建时间</th>
-            <th>操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        <c:forEach items="${page.list}" var="cmOfflineCollections" varStatus="Collections">
-            <tr>
-                <td>${Collections.index + 1}</td>
-                <td>${cmOfflineCollections.bankAccount}</td>
-                <td>
+            <td>${Collections.index + 1}</td>
+            <td>${cmOfflineCollections.bankAccount}</td>
+            <td>
+                <c:if test="${cmOfflineCollections.isDisplay == '1'}">
+                    <img alt="启用" src="/static/images/yes.gif" width="15px" border="none" title="启用">
+                </c:if>
+            </td>
+            <td>${cmOfflineCollections.creationTime}</td>
+            <td>
+                <c:if test="${cmOfflineCollection.isDis == 1}">
+                    <c:if test="${cmOfflineCollections.isDisplay == '1'}">
+                        <a  href="${ctx}/order/CmOfflineCollection/upNoBankDisplay?id=${cmOfflineCollections.id}"
+                            onclick="return confirmx('确定取消该银行账号作为线下收款方式在商城进行展示吗？', this.href)">取消商城显示</a>
+                    </c:if>
+                    <c:if test="${cmOfflineCollections.isDisplay == '0'}">
+                        <a style="color: #666666">设为商城显示</a>
+                    </c:if>
+                </c:if>&nbsp;&nbsp;
+                <c:if test="${cmOfflineCollection.isDis == 0}">
                     <c:if test="${cmOfflineCollections.isDisplay == '1'}">
-                        <img alt="启用" src="/static/images/yes.gif" width="15px" border="none" title="启用">
+                        <a  href="${ctx}/order/CmOfflineCollection/upNoBankDisplay?id=${cmOfflineCollections.id}"
+                            onclick="return confirmx('确定取消该银行账号作为线下收款方式在商城进行展示吗？', this.href)">取消商城显示</a>
                     </c:if>
-                </td>
-                <td>${cmOfflineCollections.creationTime}</td>
-                <td>
-                    <c:if test="${cmOfflineCollection.isDis == 1}">
-                        <c:if test="${cmOfflineCollections.isDisplay == '1'}">
-                            <a  href="${ctx}/order/CmOfflineCollection/upNoBankDisplay?id=${cmOfflineCollections.id}"
-                               onclick="return confirmx('确定取消该银行账号作为线下收款方式在商城进行展示吗？', this.href)">取消商城显示</a>
-                        </c:if>
-                        <c:if test="${cmOfflineCollections.isDisplay == '0'}">
-                            <a style="color: #666666">设为商城显示</a>
-                        </c:if>
-                    </c:if>&nbsp;&nbsp;
-                    <c:if test="${cmOfflineCollection.isDis == 0}">
-                        <c:if test="${cmOfflineCollections.isDisplay == '1'}">
-                            <a  href="${ctx}/order/CmOfflineCollection/upNoBankDisplay?id=${cmOfflineCollections.id}"
-                                onclick="return confirmx('确定取消该银行账号作为线下收款方式在商城进行展示吗？', this.href)">取消商城显示</a>
-                        </c:if>
-                        <c:if test="${cmOfflineCollections.isDisplay == '0'}">
-                            <a  href="${ctx}/order/CmOfflineCollection/upBankDisplay?id=${cmOfflineCollections.id}"
-                               onclick="return confirmx('确定将该银行账号作为线下收款方式在商城进行展示吗？', this.href)">设为商城显示</a>
-                        </c:if>
-                    </c:if>&nbsp;&nbsp;
-                        <%--                ${ctx}/order/cmRefundShop/toRefund?id=${cmRefundShop.id}--%>
-                    <a href="${ctx}/order/CmOfflineCollection/editBank?id=${cmOfflineCollections.id}">编辑</a>&nbsp;&nbsp;
-                    <a href="${ctx}/order/CmOfflineCollection/deleteBank?id=${cmOfflineCollections.id}"
-                    onclick="return confirmx('确定删除该银行账号吗？', this.href)">删除</a>
-                </td>
-            </tr>
-        </c:forEach>
-        </tbody>
-    </table>
-    <div class="pagination">${page}</div>
-</div>
+                    <c:if test="${cmOfflineCollections.isDisplay == '0'}">
+                        <a  href="${ctx}/order/CmOfflineCollection/upBankDisplay?id=${cmOfflineCollections.id}"
+                            onclick="return confirmx('确定将该银行账号作为线下收款方式在商城进行展示吗？', this.href)">设为商城显示</a>
+                    </c:if>
+                </c:if>&nbsp;&nbsp;
+                    <%--                ${ctx}/order/cmRefundShop/toRefund?id=${cmRefundShop.id}--%>
+                <a href="${ctx}/order/CmOfflineCollection/editBank?id=${cmOfflineCollections.id}">编辑</a>&nbsp;&nbsp;
+                <a href="${ctx}/order/CmOfflineCollection/deleteBank?id=${cmOfflineCollections.id}"
+                   onclick="return confirmx('确定删除该银行账号吗？', this.href)">删除</a>
+            </td>
+        </tr>
+    </c:forEach>
+    </tbody>
+</table>
+<div class="pagination">${page}</div>
+
+<% request.setAttribute("caimeiCore", Global.getConfig("caimei.core"));%>
+<script type="text/javascript">
+    function page(n, s) {
+        $("#pageNo").val(n);
+        $("#pageSize").val(s);
+        $("#searchForm").submit();
+        return false;
+    }
+
+</script>
 </body>
 </html>

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -504,7 +504,7 @@
                     <form:option value="0" label="其它"/>
                 </form:select>
                 <span class="machineType">
-                    <form:select path="machineType" class="input-small">
+                    <form:select path="machineType" id="machineType" onchange="js()" class="input-small">
                         <form:option value="" label="请选择"/>
                         <form:option value="1" label="一类"/>
                         <form:option value="2" label="二类"/>
@@ -715,6 +715,17 @@
                 </form:select>
             </td>
         </tr>
+        <tr>
+            <th><span class="red">*</span>商品详情可见度：</th>
+            <td colspan="3">
+                <form:select path="commodityDetailsFlag" class="input-large required">
+                    <form:option value="1" label="所有人可见"/>
+                    <form:option value="2" label="所有机构可见"/>
+                    <form:option value="3" label="仅会员机构可见"/>
+                    <form:option value="4" label="仅医美机构可见"/>
+                </form:select>
+            </td>
+        </tr>
         <tr>
             <th><span class="red">*</span>成本：</th>
             <td colspan="3">
@@ -886,8 +897,8 @@
 <script type="text/javascript" src="${ctxStatic}/ckeditor5-new/ckeditor.js"></script>
 <script type="text/javascript">
 
-    $(function () {
-        debugger
+    /*$(function () {
+        // debugger
         var productType= $("#productType").val();
         if (productType=="2"){
             $("#s2id_priceFlag").val(3);
@@ -897,20 +908,47 @@
             $("#priceFlag").prop("disabled",true);
             $("#visibility").prop("disabled",true);
         }
-    });
+    });*/
 
     function js(){
             var val = $("#productType").val();
+            var mac = $("#machineType").val();
             if(val == '2'){
-                $("#priceFlag").val(3);
-                $("#visibility").val(4);
-                $("#visibility").prev().find(".select2-chosen").text("所有人可见");
-                $("#priceFlag").prev().find(".select2-chosen").text("仅对医美机构开放");
-                $("#priceFlag").prop("disabled",true);
-                $("#visibility").prop("disabled",true);
+                if (mac == '1') {
+                    // 械字号一类
+                    $("#visibility").val(3);
+                    $("#priceFlag").val(0);
+                    $("#commodityDetailsFlag").val(1);
+                    $("#visibility").prev().find(".select2-chosen").text("所有人可见");
+                    $("#priceFlag").prev().find(".select2-chosen").text("对所有机构公开");
+                    $("#commodityDetailsFlag").prev().find(".select2-chosen").text("所有人可见");
+                } else if (mac == '2') {
+                    // 械字号二类
+                    $("#visibility").val(3);
+                    $("#priceFlag").val(0);
+                    $("#commodityDetailsFlag").val(4);
+                    $("#visibility").prev().find(".select2-chosen").text("所有人可见");
+                    $("#priceFlag").prev().find(".select2-chosen").text("对所有机构公开");
+                    $("#commodityDetailsFlag").prev().find(".select2-chosen").text("仅医美机构可见");
+                } else if(mac == '3') {
+                    // 械字号三类
+                    $("#visibility").val(3);
+                    $("#priceFlag").val(0);
+                    $("#commodityDetailsFlag").val(4);
+                    $("#visibility").prev().find(".select2-chosen").text("所有人可见");
+                    $("#priceFlag").prev().find(".select2-chosen").text("对所有机构公开");
+                    $("#commodityDetailsFlag").prev().find(".select2-chosen").text("仅医美机构可见");
+                }
+                // $("#priceFlag").val(3);
+                // $("#visibility").val(4);
+                // $("#visibility").prev().find(".select2-chosen").text("所有人可见");
+                // $("#priceFlag").prev().find(".select2-chosen").text("仅对医美机构开放");
+                // $("#priceFlag").prop("disabled",true);
+                // $("#visibility").prop("disabled",true);
             } else {
-            $("#priceFlag").prop("disabled",false);
-            $("#visibility").prop("disabled",false);
+                $("#priceFlag").prop("disabled",false);
+                $("#visibility").prop("disabled",false);
+                $("#commodityDetailsFlag").prop("disabled",false);
             }
         }
 
@@ -1258,7 +1296,7 @@
 
     //初始化标签
     $(function () {
-        debugger
+        // debugger
         var html = '';
         //解析参数
         var tagsLists = $("#tagsLists").val();
@@ -1333,7 +1371,7 @@
 
     //富文本框编辑
     function checkInfo() {
-        debugger
+        // debugger
 
         var productType= $("#productType").val();
         var qualificationNo=  $('#qualificationNo').val()

src/main/webapp/WEB-INF/views/modules/product-new/productList.jsp

@@ -468,6 +468,7 @@
         <th>机构价</th>
         <th>商品可见度</th>
         <th>价格可见度</th>
+        <th>商品详情可见度</th>
         <th>线上分帐号</th>
         <th>商品状态</th>
         <th>新品参与状态</th>
@@ -553,6 +554,20 @@
                     </c:if>
                 </c:if>
             </td>
+            <td>
+                <c:if test="${product.commodityDetailsFlag eq 1}">
+                    所有人可见
+                </c:if>
+                <c:if test="${product.commodityDetailsFlag eq 2}">
+                    所有机构可见
+                </c:if>
+                <c:if test="${product.commodityDetailsFlag eq 3}">
+                    仅会员机构可见
+                </c:if>
+                <c:if test="${product.commodityDetailsFlag eq 3}">
+                    仅医美机构可见
+                </c:if>
+            </td>
             <td>
                     ${product.splitCode}
             </td>