Duan_xu 2 년 전
부모
커밋
8a5f68d188

+ 4 - 1
src/main/java/com/caimei/modules/newhome/dao/NewPageFloorDao.java

@@ -4,6 +4,7 @@ import com.caimei.modules.newhome.entity.NewPageFloor;
 import com.caimei.modules.newhome.entity.NewPageFloorContent;
 import com.caimei.modules.newhome.entity.NewPageFloorImage;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
+import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,4 +32,6 @@ public interface NewPageFloorDao extends CrudDao<NewPageFloor> {
     void deleteFloorImage(@Param("floorId") Integer floorId,@Param("status") Integer status);
 
     void insertFloorImage(NewPageFloorImage floorImage);
-}
+
+    List<NewPageFloor> floorFindList( NewPageFloor newPageFloor);
+}

+ 19 - 10
src/main/java/com/caimei/modules/newhome/entity/NewPageFloor.java

@@ -10,15 +10,24 @@ import com.thinkgem.jeesite.common.persistence.DataEntity;
  * @version 2019-03-14
  */
 public class NewPageFloor extends DataEntity<NewPageFloor> {
-	
+
 	private static final long serialVersionUID = 1L;
 	private String floorTitle;		// 楼层标题
 	private String floorDetail;		// 楼层描述
 	private String type;		// 楼层类型:1:推荐专区、2:团购促销、3:优质供应商、4:商品专题、5:小专题、6:大专题
 	private String sort;		// 排序
 	private String wwwEnabledStatus;		// Pc端状态 0停用 1启用
-	private String crmEnabledStatus;		// CRM端状态 0停用 1启用
-	
+	private String crmEnabledStatus;// CRM端状态 0停用 1启用
+	private Integer floorType;
+
+	public Integer getFloorType() {
+		return floorType;
+	}
+
+	public void setFloorType(Integer floorType) {
+		this.floorType = floorType;
+	}
+
 	public NewPageFloor() {
 		super();
 	}
@@ -35,7 +44,7 @@ public class NewPageFloor extends DataEntity<NewPageFloor> {
 	public void setFloorTitle(String floorTitle) {
 		this.floorTitle = floorTitle;
 	}
-	
+
 	@Length(min=0, max=255, message="楼层描述长度必须介于 0 和 255 之间")
 	public String getFloorDetail() {
 		return floorDetail;
@@ -44,7 +53,7 @@ public class NewPageFloor extends DataEntity<NewPageFloor> {
 	public void setFloorDetail(String floorDetail) {
 		this.floorDetail = floorDetail;
 	}
-	
+
 	@Length(min=0, max=1, message="楼层类型:1:推荐专区、2:团购促销、3:优质供应商、4:商品专题、5:小专题、6:大专题长度必须介于 0 和 1 之间")
 	public String getType() {
 		return type;
@@ -53,7 +62,7 @@ public class NewPageFloor extends DataEntity<NewPageFloor> {
 	public void setType(String type) {
 		this.type = type;
 	}
-	
+
 	@Length(min=0, max=11, message="排序长度必须介于 0 和 11 之间")
 	public String getSort() {
 		return sort;
@@ -62,7 +71,7 @@ public class NewPageFloor extends DataEntity<NewPageFloor> {
 	public void setSort(String sort) {
 		this.sort = sort;
 	}
-	
+
 	@Length(min=0, max=1, message="Pc端状态 0停用 1启用长度必须介于 0 和 1 之间")
 	public String getWwwEnabledStatus() {
 		return wwwEnabledStatus;
@@ -71,7 +80,7 @@ public class NewPageFloor extends DataEntity<NewPageFloor> {
 	public void setWwwEnabledStatus(String wwwEnabledStatus) {
 		this.wwwEnabledStatus = wwwEnabledStatus;
 	}
-	
+
 	@Length(min=0, max=1, message="CRM端状态 0停用 1启用长度必须介于 0 和 1 之间")
 	public String getCrmEnabledStatus() {
 		return crmEnabledStatus;
@@ -80,5 +89,5 @@ public class NewPageFloor extends DataEntity<NewPageFloor> {
 	public void setCrmEnabledStatus(String crmEnabledStatus) {
 		this.crmEnabledStatus = crmEnabledStatus;
 	}
-	
-}
+
+}

+ 9 - 1
src/main/java/com/caimei/modules/newhome/service/NewPageFloorService.java

@@ -43,6 +43,14 @@ public class NewPageFloorService extends CrudService<NewPageFloorDao, NewPageFlo
         return super.findPage(page, newPageFloor);
     }
 
+    public Page<NewPageFloor> floorFindList(Page<NewPageFloor> page, NewPageFloor newPageFloor) {
+        page.setOrderBy("-sort desc,createDate desc");
+        newPageFloor.setPage(page);
+        List<NewPageFloor> payOrderList = newPageFloorDao.floorFindList(newPageFloor);
+        page.setList(payOrderList);
+        return page;
+    }
+
     @Transactional(readOnly = false)
     public void save(NewPageFloor newPageFloor) {
         super.save(newPageFloor);
@@ -167,4 +175,4 @@ public class NewPageFloorService extends CrudService<NewPageFloorDao, NewPageFlo
             }
         }
     }
-}
+}

+ 8 - 0
src/main/java/com/caimei/modules/newhome/web/NewPageFloorController.java

@@ -77,6 +77,14 @@ public class NewPageFloorController extends BaseController {
         return "modules/newhome/newPageFloorList";
     }
 
+
+    @RequestMapping(value = {"lists"})
+    public String lists(NewPageFloor newPageFloor, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<NewPageFloor> page = newPageFloorService.floorFindList(new Page<NewPageFloor>(request, response), newPageFloor);
+        model.addAttribute("page", page);
+        return "modules/newhome/newPageFloorLists";
+    }
+
     @RequiresPermissions("newhome:newPageFloor:view")
     @RequestMapping(value = "form")
     public String form(NewPageFloor newPageFloor, Model model) {

+ 28 - 28
src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1823,34 +1823,34 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             }
         }
 
-        if (count == 1) {
-            try {
-                //发货短信推送(取消推送)
-                CmUser user = cmUserDao.get(order.getUserID().toString());
-                if (user != null && StringUtils.isNotBlank(user.getBindMobile()) && "0".equals(order.getRebateFlag())) {
-                    String wwwServer = Global.getConfig("wwwServer");
-                    boolean sendSms = false;
-                    if ("2".equals(order.getSendOutStatus()) && "1".equals(sendOutStatus)) {
-                        //部分发货
-                        String shortLink = getShortLink(8, 7, wwwServer + "user/order/detail.html?orderId=" + order.getOrderID());
-                        String content = "您的订单(订单编号:" + order.getOrderNo() + ")已部分发货。您可关注采美公众号或者访问采美微信小程序和网站查看订单。平台公众号:微信搜索“采美365网”; " +
-                                "微信小程序:微信搜索“采美采购商城”;网址:www.caimei365.com/t/" + shortLink;
-                        sendSms = getSendSms(7, user.getBindMobile(), content);
-                    } else if ("3".equals(order.getSendOutStatus())) {
-                        //已发货
-                        String shortLink = getShortLink(8, 8, wwwServer + "user/order/detail.html?orderId=" + order.getOrderID());
-                        String content = "您的订单(订单编号:" + order.getOrderNo() + ")已发货完毕。您可关注采美公众号或者访问采美微信小程序和网站查看订单。平台公众号:微信搜索“采美365网”; " +
-                                "微信小程序:微信搜索“采美采购商城”;网址:www.caimei365.com/t/" + shortLink;
-                        sendSms = getSendSms(8, user.getBindMobile(), content);
-                    }
-                    if (!sendSms) {
-                        logger.info("发货短信推送失败,订单id>>>>" + order.getOrderID());
-                    }
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
+//        if (count == 1) {
+//            try {
+//                //发货短信推送(取消推送)
+//                CmUser user = cmUserDao.get(order.getUserID().toString());
+//                if (user != null && StringUtils.isNotBlank(user.getBindMobile()) && "0".equals(order.getRebateFlag())) {
+//                    String wwwServer = Global.getConfig("wwwServer");
+//                    boolean sendSms = false;
+//                    if ("2".equals(order.getSendOutStatus()) && "1".equals(sendOutStatus)) {
+//                        //部分发货
+//                        String shortLink = getShortLink(8, 7, wwwServer + "user/order/detail.html?orderId=" + order.getOrderID());
+//                        String content = "您的订单(订单编号:" + order.getOrderNo() + ")已部分发货。您可关注采美公众号或者访问采美微信小程序和网站查看订单。平台公众号:微信搜索“采美365网”; " +
+//                                "微信小程序:微信搜索“采美采购商城”;网址:www.caimei365.com/t/" + shortLink;
+//                        sendSms = getSendSms(7, user.getBindMobile(), content);
+//                    } else if ("3".equals(order.getSendOutStatus())) {
+//                        //已发货
+//                        String shortLink = getShortLink(8, 8, wwwServer + "user/order/detail.html?orderId=" + order.getOrderID());
+//                        String content = "您的订单(订单编号:" + order.getOrderNo() + ")已发货完毕。您可关注采美公众号或者访问采美微信小程序和网站查看订单。平台公众号:微信搜索“采美365网”; " +
+//                                "微信小程序:微信搜索“采美采购商城”;网址:www.caimei365.com/t/" + shortLink;
+//                        sendSms = getSendSms(8, user.getBindMobile(), content);
+//                    }
+//                    if (!sendSms) {
+//                        logger.info("发货短信推送失败,订单id>>>>" + order.getOrderID());
+//                    }
+//                }
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
         return lb.getId();
     }
 

+ 41 - 17
src/main/resources/mappings/modules/newhome/NewPageFloorMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.modules.newhome.dao.NewPageFloorDao">
-    
+
 	<sql id="newPageFloorColumns">
 		a.id AS "id",
 		a.floorTitle AS "floorTitle",
@@ -14,22 +14,23 @@
 		a.createDate AS "createDate",
 		a.updateBy AS "updateBy.id",
 		a.updateDate AS "updateDate",
-		a.delFlag AS "delFlag"
+		a.delFlag AS "delFlag",
+        a.floorType AS "floorType"
 	</sql>
-	
+
 	<sql id="newPageFloorJoins">
 	</sql>
-    
+
 	<select id="get" resultType="NewPageFloor">
-		SELECT 
+		SELECT
 			<include refid="newPageFloorColumns"/>
 		FROM new_page_floor a
 		<include refid="newPageFloorJoins"/>
 		WHERE a.id = #{id}
 	</select>
-	
+
 	<select id="findList" resultType="NewPageFloor">
-		SELECT 
+		SELECT
 			<include refid="newPageFloorColumns"/>
 		FROM new_page_floor a
 		<include refid="newPageFloorJoins"/>
@@ -44,15 +45,38 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
+
+	<select id="floorFindList" resultType="NewPageFloor">
+		SELECT
+		<include refid="newPageFloorColumns"/>
+		FROM new_page_floor a
+		<include refid="newPageFloorJoins"/>
+
+		<where>
+			and floorType
+
+			AND delFlag = 0
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+
+
 	<select id="findAllList" resultType="NewPageFloor">
-		SELECT 
+		SELECT
 			<include refid="newPageFloorColumns"/>
 		FROM new_page_floor a
 		<include refid="newPageFloorJoins"/>
 		<where>
-			
-		</where>		
+
+		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -61,7 +85,7 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<insert id="insert" parameterType="NewPageFloor"  keyProperty="id" useGeneratedKeys="true">
 		INSERT INTO new_page_floor(
 			floorTitle,
@@ -93,9 +117,9 @@
 			#{delFlag}
 		)
 	</insert>
-	
+
 	<update id="update">
-		UPDATE new_page_floor SET 	
+		UPDATE new_page_floor SET
 			floorTitle = #{floorTitle},
 			floorDetail = #{floorDetail},
 			type = #{type},
@@ -109,7 +133,7 @@
 			delFlag = #{delFlag}
 		WHERE id = #{id}
 	</update>
-	
+
 	<delete id="delete">
 		UPDATE new_page_floor SET delFlag = 1
 		WHERE id = #{id}
@@ -239,5 +263,5 @@
 			#{sort}, #{createDate}, #{centreId}, #{displaySort}
 		  )
 	</insert>
-	
-</mapper>
+
+</mapper>

+ 13 - 2
src/main/webapp/WEB-INF/views/modules/newhome/newPageFloorForm.jsp

@@ -32,7 +32,7 @@
 	</ul><br/>
 	<form:form id="inputForm" modelAttribute="newPageFloor" action="${ctx}/newhome/newPageFloor/save" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
-		<sys:message content="${message}"/>		
+		<sys:message content="${message}"/>
 		<div class="control-group">
 			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>楼层标题:</label>
 			<div class="controls">
@@ -45,6 +45,17 @@
 				<form:input path="floorDetail" htmlEscape="false" maxlength="30" class="input-xlarge required"/>
 			</div>
 		</div>
+      <c:if test="${not empty newPageFloor.floorType}">
+		<div class="control-group crmstatus" style="" >
+			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>楼层类型:</label>
+			<div class="controls">
+				<select name="floorType" class="input-xlarge required">
+					<option selected value="">请选择</option>
+					<option value="1">新品橱窗</option>
+				</select>
+			</div>
+		</div>
+	</c:if>
 		<div class="control-group">
 			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>排序:</label>
 			<div class="controls">
@@ -73,4 +84,4 @@
 		</div>
 	</form:form>
 </body>
-</html>
+</html>

+ 4 - 3
src/main/webapp/WEB-INF/views/modules/newhome/newPageFloorList.jsp

@@ -10,7 +10,7 @@
 	</style>
 	<script type="text/javascript">
 		$(document).ready(function() {
-			
+
 		});
 		function page(n,s){
 			$("#pageNo").val(n);
@@ -96,7 +96,8 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<li class="active"><a href="${ctx}/newhome/newPageFloor/">楼层管理列表</a></li>
+		<li class="active"><a href="${ctx}/newhome/newPageFloor/">自由楼层管理列表</a></li>
+		<li><a href="${ctx}/newhome/newPageFloor/lists">固定楼层管理列表</a></li>
 	</ul>
 	<form:form action="" class="breadcrumb form-search">
 		<input class="btn btn-primary" style="width: 70px" onclick="batchSaveSort()" value="一键排序"/>&nbsp;&nbsp;&nbsp;&nbsp;
@@ -169,4 +170,4 @@
 	</table>
 	<div class="pagination">${page}</div>
 </body>
-</html>
+</html>

+ 175 - 0
src/main/webapp/WEB-INF/views/modules/newhome/newPageFloorLists.jsp

@@ -0,0 +1,175 @@
+<%@ 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 type="text/css">
+		.table th{text-align: center;}
+		.table td{text-align: center;}
+	</style>
+	<script type="text/javascript">
+		$(document).ready(function() {
+
+		});
+		function page(n,s){
+			$("#pageNo").val(n);
+			$("#pageSize").val(s);
+			$("#searchForm").submit();
+        	return false;
+        }
+        //PC端状态修改
+        function updateEnabledStatus(status,ids){
+            var msg='确定启用该楼层吗?';
+            if('0'==status){
+                msg='确定停用该楼层吗?';
+            }
+            top.$.jBox.confirm(msg,'系统提示',function(v,h,f){
+                if(v=='ok'){
+                    $.post("${ctx}/newhome/newPageFloor/updateEnabledStatus",{'enabledStatus':status,'ids':ids}, function(data) {
+                        if(true==data.success){
+                            $.jBox.tip(data.msg, 'info');
+                        } else {
+                            $.jBox.tip(data.msg,'error');
+                        }
+                        window.location = "${ctx}/newhome/newPageFloor/";
+                    },"JSON");//这里返回的类型有:json,html,xml,text
+                }
+                return;
+            },{buttonsFocus:1,persistent: true});
+        }
+
+
+        //CRM端状态修改
+        function updateCrmEnabledStatusByIds(status,ids){
+            var msg='确定启用该楼层吗?';
+            if('0'==status){
+                msg='确定停用该楼层吗?';
+            }
+            top.$.jBox.confirm(msg,'系统提示',function(v,h,f){
+                if(v=='ok'){
+                    $.post("${ctx}/newhome/newPageFloor/updateCrmEnabledStatusByIds",{'crmEnabledStatus':status,'ids':ids}, function(data) {
+                        if(true==data.success){
+                            $.jBox.tip(data.msg, 'info');
+                        } else {
+                            $.jBox.tip(data.msg,'error');
+                        }
+                        window.location = "${ctx}/newhome/newPageFloor/";
+                    },"JSON");//这里返回的类型有:json,html,xml,text
+                }
+                return;
+            },{buttonsFocus:1,persistent: true});
+        }
+
+		/**
+		 * @param obj
+		 * jquery控制input只能输入数字
+		 */
+		function onlynum(obj) {
+			obj.value = obj.value.replace(/[^\d]/g, ""); //清除"数字"以外的字符
+		}
+
+		//批量保存排序
+		function batchSaveSort() {
+			var items = new Array();
+			var $items = $('.check-item');
+			$items.each(function(){
+				items.push($(this).val());
+			});
+			//保存批量排序
+			$.post("${ctx}/newhome/newPageFloor/batchSaveSort?sortList="+items, function(data) {
+				if(true==data.success){
+					$.jBox.tip(data.msg, 'info');
+					window.location.href = "${ctx}/newhome/newPageFloor";
+				} else {
+					$.jBox.tip(data.msg,'error');
+				}
+			},"JSON");//这里返回的类型有:json,html,xml,text
+		}
+
+		//修改排序值
+		function changeSort(id,sortThis) {
+			var value = sortThis.value;
+			$("#preferredProductSort"+id).val(id+"-"+value);
+		}
+	</script>
+</head>
+<body>
+	<ul class="nav nav-tabs">
+		<li><a href="${ctx}/newhome/newPageFloor/">自由楼层管理列表</a></li>
+		<li class="active"><a href="${ctx}/newhome/newPageFloor/lists">固定楼层管理列表</a></li>
+	</ul>
+	<form:form action="" class="breadcrumb form-search">
+		<input class="btn btn-primary" style="width: 70px" onclick="batchSaveSort()" value="一键排序"/>&nbsp;&nbsp;&nbsp;&nbsp;
+		<input class="btn btn-primary" style="width: 70px" onclick="window.location='${ctx}/newhome/newPageFloor/form'" value="添加楼层"/>
+		<div style="margin-top: 10px">
+			<label><font color="#a9a9a9">注:排序值越小越靠前</font></label>
+		</div>
+	</form:form>
+	<sys:message content="${message}"/>
+	<table id="contentTable" class="table table-striped table-bordered table-condensed">
+		<thead>
+			<tr>
+				<th>ID</th>
+				<th>楼层名称</th>
+				<th>描述</th>
+				<th>楼层类型</th>
+				<th>网站状态</th>
+				<th>小程序状态</th>
+				<th>排序</th>
+				<th>创建时间</th>
+				<shiro:hasPermission name="newhome:newPageFloor:edit"><th>操作</th></shiro:hasPermission>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach items="${page.list}" var="newPageFloor">
+			<tr>
+				<input class="check-item" type="hidden" id="preferredProductSort${newPageFloor.id}" value='${newPageFloor.id}-${newPageFloor.sort}'/>
+				<td>${newPageFloor.id}</td>
+				<td>${newPageFloor.floorTitle}</td>
+				<td>${newPageFloor.floorDetail}</td>
+				<td><c:if test="${newPageFloor.floorType eq 1}">新品橱窗</c:if></td>
+				<td><shiro:hasPermission name="newhome:newPageFloor:edit">
+					<c:if test="${newPageFloor.wwwEnabledStatus eq 1 }">
+						<font color="green">已启用</font>
+						<a href="javascript:void(0);" onclick="updateEnabledStatus('0','${newPageFloor.id}');" >
+							停用
+						</a>
+					</c:if>
+					<c:if test="${newPageFloor.wwwEnabledStatus ne 1 }">
+						<font color="red">已停用</font>
+						<a href="javascript:void(0)" onclick="updateEnabledStatus('1','${newPageFloor.id}');">
+							启用
+						</a>
+					</c:if>
+				</shiro:hasPermission></td>
+				<td><shiro:hasPermission name="newhome:newPageFloor:edit">
+					<c:if test="${newPageFloor.crmEnabledStatus eq 1 }">
+						<font color="green">已启用</font>
+						<a href="javascript:void(0);" onclick="updateCrmEnabledStatusByIds('0','${newPageFloor.id}');" >
+							停用
+						</a>
+					</c:if>
+					<c:if test="${newPageFloor.crmEnabledStatus ne 1 }">
+						<font color="red">已停用</font>
+						<a href="javascript:void(0)" onclick="updateCrmEnabledStatusByIds('1','${newPageFloor.id}');">
+							启用
+						</a>
+					</c:if>
+				</shiro:hasPermission></td>
+				<td><input  id="sort" name="sort" style="width:50px;" value="${newPageFloor.sort}"  onkeyup="onlynum(this)"  onchange="changeSort(${newPageFloor.id},this)"></td>
+				<td><fmt:formatDate value="${newPageFloor.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+				<shiro:hasPermission name="newhome:newPageFloor:edit"><td>
+    				<a href="${ctx}/newhome/newPageFloor/form?id=${newPageFloor.id}">编辑</a>
+                    <a href="${ctx}/newhome/newPageFloor/goContentPage?floorId=${newPageFloor.id}">内容</a>
+    				<shiro:hasPermission name="newhome:newPageFloor:delete">
+					<a href="${ctx}/newhome/newPageFloor/delete?id=${newPageFloor.id}" onclick="return confirmx('确定删除该楼层吗?', this.href)">删除</a>
+					</shiro:hasPermission>
+				</td></shiro:hasPermission>
+			</tr>
+		</c:forEach>
+		</tbody>
+	</table>
+	<div class="pagination">${page}</div>
+</body>
+</html>