yujian
2019-12-17 d8e6fe75c7bfb14c73da86b79991bda18d94a105
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
@@ -420,19 +420,19 @@
    *  该用户邀请进度
    * 
    * @param acceptData
    * @param uid  下线UID
    * @param tid  下线UID
    * @param out
    */
   @RequestMapping(value = "getInviteProgress")
   public void getInviteProgress(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
      if (uid == null || uid <= 0) {
   public void getInviteProgress(AcceptData acceptData, Long uid, Long tid, String callback, PrintWriter out) {
      if (uid == null || uid <= 0 || tid == null || tid <= 0) {
         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "传递参数缺失"));
         return;
      }
      
      JSONObject data = new JSONObject();
      data.put("list", redPackWinInviteService.getInviteProgressByWorkerId(uid));
      data.put("num", threeSaleSerivce.getTeamOrderNumByWorkerId(uid));
      data.put("list", redPackWinInviteService.getInviteProgressByWorkerId(uid, tid));
      data.put("num", threeSaleSerivce.getTeamOrderNumByWorkerId(tid));
      if (!StringUtil.isNullOrEmpty(callback)) {
         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
      } else {
@@ -470,6 +470,7 @@
               continue;
         
            RedPackWinProgressVO progressVO = new RedPackWinProgressVO();
            progressVO.setUid(userInfo.getId());
            progressVO.setName(userInfo.getNickName());
            progressVO.setPortrait(userInfo.getPortrait());
            progressVO.setMoney(win.getMoney().setScale(2).toString());