订单统计/订单到账消息通知修改

admin

2019-11-07 f3bcea3e6e9c8e93123487ec2ee0b33176bd8697

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

@@ -49,6 +49,7 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.UserInviteUtil;

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

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

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

@@ -356,12 +357,14 @@
      }



      JSONObject data = new JSONObject();

      data.put("winMoney", redPackWinInviteService.getRewardMoney(uid).setScale(2));

      data.put("count", redPackWinInviteService.countRewardRecord(uid));

      data.put("list", JsonUtil.getApiCommonGson().toJson(list));

      if (!StringUtil.isNullOrEmpty(callback)) {

         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));

      } else

      } else {

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

      }

   }



   /**

@@ -380,6 +383,8 @@
      JSONObject data = new JSONObject();

      data.put("balance", redPackBalanceService.getBalance(uid));

      data.put("ruleLink", redPackConfigService.getValueByKey("invite_reward_rule_link"));

      data.put("shareLink", UserInviteUtil.getShareUrl(uid));



      UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

      if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {

         data.put("inviteCode", userInfoExtra.getInviteCode());

@@ -413,6 +418,8 @@
            out.print(JsonUtil.loadFalseResult(1, "红包已被抢光"));

            return;

         }

         winDetail.setLogo(Constant.systemCommonConfig.getDefaultPortrait());

         winDetail.setLogoLight(Constant.systemCommonConfig.getDefaultPortrait());

         

         JSONObject params = new JSONObject();

         params.put("url", redPackConfigService.getValueByKey("goods_shop_link_h5"));

@@ -422,7 +429,7 @@
         winDetail.setTips(redPackConfigService.getValueByKey("new_user_win_tips"));



         // 2、顶部轮播图

         List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("index_top");

         List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("redpack_win_detail_banner");

         List<SwiperPicture> topPicList = new ArrayList<>();

         if (oldtopPicList != null && oldtopPicList.size() > 0)

            topPicList.addAll(oldtopPicList);