From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java
index f94907f..d7a34a3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java
@@ -10,6 +10,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -22,22 +23,22 @@
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.SearchFilter;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.entity.taobao.TaobaoMeterial;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+import com.yeshi.goods.facade.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.service.inter.goods.GoodsClassService;
import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.taobao.TaobaoMeterialService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.goods.facade.service.DaTaoKeGoodsDetailV2Service;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import org.yeshi.utils.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -66,7 +67,7 @@
private TaoBaoClassService taoBaoClassService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
/**
*
@@ -87,11 +88,11 @@
* @param out
*/
@RequestMapping(value = "queryOnSale")
- public void queryOnSale(String callback, Integer pageIndex, Integer pageSize, String key, Long tbClassId,
- Integer startPrice, Integer endPrice, String startTkRate, String endTkRate, Integer sort, Integer istmall,
- Integer hasCoupon, Integer baoYou, Integer startDsr, Integer overseas, Integer needPrepay,
- Integer includePayRate30, Integer includeGoodRate, Integer includeRfdRate, Integer npxLevel, String cid,
- PrintWriter out) {
+ public void queryOnSale(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Long tbClassId,
+ Integer startPrice, Integer endPrice, String startTkRate, String endTkRate, Integer sort, Integer istmall,
+ Integer hasCoupon, Integer baoYou, Integer startDsr, Integer overseas, Integer needPrepay,
+ Integer includePayRate30, Integer includeGoodRate, Integer includeRfdRate, Integer npxLevel, String cid,
+ PrintWriter out) {
try {
// 鏌ヨ鐗╂枡
@@ -243,7 +244,7 @@
* @param out
*/
@RequestMapping(value = "addTBGoodsFactory")
- public void addTBGoodsFactory(String callback, Integer pageIndex, Integer pageSize, String key, Long tbClassId,
+ public void addTBGoodsFactory(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Long tbClassId,
Integer startPrice, Integer endPrice, String startTkRate, String endTkRate, Integer sort, Integer istmall,
Integer hasCoupon, Integer baoYou, Integer startDsr, Integer overseas, Integer needPrepay,
Integer includePayRate30, Integer includeGoodRate, Integer includeRfdRate, Integer npxLevel,
@@ -455,7 +456,7 @@
if (!islink) {
/* 娣樺疂鐗╂枡鎼滅储 */
- result = TaoKeApiUtil.searchWuLiao(filter);
+ result = TaoKeApiUtil.searchWuLiao(filter,null,null);
} else {
/* 鍟嗗搧閾炬帴鎼滅储 */
TaoBaoGoodsBrief searchGoodsDetail = TaoKeApiUtil.searchGoodsDetail(auctionId);
@@ -492,7 +493,7 @@
* @param out
*/
@RequestMapping(value = "searchAlimamaWeb")
- public void searchAlimamaWeb(String callback, Integer pageIndex, Integer pageSize, String key, Integer startPrice,
+ public void searchAlimamaWeb(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Integer startPrice,
Integer endPrice, String startTkRate, String endTkRate, Integer sort, Integer istmall, Integer hasCoupon,
Integer searchType, Integer baoYou, String startBiz30day, String catIds, PrintWriter out) {
@@ -710,7 +711,7 @@
* @param out
*/
@RequestMapping(value = "getNavList")
- public void getNavList(String callback, PrintWriter out) {
+ public void getNavList(AdminAcceptData acceptData,String callback, PrintWriter out) {
try {
@@ -769,7 +770,7 @@
* @param out
*/
@RequestMapping(value = "searchMaterial")
- public void searchMaterial(String callback, Integer pageIndex, Integer pageSize, String subName, String superName,
+ public void searchMaterial(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String subName, String superName,
PrintWriter out) {
try {
@@ -977,15 +978,15 @@
@RequestMapping(value = "searchDaTaoKe")
- public void searchDaTaoKe(String callback, Integer pageIndex, Integer pageSize, String key, Long cid,
+ public void searchDaTaoKe(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Long cid,
PrintWriter out) {
try {
key = StringUtil.isNullOrEmpty(key) ? "" : key;
- List<DaTaoKeDetail> list = daTaoKeGoodsDetailService.listSearchByTitleWithCid(key, cid, pageIndex,
+ List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Service.listSearchByTitleWithCid(key, cid, pageIndex,
pageSize);
- long count = daTaoKeGoodsDetailService.countSearchByTitleWithCid(key, cid);
+ long count = daTaoKeGoodsDetailV2Service.countSearchByTitleWithCid(key, cid);
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
- for (DaTaoKeDetail detail : list) {
+ for (DaTaoKeDetailV2 detail : list) {
goodsList.add(TaoBaoUtil.convert(detail));
}
@@ -1009,7 +1010,7 @@
}
@RequestMapping(value = "getQiangGou")
- public void getQiangGou(String callback, Integer pageIndex, PrintWriter out) {
+ public void getQiangGou(AdminAcceptData acceptData,String callback, Integer pageIndex, PrintWriter out) {
try {
--
Gitblit v1.8.0