淘宝分享佣金比例修改

admin

2020-05-31 2a48f2bd979d56ce4114ba9d56efaf49bab705d7

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

@@ -14,6 +14,7 @@
import org.yeshi.utils.encrypt.DESUtil;



import com.alipay.api.AlipayApiException;

import com.google.gson.Gson;

import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;

import com.yeshi.fanli.entity.accept.AcceptData;

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

@@ -69,6 +70,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;



@@ -174,10 +176,6 @@
   @Resource

   private DeviceActiveService deviceActiveService;



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

   private static final String EXTRACT_MAX_MONEY = "extract_max_money";



   /**

    * 

    * @param acceptData

@@ -195,6 +193,13 @@
   public void login(AcceptData acceptData, String code, String vcode, String phone, boolean wxinstall,

         String tbOpenid, String tbNickName, String tbPortrait, String tbSession, int loginType, Boolean first,

         HttpSession session, HttpServletRequest request, PrintWriter out) {



      // 2.0以下版本不允许登录

      if (!VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())) {

         out.print("请升级到最新版本");

         return;

      }



      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

@@ -262,14 +267,6 @@
         ThreadUtil.run(new Runnable() {

            public void run() {

               try {

                  int platformType = 0;

                  String platform = acceptData.getPlatform();

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

                     platformType = 1;

                  } else if ("ios".equals(platform)) {

                     platformType = 2;

                  }

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

                  // 绑定oppo,vivo推送

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

                  if (active != null) {

@@ -285,7 +282,7 @@


      } catch (UserAccountException e) {

         try {

            LogHelper.cookieLog("登录出错:" + e.getCode() + "-" + e.getMessage());

            LogHelper.error("登录出错:" + e.getCode() + "-" + e.getMessage());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

@@ -309,6 +306,12 @@
   @RequestMapping(value = "register")

   public void register(AcceptData acceptData, String tbOpenid, String tbNickName, String tbPortrait, String vcode,

         String phone, HttpServletRequest request, HttpSession session, PrintWriter out) {

      // 2.0以下版本不允许登录

      if (!VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())) {

         out.print("请升级到最新版本");

         return;

      }



      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

@@ -351,40 +354,6 @@
      try {

         userAccountService.register(user);

         user = userInfoService.getUserByIdWithMybatis(user.getId());

         JSONObject data = new JSONObject();

         data.put("user", GsonUtil.toJsonExpose(UserUtil.filterForClientUser(user)));

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

      } catch (UserAccountException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

      }

   }



   /**

    * 账号打通

    * 
    * @param acceptData

    * @param mainUid

    * @param lessUid

    * @param session

    * @param out

    */

   @RequestMapping(value = "connect")

   public void connect(AcceptData acceptData, long mainUid, long lessUid, HttpSession session, PrintWriter out) {

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

      }



      if (mainUid == 0 || lessUid == 0) {

         out.print(JsonUtil.loadFalseResult(1, "请上传打通用户ID"));

         return;

      }



      try {

         userAccountService.connectUsers(new UserInfo(mainUid), new UserInfo(lessUid));

         UserInfo user = userInfoService.getUserByIdWithMybatis(mainUid);

         JSONObject data = new JSONObject();

         data.put("user", GsonUtil.toJsonExpose(UserUtil.filterForClientUser(user)));

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

@@ -981,6 +950,7 @@


         userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindAlipay, account);

      } catch (AlipayTransferException e1) {

         LogHelper.error("支付宝验证出错:"+new Gson().toJson(e1));

         if (e1.getSubCode().equalsIgnoreCase("PAYEE_NOT_EXIST")) {

            String msg = "系统未能成功转账0.1元，提现账号信息有误，请核对后重新填写。";

            out.print(JsonUtil.loadFalseResult(1, msg));

@@ -1181,6 +1151,12 @@
   public void loginNew(AcceptData acceptData, String vcode, String phone, String code, int loginType,

         HttpServletRequest request, PrintWriter out) {



      // 2.0以下版本不允许登录

      if (!VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())) {

         out.print("请升级到最新版本");

         return;

      }



      try {

         BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

               acceptData.getPackages());

@@ -1218,20 +1194,6 @@
                     LogHelper.errorDetailInfo(e);

                  }



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

                  try {

                     int platformType = 0;

                     String platform = acceptData.getPlatform();

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

                        platformType = 1;

                     } else if ("ios".equals(platform)) {

                        platformType = 2;

                     }

                     userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, device);

                  } catch (Exception e) {

                     e.printStackTrace();

                  }



                  // 绑定oppo推送

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

                  if (active != null) {

@@ -1246,7 +1208,7 @@
      } catch (UserAccountException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

         try {

            LogHelper.cookieLog("登录出错:" + e.getCode() + "-" + e.getMessage());

            LogHelper.error("登录出错:" + e.getCode() + "-" + e.getMessage());

         } catch (Exception e1) {

            e1.printStackTrace();

         }