From c5410b7f48a774e4ecd50019b46bc9173f2483ae Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 08 五月 2019 11:33:37 +0800
Subject: [PATCH] 转大淘客为普通商品详情
---
fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
index dda8ea9..c96d3ea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
+++ b/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();
--
Gitblit v1.8.0