首页悬浮图mapperbug修改，增加商品详情中的比例展示

admin

2020-01-01 c8f11c229b87d1652b6da0b15576c166cd51eb8b

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

@@ -24,6 +24,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.push.DeviceActive;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.entity.taobao.ClientTBPid;

import com.yeshi.fanli.entity.taobao.PidUser;

@@ -36,15 +37,18 @@
import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.homemodule.HomeNavbarUserService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.money.UserMoneyService;

import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;

import com.yeshi.fanli.service.inter.money.extract.ExtractService;

import com.yeshi.fanli.service.inter.order.HongBaoV2Service;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

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

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

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

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

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

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

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

@@ -58,12 +62,12 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

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;



@@ -125,6 +129,15 @@
   private DeviceTokenHWService deviceTokenHWService;



   @Resource

   private DeviceTokenOPPOService deviceTokenOPPOService;



   @Resource

   private DeviceTokenXMService deviceTokenXMService;



   @Resource

   private DeviceTokenVIVOService deviceTokenVIVOService;



   @Resource

   private TaoBaoUnionConfigService taoBaoUnionConfigService;



   @Resource

@@ -156,6 +169,9 @@


   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;



   @Resource

   private DeviceActiveService deviceActiveService;



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -253,6 +269,13 @@
                     platformType = 2;

                  }

                  userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, acceptData.getDevice());

                  // 绑定oppo,vivo推送

                  DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());

                  if (active != null) {

                     deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenXMService.bindUid(active.getId(), uuser.getId());

                  }

               } catch (Exception e) {

                  e.printStackTrace();

               }

@@ -1128,9 +1151,19 @@
   public void logOut(AcceptData acceptData, Long uid, PrintWriter out) {

      if (uid == null || uid == 0)

         return;

      // 需要解绑HW推送的用户绑定

      if ("android".equalsIgnoreCase(acceptData.getPlatform()))

      if ("android".equalsIgnoreCase(acceptData.getPlatform())) {

         DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());

         // 需要解绑HW推送的用户绑定

         deviceTokenHWService.unBindDeviceToken(acceptData.getDevice());

         if (deviceActive != null) {

            // 解绑OPPO推送的用户绑定

            deviceTokenOPPOService.unBindUid(uid, deviceActive.getId());

            // 解绑VIVO推送的用户绑定

            deviceTokenVIVOService.unBindUid(uid, deviceActive.getId());

            // 解绑XM推送的用户绑定

            deviceTokenXMService.unBindUid(deviceActive.getId());

         }

      }

      out.print(JsonUtil.loadTrueResult(""));

   }



@@ -1201,13 +1234,12 @@
                     e.printStackTrace();

                  }



                  if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {

                     /* 新人红包 */

                     try {

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

                     } catch (Exception e) {

                        e.printStackTrace();

                     }

                  // 绑定oppo推送

                  DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());

                  if (active != null) {

                     deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenXMService.bindUid(active.getId(), uuser.getId());

                  }

               }

            });

@@ -1322,7 +1354,7 @@
      }



      try {

         userAccountService.bindWeiXin(acceptData,uid, code);

         userAccountService.bindWeiXin(acceptData, uid, code);



         UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

         // 判断taoBaoUid是否已经封禁