From 81da61b828e29b7745e1382dfbbaeb685dc083ef Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 23 一月 2024 17:17:55 +0800 Subject: [PATCH] 抖音转链修改 --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java index 1ce05c2..80381e5 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java @@ -1002,6 +1002,7 @@ } else { cog.setGoodsId(taoBaoOrder.getAuctionId() + ""); cog.setGoodsType(Constant.SOURCE_TYPE_TAOBAO); + cog.setTitle(taoBaoOrder.getTitle()); newCommonOrder.setCommonOrderGoods(cog); } newCommonOrder.setStateWholeOrder(wholeOrderState); @@ -1036,6 +1037,8 @@ } cog.setCreateTime(new Date()); cog.setUpdateTime(new Date()); + //瑕嗙洊鍘熸潵鐨勫晢鍝両D + cog.setGoodsId(newCommonOrder.getCommonOrderGoods().getGoodsId()); commonOrderGoodsMapper.insertSelective(cog); } newCommonOrder.setUserInfo(new UserInfo(uid)); @@ -1953,7 +1956,13 @@ @Override public List<CommonOrder> getByOrderNo(Long uid, String orderNO) { - return commonOrderMapper.getByOrderNo(uid, orderNO); + if(uid!=null) { + return commonOrderMapper.getByOrderNo(uid, orderNO); + }else{ + CommonOrderMapper.DaoQuery daoQuery=new CommonOrderMapper.DaoQuery(); + daoQuery.orderId = orderNO; + return commonOrderMapper.list(daoQuery,0,100); + } } @@ -2518,14 +2527,14 @@ } @Override - public List<CommonOrder> listPayStateOrder(int sourceType, Date minThirdCreateTime, Date maxThirdCreateTime) { + public List<CommonOrder> listPayStateOrder(Integer sourceType, Date minThirdCreateTime, Date maxThirdCreateTime,int page,int pageSize) { CommonOrderMapper.DaoQuery daoQuery = new CommonOrderMapper.DaoQuery(); daoQuery.minThirdCreateTime = minThirdCreateTime; daoQuery.maxThirdCreateTime = maxThirdCreateTime; daoQuery.state = CommonOrder.STATE_FK; daoQuery.sourceType = sourceType; daoQuery.sortList = Arrays.asList(new String[]{"co_third_create_time ASC"}); - return commonOrderMapper.list(daoQuery, 0, 200); + return commonOrderMapper.list(daoQuery, (page-1)*pageSize, pageSize); } } -- Gitblit v1.8.0