huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善tao接口

This commit is contained in:
Richie 2025-01-08 14:36:01 +08:00
parent ac7475f5c5
commit 305aefe6ce
7 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
open-api/libs/open-sdk-1.0.jar
View File

Binary file not shown.

5
open-api/src/main/java/cn/qihangerp/open/tao/OrderAssembleHelper.java
View File

@ -2,8 +2,9 @@ package cn.qihangerp.open.tao;
import cn.qihangerp.open.tao.domain.OmsTaoOrder;
import cn.qihangerp.open.tao.domain.OmsTaoOrderItem;
import cn.qihangerp.open.tao.model.TradeList;
import cn.qihangerp.open.tao.response.TaoOrderListResponse;
import org.springframework.util.StringUtils;
import java.math.BigDecimal;
@ -16,7 +17,7 @@ public class OrderAssembleHelper {
* @param trade
* @return
*/
public static OmsTaoOrder assembleOrder(TradeList trade) {
public static OmsTaoOrder assembleOrder(TaoOrderListResponse trade) {
OmsTaoOrder order = new OmsTaoOrder();
order.setTid(trade.getTid());

6
open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsApiController.java
View File

@ -4,12 +4,14 @@ import cn.qihangerp.open.domain.SysShopPullLogs;
import cn.qihangerp.open.service.SysShopPullLogsService;
import cn.qihangerp.open.tao.TaoApiCommon;
import cn.qihangerp.open.tao.GoodsApiHelper;
import cn.qihangerp.open.tao.TaoGoodsApiHelper;
import cn.qihangerp.open.tao.TaoRequest;
import cn.qihangerp.open.tao.common.ApiResultVo;
import cn.qihangerp.open.tao.common.ApiResultVoEnum;
import cn.qihangerp.open.tao.domain.OmsTaoGoods;
import cn.qihangerp.open.tao.domain.OmsTaoGoodsSku;
import cn.qihangerp.open.tao.model.GoodsItem;
import cn.qihangerp.open.tao.response.TaoGoodsResponse;
import cn.qihangerp.open.tao.service.OmsTaoGoodsService;
import cn.qihangerp.open.tao.utils.DateUtil;
import com.qihang.common.api.ShopApiParams;
@ -75,7 +77,9 @@ public class TaoGoodsApiController extends BaseController {
int totalError = 0;
int hasExistOrder = 0;//已存在的订单数
try {
ApiResultVo<GoodsItem> goodsItemApiResultVo = GoodsApiHelper.pullGoodsList(appKey, appSecret, sessionKey);
cn.qihangerp.open.common.ApiResultVo<TaoGoodsResponse> goodsItemApiResultVo = TaoGoodsApiHelper.pullGoodsList(appKey, appSecret, sessionKey);
// ApiResultVo<GoodsItem> goodsItemApiResultVo = GoodsApiHelper.pullGoodsList(appKey, appSecret, sessionKey);
if (goodsItemApiResultVo.getCode() == ApiResultVoEnum.SUCCESS.getIndex()) {
//成功
if (goodsItemApiResultVo.getList() != null) {

7
open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOAuthController.java
View File

@ -54,12 +54,7 @@ public class TaoOAuthController {
return AjaxResult.success("SUCCESS",url);
}
/**
* 淘宝授权回调
* @param
* @param
* @return
*/
@PostMapping("/tokenCreate")
public AjaxResult callback(@RequestBody TaoTokenCreateBo bo) {
log.info("tao授权返回code");

13
open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderApiController.java
View File

@ -1,17 +1,19 @@
package cn.qihangerp.open.tao.controller;
import cn.qihangerp.open.common.ApiResultVo;
import cn.qihangerp.open.domain.SysShopPullLasttime;
import cn.qihangerp.open.domain.SysShopPullLogs;
import cn.qihangerp.open.service.SysShopPullLasttimeService;
import cn.qihangerp.open.service.SysShopPullLogsService;
import cn.qihangerp.open.tao.TaoApiCommon;
import cn.qihangerp.open.tao.OrderApiHelper;
import cn.qihangerp.open.tao.OrderAssembleHelper;
import cn.qihangerp.open.tao.TaoApiCommon;
import cn.qihangerp.open.tao.TaoOrderApiHelper;
import cn.qihangerp.open.tao.TaoRequest;
import cn.qihangerp.open.tao.common.ApiResultVo;
import cn.qihangerp.open.tao.domain.OmsTaoOrder;
import cn.qihangerp.open.tao.model.TradeDetail1;
import cn.qihangerp.open.tao.model.TradeList;
import cn.qihangerp.open.tao.response.TaoOrderDetailResponse;
import cn.qihangerp.open.tao.response.TaoOrderListResponse;
import cn.qihangerp.open.tao.service.OmsTaoOrderService;
import com.alibaba.fastjson2.JSONObject;
import com.qihang.common.common.AjaxResult;
@ -101,7 +103,8 @@ public class TaoOrderApiController {
int insertSuccess = 0;//新增成功的订单
int totalError = 0;
int hasExistOrder = 0;//已存在的订单数
ApiResultVo<TradeList> tradeBeanApiResultVo = OrderApiHelper.pullTradeList(startTime,endTime,appKey, appSecret, sessionKey);
ApiResultVo<TaoOrderListResponse> tradeBeanApiResultVo = TaoOrderApiHelper.pullTradeList(startTime,endTime,appKey, appSecret, sessionKey);
// ApiResultVo<TradeList> tradeBeanApiResultVo = OrderApiHelper.pullTradeList(startTime,endTime,appKey, appSecret, sessionKey);
if (tradeBeanApiResultVo.getCode()== ResultVoEnum.SUCCESS.getIndex()){
//循环插入订单数据到数据库
for (var trade : tradeBeanApiResultVo.getList()) {
@ -193,7 +196,7 @@ public class TaoOrderApiController {
String appKey = checkResult.getData().getAppKey();
String appSecret = checkResult.getData().getAppSecret();
ApiResultVo<TradeDetail1> apiResultVo = OrderApiHelper.pullOrderDetail(taoRequest.getOrderId(), appKey, appSecret, sessionKey);
ApiResultVo<TaoOrderDetailResponse> apiResultVo = TaoOrderApiHelper.pullOrderDetail(taoRequest.getOrderId(), appKey, appSecret, sessionKey);

10
open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundApiController.java
View File

@ -1,15 +1,17 @@
package cn.qihangerp.open.tao.controller;
import cn.qihangerp.open.common.ApiResultVo;
import cn.qihangerp.open.domain.SysShopPullLasttime;
import cn.qihangerp.open.domain.SysShopPullLogs;
import cn.qihangerp.open.service.SysShopPullLasttimeService;
import cn.qihangerp.open.service.SysShopPullLogsService;
import cn.qihangerp.open.tao.TaoApiCommon;
import cn.qihangerp.open.tao.RefundApiHelper;
import cn.qihangerp.open.tao.TaoRefundApiHelper;
import cn.qihangerp.open.tao.TaoRequest;
import cn.qihangerp.open.tao.common.ApiResultVo;
import cn.qihangerp.open.tao.domain.OmsTaoRefund;
import cn.qihangerp.open.tao.model.Refund;
import cn.qihangerp.open.tao.response.TaoRefundResponse;
import cn.qihangerp.open.tao.service.OmsTaoRefundService;
import com.alibaba.fastjson2.JSONObject;
import com.qihang.common.common.AjaxResult;
@ -99,7 +101,8 @@ public class TaoRefundApiController {
//// return new ApiResult<>(EnumResultVo.SystemException.getIndex(), upResult.getMsg());
// return AjaxResult.error(HttpStatus.ERROR ,resultVo.getMsg());
// }
ApiResultVo<Refund> refundApiResultVo = RefundApiHelper.pullRefund(startTime, endTime, appKey, appSecret, sessionKey);
// ApiResultVo<Refund> refundApiResultVo = RefundApiHelper.pullRefund(startTime, endTime, appKey, appSecret, sessionKey);
ApiResultVo<TaoRefundResponse> refundApiResultVo = TaoRefundApiHelper.pullRefund(startTime, endTime, appKey, appSecret, sessionKey);
log.info("/**************主动更新tao退货订单：第一次获取结果：总记录数" + refundApiResultVo.getTotalRecords() + "****************/");
int insertSuccess = 0;//新增成功的订单
int totalError = 0;
@ -193,7 +196,8 @@ public class TaoRefundApiController {
String appKey = checkResult.getData().getAppKey();
String appSecret = checkResult.getData().getAppSecret();
ApiResultVo<Refund> refundApiResultVo = RefundApiHelper.pullRefundDetail(taoRequest.getRefundId(), appKey, appSecret, sessionKey);
// ApiResultVo<Refund> refundApiResultVo = RefundApiHelper.pullRefundDetail(taoRequest.getRefundId(), appKey, appSecret, sessionKey);
ApiResultVo<TaoRefundResponse> refundApiResultVo = TaoRefundApiHelper.pullRefundDetail(taoRequest.getRefundId(), appKey, appSecret, sessionKey);
if(refundApiResultVo.getCode()==0) {
OmsTaoRefund taoRefund = new OmsTaoRefund();
BeanUtils.copyProperties(refundApiResultVo.getData(), taoRefund);

2
open-api/src/main/java/cn/qihangerp/open/tao/domain/OmsTaoGoods.java
View File

@ -46,7 +46,7 @@ public class OmsTaoGoods implements Serializable {
/**
* 商品所属的叶子类目 id
*/
private Integer cid;
private Long cid;
/**
* 商品所属的店铺内卖家自定义类目列表