添加新闻管理

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/news/News.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.iamberry.app.verify.ValidatorInterface;
+import com.iamberry.wechat.core.entity.PageBean;
 
 /**
  * @author 何秀刚
@@ -44,6 +45,8 @@ public class News implements Serializable {
 	private Date newsCreateDate;			// 创建时间
 	
 	private String newsSn;					// 对外ID
+
+	private PageBean page = new PageBean();	//分页信息
 	
 	public String getNewsSn() {
 		return newsSn;
@@ -140,4 +143,12 @@ public class News implements Serializable {
 	public void setNewsCreateDate(Date newsCreateDate) {
 		this.newsCreateDate = newsCreateDate;
 	}
+
+	public PageBean getPage() {
+		return page;
+	}
+
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
 }

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/order/NumberBacklogDto.java

@@ -0,0 +1,44 @@
+package com.iamberry.wechat.core.entity.order;
+
+public class NumberBacklogDto implements  java.io.Serializable {
+
+	private Integer sendTheGoods; //待发货数量
+
+	private Integer returnGoods; // 申请退款数量
+
+	private Integer returnRefund; // 申请退货数量
+
+	private Integer exchange; //申请换货数量
+
+	public Integer getSendTheGoods() {
+		return sendTheGoods;
+	}
+
+	public void setSendTheGoods(Integer sendTheGoods) {
+		this.sendTheGoods = sendTheGoods;
+	}
+
+	public Integer getReturnGoods() {
+		return returnGoods;
+	}
+
+	public void setReturnGoods(Integer returnGoods) {
+		this.returnGoods = returnGoods;
+	}
+
+	public Integer getReturnRefund() {
+		return returnRefund;
+	}
+
+	public void setReturnRefund(Integer returnRefund) {
+		this.returnRefund = returnRefund;
+	}
+
+	public Integer getExchange() {
+		return exchange;
+	}
+
+	public void setExchange(Integer exchange) {
+		this.exchange = exchange;
+	}
+}

iamberry-common-tool/src/main/java/com/iamberry/app/config/ImberryConfig.java

@@ -19,6 +19,9 @@ public class ImberryConfig {
 	public static String INTER_SMS_TEXT=""; //文字
 	public static String INTER_SMS_KEY=""; //云片key
 
+	/**发送待处理订单信息**/
+	public static String PENDING_ORDER_REMINDER = "";
+
 	static {
 		Properties pro = new Properties();
 		InputStream in = ImberryConfig.class.getClassLoader().getResourceAsStream("iamberry-app-service-config.properties");
@@ -36,8 +39,8 @@ public class ImberryConfig {
 			INTER_SMS_URL=pro.getProperty("INTER_SMS_URL");
 			INTER_SMS_TEXT=pro.getProperty("INTER_SMS_TEXT");
 			INTER_SMS_KEY=pro.getProperty("INTER_SMS_KEY");
-			
-			
+
+			PENDING_ORDER_REMINDER = pro.getProperty("PENDING_ORDER_REMINDER");
 			
 			System.out.println("这里需要打印"+BASE_URL);
 

iamberry-common-tool/src/main/resources/iamberry-app-service-config.properties

@@ -14,3 +14,5 @@ base_url=http://app.iamberry.com/imberry
 INTER_SMS_URL=https://sms.yunpian.com/v2/sms/single_send.json
 INTER_SMS_TEXT=\u60A8\u7684\u9A8C\u8BC1\u7801\u662F{0}\uFF0C3\u5206\u949F\u5185\u6709\u6548\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1
 INTER_SMS_KEY=2d3cc4afa42ec747b43a09ab89151133
+
+PENDING_ORDER_REMINDER=\u3010\u7231\u8D1D\u6E90\u3011\u60A8\u6709{0}\u4E2A\u8BA2\u5355\u5F85\u5904\u7406\uFF0C\u8BF7\u767B\u9646\u540E\u53F0\u53CA\u65F6\u5904\u7406(https://h5.iamberry.com/)\u3002

iamberry-common-web/src/main/java/com/iamberry/common/web/SimpleCORSFilter.java

@@ -36,6 +36,7 @@ public class SimpleCORSFilter implements Filter {
 		origins.add("static.watero.cn");
 		origins.add("static.iamberry.com");
 		origins.add("s.iamberry.com");
+		origins.add("www.aiberletech.com");
 		origins.add("h5.iamberry.com:801");
 	}
 	

iamberry-wechat-interface/src/main/java/com/iamberry/wechat/face/news/NewsService.java

@@ -52,4 +52,12 @@ public interface NewsService {
 	 * @return
 	 */
 	public Integer updateShare(Integer id);
+
+	/**
+	 * 获取集合
+	 * @param news
+	 * @return
+	 */
+	List<News> listNews(News news);
+
 }

iamberry-wechat-interface/src/main/java/com/iamberry/wechat/face/order/AdminOrderService.java

@@ -3,6 +3,7 @@ package com.iamberry.wechat.face.order;
 import java.util.List;
 
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.core.entity.order.OrderItem;
 import com.iamberry.wechat.core.entity.order.OrderRebackMoney;
@@ -96,4 +97,10 @@ public interface AdminOrderService {
 	 * @return
 	 */
 	public Integer updateOrderListStatus(List<Order> list);
+
+	/**
+	 * 首页查询待办数量
+	 * @return
+	 */
+	NumberBacklogDto selectNumberBacklog();
 }

iamberry-wechat-interface/src/main/java/com/iamberry/wechat/face/sendmsg/CodeService.java

@@ -0,0 +1,17 @@
+package com.iamberry.wechat.face.sendmsg;
+
+import com.iamberry.wechat.tools.ResponseJson;
+
+/**
+ * @company	深圳爱贝源科技有限公司
+ * @website www.iamberry.com
+ * @author 	献
+ * @tel		18271840547
+ * @date	2016年11月1日
+ * @explain	验证码业务接口
+ */
+public interface CodeService {
+
+	//向特定手机发送验证码
+	public String informShipping(String phone, String text);
+}

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/AdminOrderMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.drp.PlaceInfo;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.core.entity.order.OrderItem;
 import com.iamberry.wechat.core.entity.order.OrderRebackMoney;
@@ -117,4 +118,11 @@ public interface AdminOrderMapper {
 	 * @return
 	 */
 	public List<Order> getOrderList(Order order);
+
+
+	/**
+	 * 首页查询待办数量
+	 * @return
+	 */
+	NumberBacklogDto selectNumberBacklog();
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/NewsMapper.java

@@ -51,4 +51,11 @@ public interface NewsMapper {
 	 * @return
 	 */
 	public Integer updateShare(Integer id);
+
+	/**
+	 * 获取集合
+	 * @param news
+	 * @return
+	 */
+	List<News> listNews(News news);
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/PlaceLogsMapper.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import com.iamberry.wechat.core.entity.drp.IncomeRecord;
 import com.iamberry.wechat.core.entity.drp.ObjRecord;
 import com.iamberry.wechat.core.entity.drp.PlaceLogs;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 
 /**
  * 
@@ -73,5 +74,11 @@ public interface PlaceLogsMapper {
 	 * @return
 	 */
 	public Integer updatePlaceLogs(PlaceLogs placeLogs);
+
+	/**
+	 * 首页查询待办数量
+	 * @return
+	 */
+	NumberBacklogDto selectNumberBacklog();
 	
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/newsMapper.xml

@@ -86,4 +86,33 @@ PUBLIC
 		VALUES 
 			(#{newsTitle}, #{newsContexts}, #{newsDesc}, #{newsAuthor}, #{newsImage}, #{newsSource}, #{newsSourceUrl}, NOW()) 
 	</insert>
+
+	<!-- 查询所有的产品并分页 -->
+	<select id="listNews" resultType="News" parameterType="News">
+		SELECT
+			NEWS_ID newsId,
+			NEWS_TITLE newsTitle,
+			NEWS_DESC newsDesc,
+			NEWS_AUTHOR newsAuthor,
+			NEWS_IMAGE newsImage,
+			NEWS_SOURCE newsSource,
+			NEWS_ACCESS_NUM newsAccessNum,
+			NEWS_SHARE_NUM newsShareNum,
+			NEWS_SOURCE_URL newsSourceUrl,
+			NEWS_CREATE_DATE newsCreateDate
+		FROM TB_IAMBERRY_WWW_NEWS
+		<where>
+			<if test="newsTitle != null and newsTitle != ''">
+				NEWS_TITLE LIKE CONCAT('%',#{newsTitle},'%')
+			</if>
+		</where>
+		ORDER BY NEWS_ID DESC
+		<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
+			limit ${page.recordBegin},${page.pageSize}
+		</if>
+		<if test="page!=null and page.recordBegin==0 and page.pageSize>0 ">
+			limit ${page.pageSize}
+		</if>
+	</select>
+
 </mapper>

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/placeLogsMapper.xml

@@ -177,6 +177,49 @@
     where USER_DEALER=#{id} 
     ORDER BY USER_ID DESC
   </select>
-  
+
+
+	<select id="selectNumberBacklog" resultType="NumberBacklogDto">
+		SELECT
+		(CASE WHEN a.sendTheGoods is null THEN 0 ELSE a.sendTheGoods END) as sendTheGoods,
+		(CASE WHEN b.returnGoods is null THEN 0 ELSE b.returnGoods END) as returnGoods,
+		(CASE WHEN c.returnRefund is null THEN 0 ELSE c.returnRefund END) as returnRefund,
+		(CASE WHEN d.exchange is null THEN 0 ELSE d.exchange END) as exchange
+		FROM
+		(
+		(
+		SELECT
+		sum(1) AS sendTheGoods
+		FROM
+		tb_iamberry_shop_sales_order
+		WHERE
+		sales_status = 2
+		) AS a
+		CROSS JOIN (
+		SELECT
+		sum(1) AS returnGoods
+		FROM
+		tb_iamberry_shop_sales_order
+		WHERE
+		sales_status = 3
+		) AS b
+		CROSS JOIN (
+		SELECT
+		sum(1) AS returnRefund
+		FROM
+		tb_iamberry_shop_sales_order
+		WHERE
+		sales_status = 6
+		) AS c
+		CROSS JOIN (
+		SELECT
+		sum(1) AS exchange
+		FROM
+		tb_iamberry_shop_sales_order
+		WHERE
+		sales_status = 11
+		) AS d
+		)
+	</select>
 
  </mapper>

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/news/NewsServiceImpl.java

@@ -79,5 +79,11 @@ public class NewsServiceImpl implements NewsService {
 		// TODO Auto-generated method stub
 		return newsDao.updateShare(id);
 	}
-	
+
+	@Override
+	public List<News> listNews(News news) {
+		news.getPage().initRecordBegin();
+		return newsDao.listNews(news);
+	}
+
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/news/dao/NewsDao.java

@@ -46,4 +46,11 @@ public interface NewsDao {
 	 * @return
 	 */
 	public Integer updateShare(Integer id);
+
+	/**
+	 * 获取集合
+	 * @param news
+	 * @return
+	 */
+	List<News> listNews(News news);
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/news/dao/impl/NewsDaoImpl.java

@@ -49,5 +49,10 @@ public class NewsDaoImpl implements NewsDao {
 		// TODO Auto-generated method stub
 		return newsMapper.updateShare(id);
 	}
-	
+
+	@Override
+	public List<News> listNews(News news) {
+		return newsMapper.listNews(news);
+	}
+
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/order/AdminOrderServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -688,6 +689,9 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		// TODO Auto-generated method stub
 		return adminOrderDao.updateOrderListStatus(list);
 	}
-	
-	
+
+	@Override
+	public NumberBacklogDto selectNumberBacklog() {
+		return adminOrderDao.selectNumberBacklog();
+	}
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/order/dao/AdminOrderDao.java

@@ -6,6 +6,7 @@ import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.drp.PlaceInfo;
 import com.iamberry.wechat.core.entity.drp.PlaceLogs;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.core.entity.order.OrderItem;
 import com.iamberry.wechat.core.entity.order.OrderRebackMoney;
@@ -134,4 +135,10 @@ public interface AdminOrderDao {
 	 * @return
 	 */
 	public Integer updatePlaceLogs(PlaceLogs PlaceLogs);
+
+	/**
+	 * 首页查询待办数量
+	 * @return
+	 */
+	NumberBacklogDto selectNumberBacklog();
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/order/dao/impl/AdminOrderDaoImpl.java

@@ -2,6 +2,7 @@ package com.iamberry.wechat.service.order.dao.impl;
 
 import java.util.List;
 
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -231,6 +232,9 @@ public class AdminOrderDaoImpl implements AdminOrderDao {
 		return placeLogsMapper.updatePlaceLogs(placeLogs);
 	}
 
-	
+	@Override
+	public NumberBacklogDto selectNumberBacklog() {
+		return adminOrderMapper.selectNumberBacklog();
+	}
 	
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/sendmsg/CodeServiceImpl.java

@@ -0,0 +1,111 @@
+package com.iamberry.wechat.service.sendmsg;
+
+import com.iamberry.app.config.ImberryConfig;
+import com.iamberry.app.tool.log.RatFWLogger;
+import com.iamberry.wechat.face.sendmsg.CodeService;
+import net.sf.json.JSONObject;
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * @company	深圳爱贝源科技有限公司
+ * @website www.iamberry.com
+ * @author 	献
+ * @tel		18271840547
+ * @date	2016年11月1日
+ * @explain	验证码业务实现类
+ */
+@SuppressWarnings("unused")
+@Service
+public class CodeServiceImpl implements CodeService {
+
+	@Autowired
+	private RatFWLogger logger;
+	private static String ENCODING = "UTF-8";
+	private static Random rnd = new Random();
+
+	//向特定手机发送验证码
+	@Override
+	public String informShipping(String phone, String text) {
+		return sendOtherCMS(phone,text);
+	}
+
+	/**
+	 * 向指定手机发送短信 返回发送结果
+	 * @param phone	电话
+	 * @param text	短信内容
+	 * @return
+	 */
+	private String sendOtherCMS(String phone, String text) {
+		String results = sendSms(text,phone);
+		logger.info("向手机：" + phone + ",发送短信：" + text + ",返回结果-->>" + results);
+        JSONObject json =  JSONObject.fromObject(results);
+        String resultcod  = json.get("code").toString();
+        if("0".equals(resultcod)){
+        	return "SUCCESS";
+        }else{
+        	return "验证码发送失败，请稍后重试";
+        }
+	}
+
+	/**
+	 * 配置云片相关信息并发送请求
+	 * @param text		发送的内容
+	 * @param mobile	手机号
+	 * @return
+	 */
+	public static String sendSms(String text, String mobile)  {
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("apikey", ImberryConfig.INTER_SMS_KEY);
+        params.put("text", text);
+        params.put("mobile", mobile);
+        return post(ImberryConfig.INTER_SMS_URL, params);
+    }
+
+	/** 基于HttpClient 4.3的通用POST方法
+	 * @param url       提交的URL
+	 * @param paramsMap 提交<参数，值>Map
+	 * @return 提交响应
+	 */
+	public static String post(String url, Map<String, String> paramsMap) {
+		CloseableHttpClient client = HttpClients.createDefault();
+		String responseText = "";
+		CloseableHttpResponse response = null;
+		try {
+			HttpPost method = new HttpPost(url);
+			if (paramsMap != null) {
+				List<NameValuePair> paramList = new ArrayList<NameValuePair>();
+				for (Map.Entry<String, String> param : paramsMap.entrySet()) {
+					NameValuePair pair = new BasicNameValuePair(param.getKey(), param.getValue());
+					paramList.add(pair);
+				}
+				method.setEntity(new UrlEncodedFormEntity(paramList, ENCODING));
+			}
+			response = client.execute(method);
+			HttpEntity entity = response.getEntity();
+			if (entity != null) {
+				responseText = EntityUtils.toString(entity);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				response.close();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		return responseText;
+	}
+}

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/wechat/WeChatServiceImpl.java

@@ -311,6 +311,8 @@ public class WeChatServiceImpl implements WeChatService {
 		Status status = new Status();
 		String senceid = requestMap.get("EventKey");//场景值
 		senceid = senceid.replaceAll(ResultInfo.barCodePrefix,"");//替换标识前的字符串
+
+
 		String str = "【Aiberle爱贝源】经检测，您的机器为Aiberle爱贝源正品，请放心使用。";//bindingMachine(senceid, fromUserName);
 		status.setCountext(str);
 		status.setFlag(false);

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderHandlers.java

@@ -201,7 +201,7 @@ public class AdminOrderHandlers {
 	
 	@RequestMapping(value="/selectShopOrderByOrderId")
 	public ModelAndView selectShopOrderByOrderId(HttpServletRequest request, 
-			@RequestParam(value= "pageSize",defaultValue= "6" ,required=false) Integer pageSize, 
+			@RequestParam(value= "pageSize",defaultValue= "20" ,required=false) Integer pageSize,
 			@RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
 			OrderActionDto actionDto) throws Exception {
 		ModelAndView mv = new ModelAndView("admin/order/orderList");

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -1,11 +1,15 @@
 package com.iamberry.wechat.handles.mq;
 
 import java.lang.reflect.Method;
+import java.text.MessageFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import com.iamberry.app.config.ImberryConfig;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
+import com.iamberry.wechat.face.sendmsg.CodeService;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -48,7 +52,10 @@ public class MQTask implements InitializingBean {
 	
 	@Autowired
 	private RebackServices rebackServices;
-	
+
+	@Autowired
+	private CodeService codeService;
+
 	private Lock lock = new ReentrantLock();
 
 	@SuppressWarnings(value = {"unchecked", "rawtypes"})
@@ -255,4 +262,22 @@ public class MQTask implements InitializingBean {
 	
 	public void afterPropertiesSet() throws Exception {
 	}
+
+	/**
+	 * 待处理订单提醒---每天下午2:50，短信提醒益霜、运营一次（15814645335、18271840547）；
+	 */
+//	@SuppressWarnings(value = {"unchecked", "rawtypes"})
+//	@Scheduled(cron = "0 50 14 * * ?")//每天下午2点50分执行一次
+//	public void pendingOrderReminder() {
+//		logger.info("=======发送短信通知========");
+//		//查询待发货事项、申请退款订单、申请退货订单、申请换货订单 的数量
+//		NumberBacklogDto numberBacklogDto = adminOrderService.selectNumberBacklog();
+//		Integer num = (numberBacklogDto.getExchange()+numberBacklogDto.getReturnGoods()+numberBacklogDto.getReturnRefund()+numberBacklogDto.getSendTheGoods());
+//		String text = MessageFormat.format(ImberryConfig.PENDING_ORDER_REMINDER, num);
+//		if(num > 0){
+//			codeService.informShipping("15814645335", text);
+//			codeService.informShipping("18271840547", text);
+//		}
+//	}
+
 }

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/news/AdminNewsWebHandler.java

@@ -0,0 +1,85 @@
+package com.iamberry.wechat.handles.news;
+
+import com.iamberry.app.tool.des.MD5;
+import com.iamberry.wechat.autiXSS.XSSHandler;
+import com.iamberry.wechat.core.entity.AdminUtils;
+import com.iamberry.wechat.core.entity.banner.ActionBannerImage;
+import com.iamberry.wechat.core.entity.news.News;
+import com.iamberry.wechat.face.banner.AdminBannerService;
+import com.iamberry.wechat.face.news.NewsService;
+import com.iamberry.wechat.tools.ResponseJson;
+import com.iamberry.wechat.tools.ValidatorUtil;
+import com.iamberry.wechat.utils.StaticCacheMemory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author 何秀刚
+ * @description ： 新闻内容的后台、前台
+ * @createDate : 2016年6月13日
+ */
+@Controller
+@RequestMapping("/news")
+public class AdminNewsWebHandler {
+	
+	@Autowired
+	private NewsService newsService;
+
+	@Autowired
+	private AdminUtils adminUtils;
+
+	@Autowired
+	private ValidatorUtil validatorUtil;
+
+	@Autowired
+	private AdminBannerService adminBannerService;
+	
+	private MD5 md5 = new MD5("newsmd55");
+
+	@ResponseBody
+	@RequestMapping("/list")
+	public ResponseJson newsList(HttpServletRequest request,
+		   @RequestParam(value= "pageSize",defaultValue= "5" ,required=false) Integer pageSize,
+		   @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO) {
+		ResponseJson rj = new ResponseJson();
+
+		News news = new News();
+		news.getPage().setPageSize(pageSize);
+		news.getPage().setPageNumber(pageNO);
+
+		List<News> list = newsService.listNews(news);
+
+		rj.addResponseKeyValue("newslist",list);
+		rj.setReturnCode(200);
+		rj.setResultCode(200);
+		return rj;
+	}
+
+	@ResponseBody
+	@RequestMapping("/get/{id}")
+	public ResponseJson getNews(HttpServletRequest request,@PathVariable("id") Integer id) {
+		ResponseJson rj = new ResponseJson();
+
+		News news = newsService.getOne(id);
+
+		rj.addResponseKeyValue("news",news);
+		rj.setReturnCode(200);
+		rj.setResultCode(200);
+		return rj;
+	}
+
+}

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/wechat/config/ConfigHandler.java

@@ -39,24 +39,13 @@ public class ConfigHandler {
 	
 	@RequestMapping(value="/get", method=RequestMethod.GET)
 	public void getConfig(HttpServletRequest request, HttpServletResponse response) throws IOException{
-
-		logger.info("=============config-get=============");
-
 		// 如果数据不为空,拼装数据
 		String appid = NameUtils.appId, url = request.getParameter("url");
-
-
-		logger.info("=============appid："+ appid +"=============");
-
 		if(appid ==null || url ==null){
 			return;
 		}
-
 		// 拼装数据
 		JSONObject json = configService.selectConfig(appid, url);
-
-		logger.info("=============json："+ json +"=============");
-
 		if(json == null){
 			return;
 		}

iamberry-wechat-web/src/main/resources/iamberry-wechat-service-mybatis.xml

@@ -142,6 +142,7 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.warrantyCard.WarrantyCard" alias="WarrantyCard"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.phone.PhoneCode" alias="PhoneCode"/>
 
+		<typeAlias type="com.iamberry.wechat.core.entity.order.NumberBacklogDto" alias="NumberBacklogDto"/>
 
 		<!-- 【门店关注统计报表类】 -->
 		<typeAlias type="com.iamberry.wechat.core.entity.statictics.AttentionInfo" alias="AttentionInfo"/>

iamberry-wechat-web/src/main/webapp/WEB-INF/views/admin/www/news/list.jsp

@@ -34,7 +34,7 @@
 	</form>
 	<div class="cl pd-5 bg-1 bk-gray mt-20"> 
 		<span class="l">
-			<a href="javascript:;" onclick="member_add('添加新闻','${pageContext.request.contextPath}/admin/www/news/addUI','','510')" class="btn btn-primary radius">
+			<a href="javascript:;" onclick="member_add('添加新闻','${pageContext.request.contextPath}/admin/www/news/addUI','900','600')" class="btn btn-primary radius">
 				<i class="Hui-iconfont">&#xe600;</i> 添加新闻
 			</a>
 		</span>