积分商城

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

@@ -75,12 +75,12 @@ public class WechatUtils {
 	 */
 	public static Member getUserBySession(HttpServletRequest request) {
 
- 		Member m = new Member();
-		m.setUserId(15752);
- 		m.setUserOpenid("oZ9pv02WMRQgyDVRY1a_daYecwHI");
-		if(true){
-			return m;
-		}
+// 		Member m = new Member();
+//		m.setUserId(15752);
+// 		m.setUserOpenid("oZ9pv02WMRQgyDVRY1a_daYecwHI");
+//		if(true){
+//			return m;
+//		}
 
 		//获取一个cookie数组
 		Cookie[] cookies = request.getCookies();

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

@@ -34,6 +34,7 @@ public class SimpleCORSFilter implements Filter {
 		origins.add("static.iamberry.com");
 		origins.add("s.iamberry.com");
 		origins.add("w.iamberry.com:801");
+		origins.add("test.iamberry.com:801");
 	}
     public void init(FilterConfig filterConfig) throws ServletException {}
     public void doFilter(ServletRequest servletRequest, ServletResponse

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

@@ -100,7 +100,6 @@ public class IntegralProductGradeServiceImpl  implements IntegralProductGradeSer
             map.put("noExchangeInfo","产品已售空");
             return map;
         }
-
         /*判断积分是否足够*/
         IntegralProductConvert integralProductConvert = integralProductConvertMapper.getIntegralProductConvertByProductId(integralProductId);
         Member member = memberService.getMemberByUserId(userId);

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/member/MemberServiceImpl.java

@@ -354,21 +354,27 @@ public class MemberServiceImpl implements MemberService {
 	public Integer getUserGrad(Integer userId) {
 		Member member = memberDao.getMemberByUserId(userId);
 		List<RankRule> rankRuleList = useIntegralMapper.listRankRule(new RankRule());
+		try {
+			System.out.println("获取积分等级member.getUserIntegral() = " + member.getUserIntegral());
+			RankRule rr = null;
 
-		RankRule rr = null;
-		for (RankRule rankRule:rankRuleList) {
-			if(member.getUserIntegral() > rankRule.getRankRuleIntegral()){
-				if(rr == null ){
-					rr = rankRule;
-				}else if(rr.getRankRuleIntegral() <  rankRule.getRankRuleIntegral()){
-					rr = rankRule;
+			for (RankRule rankRule : rankRuleList) {
+				System.out.println("等级 = " + rankRule.getRankRuleIntegral());
+				if (member.getUserIntegral() > rankRule.getRankRuleIntegral()) {
+					if (rr == null) {
+						rr = rankRule;
+					} else if (rr.getRankRuleIntegral() < rankRule.getRankRuleIntegral()) {
+						rr = rankRule;
+					}
 				}
 			}
-		}
-		if(rr == null){
+			if (rr == null) {
+				return null;
+			} else {
+				return rr.getRankRuleId();
+			}
+		}catch (Exception e){
 			return null;
-		}else{
-			return rr.getRankRuleId();
 		}
 	}
 

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

@@ -77,26 +77,17 @@ public class WechatFilter implements Filter {
 		}
 		String url = WechatUtils.getOpenIdFunction(urlstr);
 
-		logger.info("=====url:" + url);
-		
 		// 判断请求,如果是来自Ajax，那么直接返回302跳转会导致前端报错，所以返回JSON格式数据，状态为200
 		String requestedWith = req.getHeader("x-requested-with");
 		String accept = req.getHeader("accept");
 		if ((requestedWith != null && StringUtils.isNotEmpty(requestedWith) && requestedWith.indexOf("XMLHttpRequest") != -1)
 				|| (accept != null && StringUtils.isNotEmpty(accept) && accept.indexOf("json") != -1)) {
-
-			logger.info("requestedWith:" + requestedWith + "===   accept:" +  accept);
-
 			// 客户端需要的是json数据
 			String redirectURL = req.getHeader("Referer");
 			resp.getWriter().write("{\"isRedirect\":true, \"redirectURL\":\"" + WechatUtils.getOpenIdFunction(redirectURL) + "\"}");
-
-			logger.info("============= : {\"isRedirect\":true, \"redirectURL\":\"" + WechatUtils.getOpenIdFunction(redirectURL) + "\"}");
-
 			return;
 		}
 
-		logger.info("=====url:" + url);
 		// 客户端没有登录的请求不是来自于Ajax，可以执行跳转动作
 		resp.sendRedirect(url);
 	}

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

@@ -105,6 +105,9 @@ public class IntegralOrderHandler {
             return rm;
         }
         Integer totalNum = 0;
+
+        integralOrder.setIntegralOrderOpenId(m.getUserOpenid());
+
         // 封装请求数据
         PageRequest<IntegralOrder> pageRequest = new PageRequest<>(integralOrder, pageNO, pageSize, totalNum == 0);
         // 查询订单列表

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

@@ -59,6 +59,7 @@ public class IntegralProductHandler {
             return rm;
         }
         IntegralProduct  integralProduct = new IntegralProduct();
+        integralProduct.setIntegralProductStatus(1);
 
         Integer totalNum = 0;
         // 封装请求数据

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -570,6 +570,7 @@ public class OrderHandler {
 		if (flag && mustPay>0) {
 			// 发起支付
 			PayResult result = payService.requestPay(order.getSalesOpenid(), order.getSalesOrderid(), mustPay, list.get(0).getItemProductName() + "...", NameUtils.getConfig("WECHAT_ORDER_BACK"));
+			System.out.println("支付返回result="+result.getPayData());
 			if (result.isPaySuccess()) {
 				dto.setInfo(result.getPayData());
 				dto.setSuccess(true);

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/pay/WechatBackHandler.java

@@ -49,7 +49,7 @@ public class WechatBackHandler {
 			HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
 
-		logger.info("微信返回的连接");
+		logger.info("微信回调");
 
 		String callbackURL = NameUtils.getConfig("redirectUrl_index");
 		if (callback != null) {

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/wechat/event/WeChatHandler.java

@@ -47,8 +47,8 @@ public class WeChatHandler {
 		// 将请求、响应的编码均设置为UTF-8（防止中文乱码）
         request.setCharacterEncoding("UTF-8");
         response.setCharacterEncoding("UTF-8");
-        
-        String respMessage = "哎呀 ~ 服务器开小差啦！";
+
+		String respMessage = "哎呀 ~ 服务器开小差啦！";
         try {
         	Map<String, String> requestMap = com.iamberry.wechat.utils.MessageUtil.parseXml(request);
 			respMessage = weChatService.processRequest(requestMap.get("FromUserName"), 

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

@@ -8,57 +8,57 @@ ADMIN_LOGIN_NAME=admin
 # The name of the admin child login after a successful save
 ADMINCHILD_LOGIN_NAME=adminChild
 # path root
-PATH_ROOT=http://w.iamberry.com
+PATH_ROOT=http://test.iamberry.com/
 # place code prefix
 PLACE_CODE_PREFIX=PREFIX
 # \u673A\u5668\u6FC0\u6D3B\u7801
 MACHINE_CODE=B
 # wechat auth back url
-WECHAT_BACK_URL=http://w.iamberry.com/tooth/wechatBack
+WECHAT_BACK_URL=http://test.iamberry.com/tooth/wechatBack
 # order details url
-WECHAT_ORDER_BACK=http://w.iamberry.com/tooth/callback/orderPayBack
+WECHAT_ORDER_BACK=http://test.iamberry.com/tooth/callback/orderPayBack
 # order details url
-WECHAT_AGENT_PURCHASE_ORDER_BACK=http://w.iamberry.com/tooth/callback/agentPurchaseOrderPayBack
+WECHAT_AGENT_PURCHASE_ORDER_BACK=http://test.iamberry.com/tooth/callback/agentPurchaseOrderPayBack
 #rentOrder url
-WECHAT_RENT_ORDER_BACK = http://w.iamberry.com/tooth/callback/rentOrderPayBack
+WECHAT_RENT_ORDER_BACK = http://test.iamberry.com/tooth/callback/rentOrderPayBack
 # \u7EED\u8D39
-WECHAT_RENT_RECHARGE_BACK = http://w.iamberry.com/tooth/callback/rent_recharge_order_pay_back
+WECHAT_RENT_RECHARGE_BACK = http://test.iamberry.com/tooth/callback/rent_recharge_order_pay_back
 # wechat probation order back
-WECHAT_PROBATION_ORDER_BACK=http://w.iamberry.com/tooth/callback/probationOrderPayBack
+WECHAT_PROBATION_ORDER_BACK=http://test.iamberry.com/tooth/callback/probationOrderPayBack
 # wechat agent order back
-WECHAT_AGENT_ORDER_BACK=http://w.iamberry.com/tooth/callback/agent_order_pay_back
+WECHAT_AGENT_ORDER_BACK=http://test.iamberry.com/tooth/callback/agent_order_pay_back
 # wechat agent order back
-WECHAT_AGENT_RENEWAL_BACK=http://w.iamberry.com/tooth/callback/agent_renewal_pay_back
+WECHAT_AGENT_RENEWAL_BACK=http://test.iamberry.com/tooth/callback/agent_renewal_pay_back
 #wechat prodect desc
-WECHAT_PRODUCT_DESC=http://w.iamberry.com/tooth/wechat/product/desc
+WECHAT_PRODUCT_DESC=http://test.iamberry.com/tooth/wechat/product/desc
 # redirect url
 redirectUrl=redirectUrl
 # index redirect url
 redirectUrl_index=redirect:/wechat/index
 # wechat drp wechat pay back
-WECHAT_DRP_BACK=http://w.iamberry.com/tooth/callback/drpPayBack
+WECHAT_DRP_BACK=http://test.iamberry.com/tooth/callback/drpPayBack
 # wechat product share url
 # wechat member share url !!!
-WECHAT_MEMBER_SHARE_URL=http://w.iamberry.com/tooth/wechat/member/showQrcode
+WECHAT_MEMBER_SHARE_URL=http://test.iamberry.com/tooth/wechat/member/showQrcode
 # wechat qrcode share url
-WECHAT_MEMBER_SHARE_QRCODE=http://w.iamberry.com/tooth/wechat/member/showQrcode
+WECHAT_MEMBER_SHARE_QRCODE=http://test.iamberry.com/tooth/wechat/member/showQrcode
 # wechat proxy share url
-WECHAT_MEMBER_PROXY_QRCODE=http://w.iamberry.com/tooth/wechat/drp/share2WM
+WECHAT_MEMBER_PROXY_QRCODE=http://test.iamberry.com/tooth/wechat/drp/share2WM
 # WECHAT_DRP_SHARE_URL !!!
-WECHAT_DRP_SHARE_URL=http://w.iamberry.com/tooth/wechat/drp/share2WM
+WECHAT_DRP_SHARE_URL=http://test.iamberry.com/tooth/wechat/drp/share2WM
 # default qrcode url
-WECHAT_DEFAULT_QRCODE=http://s.iamberry.com/tooth/images/system_qrcode.jpg
+WECHAT_DEFAULT_QRCODE=http://test.iamberry.com/tooth/images/system_qrcode.jpg
 # wechat_default_watermark
 WECHAT_DEFAULT_WATERMARK=/common/images/default_watermark.png
 # order_pay_back_url
-ORDER_PAY_BACK_URL=http://w.iamberry.com/tooth/cart/payBack
+ORDER_PAY_BACK_URL=http://test.iamberry.com/tooth/cart/payBack
 # wechat auth url
-GET_OPENID_DEAL_URL=http://w.iamberry.com/tooth/dealOpenId
+GET_OPENID_DEAL_URL=http://test.iamberry.com/tooth/dealOpenId
 # wechat go personal_information
-WECHAT_GO_PERSONAL_INFORMATION=http://w.iamberry.com/tooth/view/update_personal_information.html?id=
+WECHAT_GO_PERSONAL_INFORMATION=http://test.iamberry.com/tooth/view/update_personal_information.html?id=
 
 # image base url
-IMAGE_BASE_URL=http://w.iamberry.com
+IMAGE_BASE_URL=http://test.iamberry.com/
 # wechat shop withdraw apply
 WECHAT_SHOP_WITHDRAW_APPLY=/WEB-INF/views/wechat/tixian_apply.html
 # wechat shop withdraw apply cash
@@ -94,7 +94,7 @@ WECHAT_AGENT_TOOT_ACTIVATE=/tooth/view/agent_tooth/activate_agent_id.html
 
 WECHAT_AGENT_TOOT_CENTER=/tooth/view/agent_tooth/agent_center.html
 
-WECHAT_UPDATE_TOOTH_HINT=http://w.iamberry.com/tooth/view/agent_tooth/replace_point.html?hintId=
+WECHAT_UPDATE_TOOTH_HINT=http://test.iamberry.com/tooth/view/agent_tooth/replace_point.html?hintId=
 
 # wechat_withdraw_cash_log_list
 WECHAT_WITHDRAW_CASH_LOG_LIST=/WEB-INF/views/wechat/tixian_log_cash.html
@@ -119,7 +119,7 @@ WECHAT_GO_TOTAL_MANAGER = /wechat/statistics/total_management.html
 # xss_handler_localhost_url !!!
 XSS_HANDLER_LOCALHOST_URL=https://localhost:
 # xss_handler_out_url !!!
-XSS_HANDLER_OUT_URL=http://w.iamberry.com/
+XSS_HANDLER_OUT_URL=http://test.iamberry.com/
 # app_nick 
 app_nick=openapi
 # app_key 
@@ -131,7 +131,7 @@ sd_id=001
 # sd_idt	\u592A\u539F\u5E97\u94FA	test:001		watero:9
 sd_idt=001
 #rst_base_url
-rst_base_url=http://w.iamberry.com/rst/mcahine/getMachineInfo?barCode=
+rst_base_url=http://test.iamberry.com/rst/mcahine/getMachineInfo?barCode=
 # efast_base_url
 efast_base_url=http://121.199.165.244/efast_test/efast_api/webservice/web/index.php
 
@@ -166,32 +166,48 @@ DATE_TIME_FORMAT2=yyyy\u5E74MM\u6708dd\u65E5 HH:mm
 PICTRUE_FORMATE_JPG=jpg
 # signatureSimple
 signatureSimple=userAgent=%s&userIp=%s&token=%s&timestamp=%s&sessionId=%s
-# pubNo
-pubNo=gh_cdd0a86d3b19
-# appId-test
-appId=wxdb090f0af89e0be3
-# appId-watero
-#appId=wx27c9f825761a861b
+
+
+# pubNo -- soodo
+#pubNo=gh_cdd0a86d3b19
+
+# pubNo -- soodo-test
+pubNo=gh_d6b974cc3491
+
+# appId-soodo
+#appId=wxdb090f0af89e0be3
+# appId-soodo-test
+appId=wx921a7cdaa9fb2461
+
 # token
 token=weixin
-# appSecret-test
-appSecret=518114a120274f625530750c1803921b
-# appSecret-watero
-#appSecret=97b2f2991e4ff0f2567fbc625f858377
+
+# appSecret-soodo
+#appSecret=518114a120274f625530750c1803921b
+# appSecret-soodo-test
+appSecret=9d54dbc626c64939bd3682ef05a5a4a5
+
 # partnerkey
 partnerkey=8a90e3ab0e2db7772f5f64e7ed2f4b98
+
+
 # wechat-machine-id		test
 productId=29439
 # wechat-machine-id		watero
 #productId=30361
 # charset
 charset=UTF-8
+
 # partner
-partner=1490237892
+#partner=1490237892
+partner=1504319831
+
 # keystore_password
 KEYSTORE_PASSWORD=124022090
+
 # keystore_file
 #KEYSTORE_FILE=E:/apiclient_cert.p12
+
 # ipAddress
 ipAddress=120.76.152.52
 # WWW_INDEX

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

@@ -1,8 +1,22 @@
-#ÉϺ£tooth²âÊÔ
-pubNo = gh_cdd0a86d3b19
-appId = wxdb090f0af89e0be3
+#
+#pubNo = gh_cdd0a86d3b19
+#appId = wxdb090f0af89e0be3
+#token = weixin
+#appSecret = 518114a120274f625530750c1803921b
+#partner = 1490237892
+#partnerkey=8a90e3ab0e2db7772f5f64e7ed2f4b98
+#charset=UTF-8
+#KEYSTORE_FILE=E:/apiclient_cert.p12
+#KEYSTORE_PASSWORD=1240220902
+#ipAddress=120.25.79.106
+
+
+
+#\u6D4B\u8BD5
+pubNo = gh_d6b974cc3491
+appId = wx921a7cdaa9fb2461
 token = weixin
-appSecret = 518114a120274f625530750c1803921b
+appSecret = 9d54dbc626c64939bd3682ef05a5a4a5
 partner = 1490237892
 partnerkey=8a90e3ab0e2db7772f5f64e7ed2f4b98
 charset=UTF-8