资金验证优化

admin

2020-08-26 26f7accb815f55f18f8eedfca4324700a96884ec

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

@@ -50,10 +50,10 @@
import com.yeshi.fanli.service.inter.push.PushService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import org.yeshi.utils.TimeUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

import com.yeshi.fanli.util.factory.JumpDetailParamsFactory;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.common.vo.ClientTextStyleVO;

import com.yeshi.fanli.vo.push.PushRecommendVO;



import net.sf.json.JSONArray;

@@ -114,7 +114,7 @@
   @RequestMapping(value = "callback", method = RequestMethod.POST)

   public void callback(AcceptData acceptData, String pushId, PrintWriter out) {

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

            acceptData.getPackages());

            acceptData.getPackages(),acceptData.getSystem());

      if (system == null) {

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

         return;

@@ -229,10 +229,10 @@


      // 设备注册时间

      Date createTime = deviceActive.getCreateTime();

      count = pushGoodsService.countHistoryByPushTime(uid, createTime);

      count = pushGoodsService.countHistoryByPushTime(uid, createTime,acceptData.getSystem());



      int pageSize = Constant.PAGE_SIZE;

      List<PushGoods> list = pushGoodsService.listHistoryByPushTime((page - 1) * pageSize, pageSize, uid, createTime);

      List<PushGoods> list = pushGoodsService.listHistoryByPushTime((page - 1) * pageSize, pageSize, uid, createTime,acceptData.getSystem());

      if (list == null)

         list = new ArrayList<>();