Merge remote-tracking branch 'origin/master'

admin

2019-05-14 aa784ab65cc24caf45a4c38af7e5fdeb526eb393

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

@@ -19,11 +19,11 @@
import com.yeshi.fanli.entity.push.PushGoods;

import com.yeshi.fanli.entity.push.PushGoodsGroup;

import com.yeshi.fanli.entity.push.PushGoodsRecord;

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

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

import com.yeshi.fanli.exception.push.PushGoodsGroupException;

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

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

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

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

import com.yeshi.fanli.service.inter.push.DeviceActiveService;

import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;

import com.yeshi.fanli.service.inter.push.IOSPushService;

@@ -44,7 +44,7 @@
public class PushController {



   @Resource

   private SystemService systemService;

   private BusinessSystemService businessSystemService;



   @Resource

   private PushRecordService pushRecordService;

@@ -62,7 +62,7 @@
   private PushService pushService;



   @Resource

   private PushGoodsService PushGoodsService;

   private PushGoodsService pushGoodsService;



   @Resource

   private PushGoodsGroupService pushGoodsGroupService;

@@ -81,7 +81,8 @@


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

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

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

            acceptData.getPackages());

      if (system == null) {

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

         return;

@@ -185,7 +186,7 @@
   }



   /**

    * 解绑推送

    * 商品推送记录

    * 

    * @param acceptData

    * @param out

@@ -204,11 +205,11 @@


         // 设备注册时间

         Date createTime = deviceActive.getCreateTime();

         count = PushGoodsService.countHistoryByPushTime(uid, createTime);

         count = pushGoodsService.countHistoryByPushTime(uid, createTime);



         int pageSize = Constant.PAGE_SIZE;



         list = PushGoodsService.listHistoryByPushTime((page - 1) * pageSize, pageSize, uid, createTime);

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

         if (list != null && list.size() > 0) {

            for (PushGoods pushGoods : list) {

               JSONObject result = new JSONObject();