牙刷618活动，好友助力

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

@@ -130,7 +130,7 @@ public final class ImageUtils {
                                  String pressText, int x, int y,Color colorName,int sizeNum
         ) throws Exception{
             String fontName = "微软雅黑";
-            int fontStyle = Font.BOLD;
+            int fontStyle = Font.PLAIN;
             int fontSize = sizeNum;
             Color color = colorName;
             float alpha = 1;

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

@@ -9,23 +9,29 @@ public class PosterNumUtils {
     public static final String IMG_PATH = "common/images/activity/";
     public static final String OLD_IMG_PATH = "common/images/activity/ditu.jpg";
 
-    public static final int CODE_WIDTH = 120;
-    public static final int CODE_HEIGHT = 120;
+    /*二维码大小*/
+    public static final int CODE_WIDTH = 148;
+    public static final int CODE_HEIGHT = 148;
 
-    public static final int HEAD_WIDTH = 130;
-    public static final int HEAD_HEIGHT = 130;
+    /*头像大小*/
+    public static final int HEAD_WIDTH = 148;
+    public static final int HEAD_HEIGHT = 148;
 
+    /*文字位置*/
 //    public static final int TEXT_X = 220;
-    public static final int TEXT_X = -1;
-    public static final int TEXT_Y = 443;
+    public static final int TEXT_X = 181; //居中
+    public static final int TEXT_Y = 1110;
 
-    public static final int HEAD_X = 280;
-    public static final int HEAD_Y = 285;
+    /*头像位置*/
+    public static final int HEAD_X = 181;
+    public static final int HEAD_Y = 953;
 
-    public static final int CODE_X = 280;
-    public static final int CODE_Y = 927;
+    /*二维码位置*/
+    public static final int CODE_X = 362;
+    public static final int CODE_Y = 953;
 
-    public static final int TEXT_FONT_SIZE = 36;
+    /*文字大小*/
+    public static final int TEXT_FONT_SIZE = 20;
 
 
 }

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

@@ -32,6 +32,7 @@ public class ResultInfo {
 
 	public  static String barCodePrefix="MACHINE_QR_CODE";
 	public  static String barCodeActivity="ACTIVITY_OPENID";
+	public  static String barCode="qrscene_";
 	/**
 	 * 初始化代理商信息openid成功前缀
 	 */

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

@@ -1,8 +1,6 @@
 package com.iamberry.wechat.service.integral;
 
 import com.github.pagehelper.PageHelper;
-import com.iamberry.wechat.core.entity.PageBean;
-import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.integral.*;
 import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.core.entity.page.PageRequest;
@@ -10,8 +8,8 @@ import com.iamberry.wechat.core.entity.page.PagedResult;
 import com.iamberry.wechat.face.integral.UseIntegralService;
 import com.iamberry.wechat.service.mapper.MemberMapper;
 import com.iamberry.wechat.service.mapper.UseIntegralMapper;
-import com.iamberry.wechat.tools.NameUtils;
-import com.iamberry.wechat.tools.ResultInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import util.PageUtil;
@@ -21,6 +19,9 @@ import java.util.Date;
 import java.util.List;
 @Service
 public class UseIntegralServiceImpl implements UseIntegralService {
+
+    private Logger logger = LoggerFactory.getLogger(UseIntegralServiceImpl.class);
+
     @Autowired
     private UseIntegralMapper useIntegralMapper;
 
@@ -156,6 +157,10 @@ public class UseIntegralServiceImpl implements UseIntegralService {
             mem.setUserIntegral(member.getUserIntegral() + si.getStayNumber());
             mem.setUserStayIntegral(member.getUserStayIntegral() - si.getStayNumber());
             Integer flag = memberMapper.updateMemberByUserId(mem);
+            if (flag < 1) {
+                logger.info("== 修改积分失败-->记录id："+ si.getStayId() );
+                throw new RuntimeException("修改积分失败");
+            }
 
             /*添加入账日志*/
             UseIntegral useIntegral = new UseIntegral();
@@ -169,6 +174,7 @@ public class UseIntegralServiceImpl implements UseIntegralService {
             //useIntegral.setIntegralRemarks("由待入账变更为已入账");
             flag = useIntegralMapper.addUseIntegral(useIntegral);
             if (flag < 1) {
+                logger.info("== 添加入账日志失败-->记录id："+ si.getStayId() );
                 throw new RuntimeException("添加入账日志失败");
             }
 
@@ -179,6 +185,7 @@ public class UseIntegralServiceImpl implements UseIntegralService {
             ui.setIntegralType(3);
             flag = useIntegralMapper.delUseIntegral(ui);
             if (flag < 1) {
+                logger.info("== 删除待入账日志失败-->记录id："+ si.getStayId() );
                 throw new RuntimeException("删除待入账日志失败");
             }
 
@@ -188,6 +195,7 @@ public class UseIntegralServiceImpl implements UseIntegralService {
             stayInte.setStayStatus(2);
             flag = useIntegralMapper.updateStayIntegral(stayInte);
             if (flag < 1) {
+                logger.info("== 修改待入账状态失败-->记录id："+ si.getStayId() );
                 throw new RuntimeException("修改待入账状态失败");
             }
         }

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

@@ -174,7 +174,7 @@ public class WeChatServiceImpl implements WeChatService {
 						}
 						respContent = status.getCountext();
 					}else if(eventKey.indexOf(ResultInfo.barCodeActivity) != -1){
-						Status status = bindingActivity(requestMap, fromUserName);
+						Status status = bindingActivity(requestMap, fromUserName,true);
 						if (status.isFlag()) {
 							return status.getCountext();
 						}
@@ -211,7 +211,7 @@ public class WeChatServiceImpl implements WeChatService {
 							}
 							respContent = status.getCountext();
 						} else if(eventKey.indexOf(ResultInfo.barCodeActivity) != -1){
-							Status status = bindingActivity(requestMap, fromUserName);
+							Status status = bindingActivity(requestMap, fromUserName,false);
 							if (status.isFlag()) {
 								return status.getCountext();
 							}
@@ -266,17 +266,24 @@ public class WeChatServiceImpl implements WeChatService {
 	 * 618h好友助力
 	 * @param requestMap
 	 */
-	public Status bindingActivity(Map<String, String> requestMap, String fromUserName) {
+	public Status bindingActivity(Map<String, String> requestMap, String fromUserName,Boolean isSubscription) {
 		Status status = new Status();
 		String senceid = requestMap.get("EventKey");//场景值
+
+		System.out.println("更改之前的值："+senceid);
+
 		senceid = senceid.replaceAll(ResultInfo.barCodeActivity,"");//替换标识前的字符串
+		if(!isSubscription){
+			senceid = senceid.replaceAll(ResultInfo.barCode,"");//替换标识前的字符串
+		}
+		System.out.println("更改之后的值："+senceid);
 		StringBuilder str = new StringBuilder();
 		try {
 			Integer flag = activityService.addActivityHelp(senceid,fromUserName);
 			if(flag < 1){
-				logger.info(senceid + "的助力任务助力失败，助力好友为："+fromUserName);
+				logger.info("======"+senceid + "的助力任务助力失败，助力好友为："+fromUserName+"====返回值："+flag);
 			}else{
-				logger.info(senceid + "的助力任务助力成功，助力好友为："+fromUserName);
+				logger.info("======"+senceid + "的助力任务助力成功，助力好友为："+fromUserName);
 			}
 		} catch (Exception e) {
 			inLongLogger.info(senceid + "的助力任务助力失败，助力好友为："+fromUserName);

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/activity/ActivityHandler.java

@@ -272,7 +272,7 @@ public class ActivityHandler {
 		try {
 			/*下载二维码*/
 			DownloadWXCodeUtil.downloadByNIO2(qrc.getUrl(),codeName,path,PosterNumUtils.CODE_WIDTH,PosterNumUtils.CODE_HEIGHT,false);
-			DownloadWXCodeUtil.downloadByNIO2(member.getUserHead(),headName,path,PosterNumUtils.HEAD_WIDTH,PosterNumUtils.HEAD_HEIGHT,true);
+			DownloadWXCodeUtil.downloadByNIO2(member.getUserHead(),headName,path,PosterNumUtils.HEAD_WIDTH,PosterNumUtils.HEAD_HEIGHT,false);
 
 			/*海报位置*/
 			String newImg = path+imgName;
@@ -288,7 +288,7 @@ public class ActivityHandler {
 			ImageUtils.pressPost(newImg,
 					headImg,PosterNumUtils.HEAD_X,PosterNumUtils.HEAD_Y,
 					codeImg,PosterNumUtils.CODE_X,PosterNumUtils.CODE_Y,
-					name,PosterNumUtils.TEXT_X,PosterNumUtils.TEXT_Y,new Color(51, 51, 51),PosterNumUtils.TEXT_FONT_SIZE
+					name,PosterNumUtils.TEXT_X,PosterNumUtils.TEXT_Y,new Color(129,129,129),PosterNumUtils.TEXT_FONT_SIZE
 			);
 			/*添加文字*/
 //			ImageUtils.pressImage(newImg,headImg,PosterNumUtils.HEAD_X,PosterNumUtils.HEAD_Y,1);

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

@@ -57,15 +57,6 @@ public class WeChatHandler {
 					requestMap.get("CreateTime"), requestMap.get("Content"), 
 					requestMap.get("Event"), requestMap.get("Ticket"), 
 					requestMap.get("EventKey"));
-
-			System.out.println(requestMap.get("FromUserName"));
-			System.out.println(requestMap.get("ToUserName"));
-			System.out.println( requestMap.get("MsgType"));
-			System.out.println(requestMap.get("CreateTime"));
-			System.out.println(requestMap.get("Event"));
-			System.out.println(requestMap.get("EventKey"));
-			System.out.println(requestMap.get("Ticket"));
-
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

tooth-wechat-web/src/main/java/com/iamberry/wechat/test/Test.java

@@ -23,10 +23,11 @@ public class Test {
 
         long x = new Date().getTime();
         String url = "https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=gQEb8DwAAAAAAAAAAS5odHRwOi8vd2VpeGluLnFxLmNvbS9xLzAyMVF4SHRiX2ZkaWgxa19aMDFyMU0AAgQ-8BhbAwQAjScA";
-        String headUrl = "http://thirdwx.qlogo.cn/mmopen/Q3auHgzwzM5DPUwVaYlrN50M0vLJP3eNflBicuBCGdADmKJuZsf5Og1NxCc9FicibsWzrxZWtMibpdFviaItufuJK71C7kbKd2myN6FV7fYckCzA/132";
+        String headUrl = "http://thirdwx.qlogo.cn/mmopen/Q3auHgzwzM5DPUwVaYlrN50M0vLJP3eNflBicuBCGdADmKJuZsf5Og1NxCc9FicibsWzrxZWtMibpdFviaItufuJK71C7kbKd2myN6FV7fYckCzA/0";
+//        String headUrl = "http://wx.qlogo.cn/mmopen/acXuSfhaRb50M9xJOAOBTa8wlFGSJyasFtibIv6YbRgvPFmYBtMzj4CO1hUmibkUGtNZlHSxIf76LSoHo7nfVR92V1VXFib3XFu/0";
         try {
             DownloadWXCodeUtil.downloadByNIO2(url,"ceshi.png","E:\\java-work\\iamberry-tooth\\tooth-wechat-web\\src\\main\\webapp\\common\\images\\activity\\test\\",PosterNumUtils.CODE_WIDTH,PosterNumUtils.CODE_HEIGHT,false);
-            DownloadWXCodeUtil.downloadByNIO2(headUrl,"head.png","E:\\java-work\\iamberry-tooth\\tooth-wechat-web\\src\\main\\webapp\\common\\images\\activity\\test\\",PosterNumUtils.HEAD_WIDTH,PosterNumUtils.HEAD_HEIGHT,true);
+            DownloadWXCodeUtil.downloadByNIO2(headUrl,"head.png","E:\\java-work\\iamberry-tooth\\tooth-wechat-web\\src\\main\\webapp\\common\\images\\activity\\test\\",PosterNumUtils.HEAD_WIDTH,PosterNumUtils.HEAD_HEIGHT,false);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -49,7 +50,7 @@ public class Test {
             ImageUtils.pressPost(newImg,
                 headImg,PosterNumUtils.HEAD_X,PosterNumUtils.HEAD_Y,
                 newCodeImg,PosterNumUtils.CODE_X,PosterNumUtils.CODE_Y,
-                text,PosterNumUtils.TEXT_X,PosterNumUtils.TEXT_Y,Color.black,PosterNumUtils.TEXT_FONT_SIZE
+                text,PosterNumUtils.TEXT_X,PosterNumUtils.TEXT_Y,new Color(129,129,129),PosterNumUtils.TEXT_FONT_SIZE
             );
         }catch (Exception e){
             e.printStackTrace();

tooth-wechat-web/src/main/java/com/iamberry/wechat/utils/DownloadWXCodeUtil.java

@@ -69,8 +69,8 @@ public class DownloadWXCodeUtil {
 
             BufferedImage bi = ImageIO.read(ins);
             if(isCircular){
-                int w = bi.getWidth();
-                int h = bi.getHeight();
+                int w = width;
+                int h = height;
                 BufferedImage output = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
                 Graphics2D g2 = output.createGraphics();
                 output = g2.getDeviceConfiguration().createCompatibleImage(w, h, Transparency.TRANSLUCENT);