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

src/main/java/com/caimei/modules/product/service/ProductNewService.java

@@ -100,14 +100,14 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
         List<Product> list = dao.findList(entity);
         list.forEach(p -> {
             CmSku sku = productDao.findSku(p.getProductID());
-            if(null!=sku){
+            if (null != sku) {
                 p.setPrice(sku.getPrice());
                 p.setNormalPrice(sku.getNormalPrice());
                 Integer costCheckFlag = sku.getCostCheckFlag();
                 p.setCostCheckFlag(costCheckFlag.toString());
-                if(1==costCheckFlag){
+                if (1 == costCheckFlag) {
                     p.setCostPrice(sku.getCostPrice().toString());
-                }else{
+                } else {
                     p.setSqlCostProportional(sku.getCostProportional());
                 }
             }

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

@@ -120,7 +120,6 @@ public class ProductNewController extends BaseController {
     @RequiresPermissions("product:product:view")
     @RequestMapping(value = {"list", ""})
     public String list(Product product, HttpServletRequest request, HttpServletResponse response, Model model) {
-        Product pro = product;
         String id = product.getId();
         if (StringUtils.isEmpty(id)) {
             String shopName = product.getSearchShopName();
@@ -267,9 +266,7 @@ public class ProductNewController extends BaseController {
             // 单个商品搜索
             model.addAttribute("editFlag", "1");
         }
-
         if ("1".equals(product.getProductCategory())) {
-
             return "modules/product-new/productList";
         } else {
             return "modules/product-new/secondHand";

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

@@ -106,6 +106,7 @@
         co.onlinePayFlag AS onlinePayFlag,
         bou.shouHuoRen AS receiver,
         u.name AS buyer,
+        c.clubID AS clubID,
         co.orderSource AS orderSource,
         co.orderTotalFee AS orderTotalFee,
         co.payableAmount AS payableAmount,

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

@@ -274,12 +274,12 @@
 <%--                </c:if>--%>
 <%--            </li>--%>
             <li>
-
-                <c:if test="${order.organizeID == 1}">
-                    <span class="org-note">星范</span>
-                </c:if>
-
-                    ${order.buyer}
+                <a href="${ctx}/new/user/agency/clubPortrait?clubID=${order.clubID}&dateType=0&type=4">
+                    <c:if test="${order.organizeID == 1}">
+                        <span class="org-note">星范</span>
+                    </c:if>
+                        ${order.buyer}
+                </a>
             </li>
             <li>${order.receiver}</li>
             <li>${fns:getDictLabel(order.orderSource,"bp_orderSource","" )}</li>

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

@@ -427,19 +427,26 @@
             <div class="item">
                 <input id="searchValidFlag" value="${product.searchValidFlag}" style="display: none"/>
                 <label>商品状态：</label>
-                <label><input type="checkbox" name="searchValidFlag" onchange="checkNot()" id="validCheck2" class="validCheck"
+                <label><input type="checkbox" name="searchValidFlag" onchange="checkNot()" id="validCheck2"
+                              class="validCheck"
                               value="2">已上架</label>
-                <label><input type="checkbox" name="searchValidFlag" onchange="checkNot()" id="validCheck9" class="validCheck"
+                <label><input type="checkbox" name="searchValidFlag" onchange="checkNot()" id="validCheck9"
+                              class="validCheck"
                               value="9">已隐身</label>
-                <label><input type="checkbox" name="searchValidFlag" onchange="checkNot()" id="validCheck1" class="validCheck"
+                <label><input type="checkbox" name="searchValidFlag" onchange="checkNot()" id="validCheck1"
+                              class="validCheck"
                               value="1">待审核</label>
-                <label><input type="checkbox" name="searchValidFlag" onchange="checkNot()" id="validCheck3" class="validCheck"
+                <label><input type="checkbox" name="searchValidFlag" onchange="checkNot()" id="validCheck3"
+                              class="validCheck"
                               value="3">已下架</label>
-                <label><input type="checkbox" name="searchValidFlag" onchange="checkNot()" id="validCheck8" class="validCheck"
+                <label><input type="checkbox" name="searchValidFlag" onchange="checkNot()" id="validCheck8"
+                              class="validCheck"
                               value="8">审核未通过</label>
-                <label><input type="checkbox" name="searchValidFlag" onchange="checkNot()" id="validCheck7" class="validCheck"
+                <label><input type="checkbox" name="searchValidFlag" onchange="checkNot()" id="validCheck7"
+                              class="validCheck"
                               value="7">已冻结</label>
-                <label><input type="checkbox" name="searchValidFlag" onchange="checkNot()" id="validCheck0" class="validCheck"
+                <label><input type="checkbox" name="searchValidFlag" onchange="checkNot()" id="validCheck0"
+                              class="validCheck"
                               value="0">已删除</label>
                 <label><input type="checkbox" name="searchValidFlag" id="validCheck" onchange="checkValid()">所有</label>
             </div>
@@ -662,8 +669,8 @@
                 <c:if test="${product.productCategory ne 2}">
                     <c:if test="${product.validFlag ne 0}">
                         <td class="todo">
-<%--                            <a href="javascript:;"--%>
-<%--                               onclick="jumpHref('${ctx}/product/new/fastEdit?id=${product.id}&searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&searchProductCategory=${searchProductCategory}')">快编</a>--%>
+                                <%--                            <a href="javascript:;"--%>
+                                <%--                               onclick="jumpHref('${ctx}/product/new/fastEdit?id=${product.id}&searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&searchProductCategory=${searchProductCategory}')">快编</a>--%>
                             <a href="javascript:;"
                                onclick="jumpHref('${ctx}/product/new/productEdit?id=${product.id}&searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&searchProductCategory=${searchProductCategory}&editFlag=${editFlag}')">商品编辑</a>
                             <a href="javascript:;"
@@ -671,16 +678,16 @@
                             <a href="javascript:void(0);" onclick="updateIndex('${product.id}')">更新索引</a>
                             <a href="javascript:;"
                                onclick="jumpHref('${ctx}/product/new/imageList?id=${product.id}&searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&searchProductCategory=${searchProductCategory}')">图片管理</a>
-<%--                            <a href="javascript:;"--%>
-<%--                               onclick="jumpHref('${ctx}/product/hehe/edit?id=${product.id}&searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&searchProductCategory=${searchProductCategory}')">参与呵呵商城</a>--%>
+                                <%--                            <a href="javascript:;"--%>
+                                <%--                               onclick="jumpHref('${ctx}/product/hehe/edit?id=${product.id}&searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&searchProductCategory=${searchProductCategory}')">参与呵呵商城</a>--%>
                             <br>
                             <c:if test="${product.validFlag eq 1 or product.validFlag eq 8}">
                                 <a class="red" href="javascript:void(0);"
-                                   onclick="auditThis(${product.id},'${product.brand.name}','${product.brand.status}','${product.costCheckFlag}','${product.costPrice}','${product.costProportional}','${product.newvalidFlag}','${product.showTime}','${product.addTime}','${product.newProductType}')">上架审核</a>
+                                   onclick="auditThis(${product.id},'${product.brand.name}','${product.brand.status}','${product.costCheckFlag}','${product.costPrice}','${product.sqlCostProportional}','${product.newvalidFlag}','${product.showTime}','${product.addTime}','${product.newProductType}')">上架审核</a>
                             </c:if>
                             <c:if test="${product.newProductType eq 1 &&  product.newvalidFlag != 1 && product.validFlag == 2}"><a
                                     class="red" href="javascript:void(0);"
-                                    onclick="auditThis(${product.id},'${product.brand.name}','${product.brand.status}','${product.costCheckFlag}','${product.costPrice}','${product.costProportional}','${product.newvalidFlag}','${product.showTime}','${product.addTime}','${product.newProductType}','${product.validFlag}')">新品展示审核</a></c:if>
+                                    onclick="auditThis(${product.id},'${product.brand.name}','${product.brand.status}','${product.costCheckFlag}','${product.costPrice}','${product.sqlCostProportional}','${product.newvalidFlag}','${product.showTime}','${product.addTime}','${product.newProductType}','${product.validFlag}')">新品展示审核</a></c:if>
                             <c:if test="${product.validFlag ne 10 && product.validFlag ne 1 && product.validFlag ne 8}">
                                 <a class="red" href="javascript:void(0);"
                                    onclick="validChange(${product.id}, 10)">冻结</a>
@@ -746,6 +753,7 @@
         $("#searchForm").submit();
         return false;
     }
+
     // preferredFlag条件搜索
     $(function () {
         $('.check-cfm-btn').on('click', function (e) {
@@ -871,10 +879,10 @@
         }
     }
 
-    function checkNot(){
-        var check=document.getElementsByClassName('validCheck');
+    function checkNot() {
+        var check = document.getElementsByClassName('validCheck');
         for (let i = 0; i < check.length; i++) {
-            if(check[i].checked){
+            if (check[i].checked) {
                 $("#validCheck").attr("checked", null);
             }
         }

src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyList.jsp

@@ -184,7 +184,7 @@
             <td>${newCmClubList.clubID}</td>
             <td>
 <%--                <c:if test="${newCmClubList.userIdentity eq 2}">--%>
-                    ${newCmClubList.name}
+                <a href="${ctx}/new/user/agency/clubPortrait?clubID=${newCmClubList.clubID}&clubName=${newCmClubList.name}&dateType=0&type=4">${newCmClubList.name}</a>
 <%--                </c:if>--%>
 <%--                <c:if test="${newCmClubList.userIdentity eq 4}">--%>
 <%--                    <c:if test="${newCmClubList.name ne newCmClubList.userName}">--%>