Merge remote-tracking branch 'origin/div' into div

admin

2019-12-14 1261c227e7ad47607ee651bbd017ea80eb6d044a

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

@@ -7,6 +7,7 @@
import java.util.List;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -18,7 +19,6 @@
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

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

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

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

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

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

import com.yeshi.fanli.exception.NotExistObjectException;

@@ -171,11 +171,11 @@
    * @throws IOException

    */

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

   public void listInviteFriendImg(AcceptData acceptData, Long uid, PrintWriter out)

   public void listInviteFriendImg(AcceptData acceptData, Long uid, PrintWriter out, HttpServletRequest request)

         throws NotExistObjectException, IOException {

      JSONObject data = new JSONObject();

      if (uid != null && !uid.equals("0")) {

         List<String> imgList = spreadUserImgService.getUserSpreadImg(uid);

         List<String> imgList = spreadUserImgService.getUserSpreadImg(uid, request);

         data.put("imgUrlList", JsonUtil.getSimpleGsonWithDate().toJson(imgList));

      }