From 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 11 七月 2019 16:34:13 +0800 Subject: [PATCH] 订单bug,分享爆款自购修改 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java index c270e63..155b530 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java +++ b/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; @@ -59,6 +60,7 @@ import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.ThreadUtil; +import com.yeshi.fanli.util.VersionUtil; import com.yeshi.fanli.util.account.UserUtil; import com.yeshi.fanli.util.wx.WXLoginUtil; @@ -145,6 +147,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 +1167,8 @@ LogHelper.errorDetailInfo(e); } + /* 鍚屾鏈櫥褰曚箣鍓嶈澶囨娊濂栨暟鎹� */ try { - /* 鍚屾鏈櫥褰曚箣鍓嶈澶囨娊濂栨暟鎹� */ int platformType = 0; String platform = acceptData.getPlatform(); if ("android".equals(platform)) { @@ -1174,6 +1180,15 @@ } catch (Exception e) { e.printStackTrace(); } + + if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) { + /* 鏂颁汉绾㈠寘 */ + try { + userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(), device); + } catch (Exception e) { + e.printStackTrace(); + } + } } }); } -- Gitblit v1.8.0