Merge branch 'master-new' into div

yujian

2019-06-24 4c68642aad8889ff599af52d33453c483f13092a

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java

@@ -41,6 +41,7 @@
import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

import com.yeshi.fanli.service.inter.user.BindingAccountService;

import com.yeshi.fanli.service.inter.user.ExtractService;

import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;

@@ -145,6 +146,10 @@
   

   @Resource

   private UserInfoDeleteRecordService userInfoDeleteRecordService;

	
   @Resource

   private UserTaoLiJinOriginService userTaoLiJinOriginService;

	


   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -1161,8 +1166,8 @@
                     LogHelper.errorDetailInfo(e);

                  }

                  

                  /* 同步未登录之前设备抽奖数据 */

                  try {

                     /* 同步未登录之前设备抽奖数据 */

                     int platformType = 0;

                     String platform = acceptData.getPlatform();

                     if ("android".equals(platform)) {

@@ -1174,6 +1179,16 @@
                  } catch (Exception e) {

                     e.printStackTrace();

                  }

						
                  /* 新人红包 */

                  try {

                     userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(),  device);

                  } catch (Exception e) {

                     e.printStackTrace();

                  }

						
						
						
               }

            });

         }