上朵积分调整

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

@@ -113,7 +113,7 @@ public class ResultInfo {
 	/*配置首页*/
 	public static String INDEX_DETAIL = "https://s.iamberry.com/soodo/wechat/my-center.html";
 	/*积分列表*/
-	public static String INDEX_INTERGRAL = "https://s.iamberry.com/soodo/wechat/integral-log.html?integralStatus=2";
+	public static String INDEX_INTERGRAL = "https://mp.weixin.qq.com/s/5UWkQY2_ju9jxCt2rqK6wA";
 	/*优惠券列表*/
 	public static String INDEX_COUPON = "https://s.iamberry.com/soodo/wechat/coupon_list.html";
 	/**

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

@@ -68,6 +68,7 @@ public class OtherIntegralHandler {
             if(memberList != null && memberList.size() > 0){
                 for (Member member : memberList) {
                     logger.info("====第："+ pageNO*pageSize +"条=====");
+
                     Integer integral = 0;   //积分
                     try{
                         integral = useIntegralService.activityPointChange(member);
@@ -78,10 +79,10 @@ public class OtherIntegralHandler {
                         isSuccess = false;
                     }
                     if(integral > 0){
-                        if(member.getUserNickname() == null || "".equals(member.getUserNickname())){
-                            refreshUserInfo(member.getUserOpenid());
-                        }
                         try {
+                            if(member.getUserNickname() == null || "".equals(member.getUserNickname())){
+                                refreshUserInfo(member.getUserOpenid());
+                            }
                             sendMessageUtil.pointChange(
                                     "积分变更通知",
                                     member.getUserNickname(),

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

@@ -272,9 +272,17 @@ public class ResponseWechatPayHandler {
 						/*-----end-----*/
 
 						//积分
-						Integer allIntegral = or.getSalesYetAmount();
+						Integer allIntegral = 0;
+						String isActivty = "";
+						ActivityDate activityDate = activityUtil.doubleTwelve();
+						if(activityDate.isStatus()){
+							allIntegral = or.getSalesYetAmount()/ 100 * 2;	//活动期间双倍积分
+							isActivty = "【"+ activityDate.getRemark()+"】";
+						}else{
+							allIntegral = or.getSalesYetAmount()/ 100;
+						}
 						if(allIntegral > 0){
-							ratFWLogger.info(this, "订单：" + orderIdMD5 + "所得积分为：" + allIntegral);
+							ratFWLogger.info(this, isActivty + " 订单：" + orderIdMD5 + "所得积分为：" + allIntegral);
 							boolean flag = apparatusService.addStayIntegral(or.getSalesOpenid(), 3, allIntegral, or.getSalesOrderid(),null);
 							ratFWLogger.info("积分是否入账：" + flag);
 						}