无用代码删除，单品分享接口修改

admin

2020-01-17 81a2c8e297787cc7dc405d6db4972cb917cd80b5

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java

@@ -2,8 +2,10 @@


import java.io.IOException;

import java.io.PrintWriter;

import java.io.UnsupportedEncodingException;

import java.lang.reflect.Type;

import java.math.BigDecimal;

import java.net.URLEncoder;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

@@ -28,13 +30,18 @@
import com.yeshi.fanli.entity.accept.AcceptData;

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

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

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.common.Config;

import com.yeshi.fanli.entity.redpack.RedPackDetail.RedPackDetailTypeEnum;

import com.yeshi.fanli.entity.redpack.RedPackExchange;

import com.yeshi.fanli.entity.redpack.RedPackWinInvite;

import com.yeshi.fanli.entity.redpack.RedPackWinInvite.RedPackWinInviteTypeEnum;

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

import com.yeshi.fanli.exception.redpack.RedPackExchangeException;

import com.yeshi.fanli.exception.redpack.RedPackGiveRecordException;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;

import com.yeshi.fanli.service.inter.redpack.RedPackConfigService;

@@ -47,10 +54,13 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;

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

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

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.UserInviteUtil;

import com.yeshi.fanli.util.email.MailSenderUtil;

import com.yeshi.fanli.vo.redpack.RedPackDetailVO;

import com.yeshi.fanli.vo.redpack.RedPackGiveVO;

import com.yeshi.fanli.vo.redpack.RedPackWinInviteVO;

@@ -101,6 +111,11 @@
   @Resource

   private ThreeSaleSerivce threeSaleSerivce;

   

   @Resource

   private ConfigService configService;

	
   @Resource

   private AdminUserService adminUserService;

   

   /**

    * 统计

@@ -299,7 +314,6 @@
      }

   }



	
   @RequestMapping(value = "getGiveList", method = RequestMethod.POST)

   public void getGiveList(AcceptData acceptData, Integer page, Long uid, PrintWriter out) {

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

@@ -326,8 +340,6 @@
      }

   }



	
	
   /**

    * 转换红包为真实金钱

    * 

@@ -346,6 +358,35 @@
      try {

         redPackExchangeService.exchangeCash(uid, amount);

         out.print(JsonUtil.loadTrueResult("提现申请成功"));



         ThreadUtil.run(new Runnable() {

            @Override

            public void run() {

               JSONObject json = new JSONObject();

               json.put("timeStamp", java.lang.System.currentTimeMillis());

               json.put("adminId", 4L);

               String sign = AESUtil.encrypt(json.toString(), Constant.ADMINH5_AESKEY);

               String url = "";

               try {

                  url = String.format("%s?from=emailh5&sign=%s",

                        Constant.systemCommonConfig.getExtractNotifyUrl(), URLEncoder.encode(sign, "UTF-8"));

               } catch (UnsupportedEncodingException e) {

                  e.printStackTrace();

               }



               long[] targetUids = new long[] { 3L, 4L };

               Config config = configService.getConfig(ConfigKeyEnum.extractCodeEmailFrom.getKey());

               String[] sts = config.getValue().split(",");

               String account = sts[0];

               String pwd = sts[1];

               for (long adminId : targetUids) {

                  AdminUser adminUser = adminUserService.selectByPrimaryKey(adminId);

                  String msg = "有用户采用红包兑换现金";

                  boolean isS = MailSenderUtil.sendEmail(adminUser.getEmail(), account, pwd, "红包兑换现金提醒", msg);

               }

            }

         });



      } catch (RedPackExchangeException e) {

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

      }

@@ -446,8 +487,6 @@
      }

   }



	
	
   /**

    *  该用户邀请奖金榜

    * 

@@ -496,7 +535,6 @@
         out.print(JsonUtil.loadTrueResult(data));

      }

   }

	
   

   /**

    *  该用户邀请进度