Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-wechat-web/src/main/java/com/iamberry/wechat/filters/WechatFilter.java

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/UseIntegral.java

@@ -32,6 +32,8 @@ public class UseIntegral implements Serializable {
     private Date stayRecordedTime;          //待入账时间
     private PageBean page=new PageBean();   //分页
 
+    private String userName;//会员姓名
+    private String userNickname;//会员昵称
     public Date getStayRecordedTime() {
         return stayRecordedTime;
     }

tooth-common-core/src/main/java/com/iamberry/wechat/tools/SendMessageUtil.java

@@ -365,7 +365,7 @@ public class SendMessageUtil {
 	 * @param url
 	 */
 	public void refundApplicationNotice(String first,String keyword1,String keyword2,String keyword3,String remark,String openId,String url){
-		String temp = ResultInfo.APPLYREFUND;
+		String temp = ResultInfo.REFUNDAPPLICATIONNOTICE;
 		temp = temp.replaceFirst("firstValueIamberry", first)
 				.replaceFirst("keyword1Value",keyword1)
 				.replaceFirst("keyword2Value",keyword2)

tooth-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -234,8 +234,10 @@ public class ResultInfo {
 	public static String SENDSUCCESS= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177', 'value':'keyword3Value'}, 'keyword4':{'color':'#173177', 'value':'keyword4Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
 
 	/**  退款申请驳回 */
-	public static String REFUNDSPPLICATIONREJECTED= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177', 'value':'keyword3Value'}, 'remark':{'color':'colorValue','value':'remarkValue'}}";
+	public static String REFUNDSPPLICATIONREJECTED= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'orderProductPrice':{'color':'#173177','value':'keyword1Value'}, 'orderProductName':{'color':'#173177', 'value':'keyword2Value'}, 'orderName':{'color':'#173177', 'value':'keyword3Value'}, 'remark':{'color':'colorValue','value':'remarkValue'}}";
 
+	/** 退款申请通知 **/
+	public static String REFUNDAPPLICATIONNOTICE= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'orderProductPrice':{'color':'#173177','value':'keyword1Value'}, 'orderProductName':{'color':'#173177', 'value':'keyword2Value'}, 'orderName':{'color':'#173177', 'value':'keyword3Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
 
 
 

tooth-common-tool/src/main/java/com/iamberry/wechat/tools/loadResultUtil.java

@@ -77,7 +77,8 @@ public class loadResultUtil {
 			ResultInfo.order_apply_return = prop.getProperty("order_apply_return");			//用户 申请退货 提醒
 			ResultInfo.order_apply_barter = prop.getProperty("order_apply_barter");			//用户 申请换货 提醒
 			ResultInfo.order_send_success = prop.getProperty("order_send_success");			//发货后 提醒
-			
+			ResultInfo.refund_to_dismiss = prop.getProperty("refund_to_dismiss");			//退款申请驳回
+			ResultInfo.refund_application_notice = prop.getProperty("refund_application_notice");			//退款申请通知
 		} catch (IOException e) {
 			new RuntimeException(e.getMessage());
 		}

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/integral/UseIntegralService.java

@@ -68,4 +68,10 @@ public interface UseIntegralService {
      * @return
      */
     List<StayIntegral>  listStayIntegral(StayIntegral stayIntegral);
+
+    /**
+     *  查询所有收入支出积分记录
+     * @return
+     */
+    List<UseIntegral> listUseIntegral(UseIntegral useIntegral);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/CartServiceImpl.java

@@ -315,10 +315,10 @@ public class CartServiceImpl implements CartService {
 						Order order2 = adminOrderService.selectOrderStatusByOrderId(order.getSalesOrderid());
 						String payMoney = df.format((float)order2.getSalesYetAmount()/100) + "元";
 						//获取当前订单订单项
-						List<OrderItem> itemList = adminOrderService.getShopOrderItemByOrderId(orderId);
+						List<OrderItem> itemList = adminOrderService.getShopOrderItemByOrderId(order.getSalesOrderid());
 						try {
-							sendMessageUtil.refundApplicationNotice("尊敬的朵粉，我们已收到您的退款申请，我们正在积极处理：",payMoney,itemList.get(0).getItemProductName(),orderId,
-									"如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+orderId);
+							sendMessageUtil.refundApplicationNotice("尊敬的朵粉，我们已收到您的退款申请，我们正在积极处理：",payMoney,itemList.get(0).getItemProductName(),order.getSalesOrderid(),
+									"如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+order.getSalesOrderid());
 						} catch (Exception e) {
 							logger.info("订单号："+ orderId +"的订单驳回退款，发送微信消息失败!");
 						}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/integral/UseIntegralServiceImpl.java

@@ -97,6 +97,11 @@ public class UseIntegralServiceImpl implements UseIntegralService {
     }
 
     @Override
+    public List<UseIntegral> listUseIntegral(UseIntegral useIntegral) {
+        return useIntegralMapper.listUseIntegral(useIntegral);
+    }
+
+    @Override
     @Transient
     public boolean updateIntegralStayToAlready() {
         StayIntegral stayIntegral = new StayIntegral();

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/UseIntegralMapper.java

@@ -96,6 +96,10 @@ public interface UseIntegralMapper {
      */
     List<StayIntegral>  listStayIntegral(StayIntegral stayIntegral);
 
-
+    /**
+     *  查询所有收入支出积分记录
+     * @return
+     */
+    List<UseIntegral> listUseIntegral(UseIntegral useIntegral);
 
 }

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

@@ -204,6 +204,21 @@
         </where>
     </delete>
 
-
+    <select id="listUseIntegral" parameterType="UseIntegral" resultType="UseIntegral">
+        SELECT
+        i.*, u.user_nickname,
+        u.user_name
+        FROM
+        tb_iamberry_use_integral i
+        LEFT JOIN tb_iamberry_user_userinfo u ON i.user_openid = u.user_openid
+        WHERE
+        i.integral_type IN (1, 2)
+        <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>

tooth-wechat-web/src/main/java/com/iamberry/wechat/filters/CSRFTokenFilter.java

@@ -31,17 +31,17 @@ import com.iamberry.wechat.tools.IpAddressUtil;
  */
 //@WebFilter(value = {"/admin/*", "/loginUI"})
 public class CSRFTokenFilter implements Filter {
-	
+
 	/**
 	 * DES对称加密
 	 */
 	private static MD5 md5 = new MD5();
-	
+
 	/**
 	 * 后台登录地址
 	 */
 	private static String ADMIN_LOGIN_URL;
-	
+
 	/**
 	 * 签名格式
 	 */
@@ -52,10 +52,10 @@ public class CSRFTokenFilter implements Filter {
 		if (ADMIN_LOGIN_URL == null) {
 			ADMIN_LOGIN_URL = request.getServletContext().getContextPath() + "/loginUI";
 		}
-		
+
 		HttpServletRequest req = (HttpServletRequest) request;
 		HttpServletResponse resp = (HttpServletResponse) response;
-		
+
 		// 当前请求uri
 		String uri = req.getRequestURI();
 		// 是否请求登录页面，如果是，那么创建数据，放行。
@@ -65,7 +65,7 @@ public class CSRFTokenFilter implements Filter {
 			chain.doFilter(req, resp);
 			return;
 		}
-		
+
 		// 是否请求后台页面数据，如果是不放行,继续判断，如果是请求后台的静态资源，那么放行
 		if (!isAdminPage(uri)) {
 			chain.doFilter(req, resp);return;
@@ -78,15 +78,15 @@ public class CSRFTokenFilter implements Filter {
 		}
 		chain.doFilter(req, resp);
 	}
-	
+
 	/**
 	 * 是否为后台页面请求
 	 * @param uri
 	 */
 	public boolean isAdminPage(String uri) {
-		
+
 		if (StringUtils.lastIndexOfAny(uri, "png", "jpg", "jpeg", "js", "css", "ttf", "wttf") != -1) return false;
-		
+
 		if (uri.contains("admin")) return true;
 		return false;
 	}
@@ -99,7 +99,7 @@ public class CSRFTokenFilter implements Filter {
 		if (uri.contains(ADMIN_LOGIN_URL)) return true;
 		return false;
 	}
-	
+
 	/**
 	 * 处理后台页面请求
 	 * @param request
@@ -113,7 +113,7 @@ public class CSRFTokenFilter implements Filter {
 		String TIME_KEY = (String) request.getSession().getAttribute("4");
 		String SESSION_KEY = (String) request.getSession().getAttribute("5");
 		String SIGN_KEY = (String) request.getSession().getAttribute("6");
-		
+
 		String token = null, ip = null, userAgent = null, timestamp = null, sessionId = null, signature = null;
 		Cookie[] cookies = request.getCookies();
 		for(Cookie cookie : cookies){
@@ -131,7 +131,7 @@ public class CSRFTokenFilter implements Filter {
 				signature = cookie.getValue();
 			}
 		}
-		
+
 		if (StringUtils.isEmpty(token) || StringUtils.isEmpty(ip) || StringUtils.isEmpty(userAgent) || StringUtils.isEmpty(timestamp) || StringUtils.isEmpty(sessionId) || StringUtils.isEmpty(signature)) {
 			return false;
 		}
@@ -145,13 +145,13 @@ public class CSRFTokenFilter implements Filter {
 				return false;
 			}
 		} catch (Exception e) {e.printStackTrace();}
-		
+
 		String ipTemp = IpAddressUtil.getIpAddr(request);
 		ipTemp = StringUtils.isEmpty(ipTemp) ? "proxyClientIp" : StringUtils.replace(ipTemp, ".", "");
 		if (!StringUtils.equals(ip, ipTemp)) {
 			return false;
 		}
-		
+
 		// 是否超时
 		try {
 			Long date = Long.parseLong(timestamp);
@@ -164,14 +164,14 @@ public class CSRFTokenFilter implements Filter {
 			return false;
 		}
 	}
-	
+
 	/**
 	 * 保存用户校验所需的数据
 	 * @param request
-	 * @throws Exception 
+	 * @throws Exception
 	 */
 	public static void savesSignatureToToken(HttpServletRequest request, HttpServletResponse response) {
-		
+
 		// 如果已经存在值，不要变更名称保存，否则最后会导致cookie过多，tomcat直接返回400; 如果不存在，那么随机产生，防止被猜测
 		String TOKEN_KEY = (String) request.getSession().getAttribute("1");
 		String IP_KEY = (String) request.getSession().getAttribute("2");
@@ -240,7 +240,7 @@ public class CSRFTokenFilter implements Filter {
 		cookie.setHttpOnly(true);	// 不允许页面读取cookie,此方法不安全，最终保证还是取决浏览器，某些浏览器不支持。
 		response.addCookie(cookie);
 	}
-	
+
 	/**
 	 * 根据name,解析token中的数据
 	 * @param cookieName
@@ -266,7 +266,7 @@ public class CSRFTokenFilter implements Filter {
 	 * @return
 	 */
 	public static String signature(String userAgent, String userIp,
-			String format, String token, String timestamp, String sessionId) {
+								   String format, String token, String timestamp, String sessionId) {
 		// 准备签名模版
 		String signatureTemp = String.format(SIGNATURE_SIMPLE, userAgent, userIp, token, timestamp, sessionId);
 		// md5签名
@@ -299,7 +299,7 @@ public class CSRFTokenFilter implements Filter {
 			return UUID.randomUUID().toString().getBytes();
 		}
 	}
-	
+
 	/**
 	 * 获取一个安全的随机数
 	 * @return
@@ -320,7 +320,7 @@ public class CSRFTokenFilter implements Filter {
 		return hs.toUpperCase();
 	}
 
-    public CSRFTokenFilter() {}
+	public CSRFTokenFilter() {}
 	public void destroy() {}
 	public void init(FilterConfig fConfig) throws ServletException {}
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/integral/AdminIntegrlhHandler.java

@@ -0,0 +1,59 @@
+package com.iamberry.wechat.handles.integral;
+
+import com.iamberry.wechat.core.entity.ResultMsg;
+import com.iamberry.wechat.core.entity.WechatUtils;
+import com.iamberry.wechat.core.entity.integral.UseIntegral;
+import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.face.integral.UseIntegralService;
+import com.iamberry.wechat.tools.NameUtils;
+import com.iamberry.wechat.tools.ResultInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Administrator on 2018/1/23.
+ */
+@Controller
+@RequestMapping("/admin/userIntegral")
+public class AdminIntegrlhHandler {
+
+    @Autowired
+    private UseIntegralService useIntegralService;
+    /**
+     * 待入账记录 use_type=3
+     * @param req
+     * @param pageSize
+     * @param pageNO
+     * @return
+     */
+    @RequestMapping("/listStayIntegral")
+    @ResponseBody
+    public ResultMsg listStayIntegral(HttpServletRequest req,
+                                      @RequestParam(value="useType",defaultValue= "3", required=false)Integer useType,
+                                      @RequestParam(value= "pageSize",defaultValue= "6" ,required=false)Integer pageSize,
+                                      @RequestParam(value = "pageNO", defaultValue = "1",required=false)Integer pageNO){
+        ResultMsg rm=new ResultMsg();
+        UseIntegral useIntegral=new UseIntegral();
+        useIntegral.getPage().setPageSize(pageSize);
+        useIntegral.getPage().setPageNumber(pageNO);
+        useIntegral.getPage().initRecordBegin();
+        List<UseIntegral> listStayIntegral=useIntegralService.listIntegralInfo(useIntegral);
+
+        Map<String,Object> map=new HashMap<String, Object>();
+        map.put("listStayIntegralInfo",listStayIntegral);
+
+        rm.setStatus(true);
+        rm.setResultCode(ResultInfo.SUCCESSCODE);
+        rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+        rm.setData(map);
+        return rm;
+    }
+}

tooth-wechat-web/src/main/resources/jdbc.properties

@@ -1,13 +1,13 @@
 jdbc.driver=com.mysql.jdbc.Driver
 #Õýʽ¿â
-#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/tooth?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=tooth
-#jdbc.password=Tooth123223
+jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/tooth?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.username=tooth
+jdbc.password=Tooth123223
 
 #±¾µØ¿â
-jdbc.url=jdbc:mysql://192.168.1.254:3306/tooth?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-jdbc.username=root
-jdbc.password=root
+#jdbc.url=jdbc:mysql://192.168.1.254:3306/tooth?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#jdbc.username=root
+#jdbc.password=root
 
 #²âÊÔ¿â
 #jdbc.url=jdbc:mysql://watero2db.mysql.rds.aliyuncs.com/test_watero_pf?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull