牙刷618活动，好友助力

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

@@ -143,8 +143,8 @@ public class WeixinUtil {
 	public static AccessToken getAccessToken(String appid, String appsecret) {
 		
 		// 根据public No查询access_token
-//		Token token = cache.get(NameUtils.getConfig("pubNo"));
-		Token token = cache.get("gh_cdd0a86d3b19");
+		Token token = cache.get(NameUtils.getConfig("pubNo"));
+//		Token token = cache.get("gh_cdd0a86d3b19");
 
 		AccessToken accessToken = null;
 		//判断数据库中是否存在token

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/activity/ActivityServiceImpl.java

@@ -131,7 +131,9 @@ public class ActivityServiceImpl  implements ActivityService {
         boolean isSendMsg = true;   //是否推送信息
         Member userMember = memberMapper.getMemberByUserOpenId(openId);
         Member activityMember = memberMapper.getMemberByUserOpenId(activityOpenId);
-
+        if(userMember == null || activityMember == null){
+            return -4;
+        }
         Activity activity = new Activity();
         activity.setUserOpenId(openId);
         List<Activity> activityList = activityMapper.getActivityList(activity);

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

@@ -158,6 +158,8 @@ public class CartServiceImpl implements CartService {
 
 		if("2".equals(isCustomize)) {        // 定制牙刷
 			order.setSalesIsCustomized(2);
+		}else{	//普通牙刷购买
+			order.setSalesIsCustomized(1);
 		}
 		// TODO Auto-generated method stub
 		int count = cartDao.insertOrderInfo(order);

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

@@ -270,11 +270,13 @@ public class WeChatServiceImpl implements WeChatService {
 		Status status = new Status();
 		String senceid = requestMap.get("EventKey");//场景值
 
-		System.out.println("更改之前的值："+senceid);
+		Member member = refreshUserInfo(fromUserName);
 
+		System.out.println("更改之前的值："+senceid);
 		senceid = senceid.replaceAll(ResultInfo.barCodeActivity,"");//替换标识前的字符串
 		if(!isSubscription){
 			senceid = senceid.replaceAll(ResultInfo.barCode,"");//替换标识前的字符串
+
 		}
 		System.out.println("更改之后的值："+senceid);
 		StringBuilder str = new StringBuilder();
@@ -288,6 +290,7 @@ public class WeChatServiceImpl implements WeChatService {
 		} catch (Exception e) {
 			inLongLogger.info(senceid + "的助力任务助力失败，助力好友为："+fromUserName);
 			str.append("助力失败，请重试!");
+			e.printStackTrace();
 		}
 
 		str.append("哇！确认过眼神，你将获得我们618天猫上朵旗舰店隐藏福利！");
@@ -517,6 +520,7 @@ public class WeChatServiceImpl implements WeChatService {
 	 * 2016年11月17日
 	 */
 	private Member refreshUserInfo(String openId){
+		System.out.println("====更新用户信息"+openId);
 		JSONObject jsonObject = WeixinUtil.getUserInfo(openId);
 		String sex = jsonObject.getString("sex");//值为1时是男性，值为2时是女性，值为0时是未知
 		String city = jsonObject.getString("city");

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/polyapi/ExternalDockPolyApiHandler.java

@@ -197,6 +197,7 @@ public class ExternalDockPolyApiHandler {
                 orders.add(getOrderMap(or));
                 orderId += or.getSalesOrderid() + ",";
             }catch (Exception e){
+                e.printStackTrace();
                 logger.info("订单无法被转换为接口所需要的数据！");
             }
         }
@@ -631,7 +632,14 @@ public class ExternalDockPolyApiHandler {
         }else{
             orderMap.put("customerremark",order.getSalesUserRemark());      //买家备注
         }
-        //orderMap.put("sellerremark","");
+
+        String adminRemark = order.getSalesAdminRemark();
+        if(adminRemark == null){
+            orderMap.put("sellerremark",""); //卖家备注
+        }else{
+            orderMap.put("sellerremark",adminRemark);//卖家备注
+        }
+
         orderMap.put("postfee",0);     //邮资
         orderMap.put("goodsfee",0);    //货款金额
         double yetAmount = order.getSalesYetAmount().intValue() / 100;