返利订单状态不够

Administrator

2018-11-22 2476fd546a0438c0b00ecf9fc2d51a2cfe22f9b7

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

@@ -7,16 +7,18 @@
import org.springframework.stereotype.Controller;

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

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

import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.entity.accept.AcceptData;

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

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

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

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;

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

import com.yeshi.fanli.util.StringUtil;

import org.yeshi.utils.JsonUtil;



@Controller

@RequestMapping(value = "api/v1/push")

@@ -33,6 +35,9 @@


   @Resource

   private DeviceTokenHWService deviceTokenHWService;



   @Resource

   private DeviceActiveService deviceActiveService;



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

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

@@ -60,6 +65,13 @@
   @RequestMapping(value = "/insertDeviceToken", method = RequestMethod.POST)

   public void insertIOSDeviceToken(AcceptData acceptData, String deviceToken, PrintWriter out) {

      if (!StringUtil.isNullOrEmpty(acceptData.getDevice()) && !StringUtil.isNullOrEmpty(deviceToken)) {

         // 添加设备活跃记录

         DeviceActive da = new DeviceActive();

         da.setDeviceToken(deviceToken);

         da.setPlatform(DeviceActive.PLATFORM_IOS);

         da.setVersionCode(Integer.parseInt(acceptData.getVersion()));

         deviceActiveService.addDeviceActive(da);



         DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(deviceToken);

         if (deviceTokenIOS == null)

            iosPushService.addDeviceToken(null, Integer.parseInt(acceptData.getVersion()), deviceToken,

@@ -83,6 +95,13 @@
   @RequestMapping(value = "/uidBindDeviceToken", method = RequestMethod.POST)

   public void uidBindIOSDeviceToken(AcceptData acceptData, Long uid, String deviceToken, PrintWriter out) {

      if (uid != null && uid != 0 && !StringUtil.isNullOrEmpty(deviceToken)) {

         // 添加设备活跃记录

         DeviceActive da = new DeviceActive();

         da.setDeviceToken(deviceToken);

         da.setPlatform(DeviceActive.PLATFORM_IOS);

         da.setVersionCode(Integer.parseInt(acceptData.getVersion()));

         deviceActiveService.addDeviceActive(da);

         // 添加token

         DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(acceptData.getDevice());

         if (deviceTokenIOS != null) {

            deviceTokenIOS.setUid(uid);