From 70ebe043e6b62756be9e257fe954c747d46568b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 16 九月 2022 19:00:59 +0800
Subject: [PATCH] 商品ID字符串化

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 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 e594087..6b2f0e1 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
@@ -9,6 +9,8 @@
 import com.yeshi.fanli.entity.SystemEnum;
 import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;
 import org.apache.commons.beanutils.PropertyUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -104,6 +106,9 @@
 
 @Service
 public class CommonOrderServiceImpl implements CommonOrderService {
+
+    private Logger logger = LoggerFactory.getLogger(CommonOrderService.class);
+
 
     @Resource
     private CommonOrderMapper commonOrderMapper;
@@ -961,7 +966,7 @@
         // 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
         int invalidCount = 0;
         for (TaoBaoOrder tb : taoBaoOrders) {
-            if ("璁㈠崟澶辨晥" .equalsIgnoreCase(tb.getOrderState())) {
+            if ("璁㈠崟澶辨晥".equalsIgnoreCase(tb.getOrderState())) {
                 invalidCount++;
             }
         }
@@ -979,7 +984,7 @@
             CommonOrder newCommonOrder = CommonOrderFactory.create(taoBaoOrder);
             CommonOrderGoods cog = new CommonOrderGoods();
 
-            if ("楗夸簡涔�" .equalsIgnoreCase(taoBaoOrder.getOrderType())) {
+            if ("楗夸簡涔�".equalsIgnoreCase(taoBaoOrder.getOrderType())) {
                 cog.setGoodsId(taoBaoOrder.getTradeId() + "");
                 cog.setGoodsType(Constant.SOURCE_TYPE_ELME);
                 TaoBaoOrderGoods goods = taoBaoOrderGoodsMapper.selectByTradeId(taoBaoOrder.getTradeId());
@@ -1011,11 +1016,10 @@
                                         taoBaoGoods.getRootCategoryName(), taoBaoGoods.getLeafName()));
                     } catch (TaobaoGoodsDownException e) {
                         e.printStackTrace();
-                        LogHelper.errorDetailInfo(e, "AUCTIONID:" + taoBaoOrder.getAuctionId(), "");
+                        logger.warn("娣樺疂鍟嗗搧涓嬫灦锛歿}", taoBaoOrder.getAuctionId(), e);
                         try {
                             taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
                             // 璁板綍鍟嗗搧鍒嗙被
-
                         } catch (Exception e1) {
                             CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(
                                     taoBaoOrder.getAuctionId(), Constant.SOURCE_TYPE_TAOBAO);
@@ -1272,8 +1276,8 @@
         // 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
         int invalidCount = 0;
         for (SuningOrderInfo order : suningOrderList) {
-            if ("閫�娆�" .equalsIgnoreCase(order.getOrderLineStatusDesc())
-                    || "璁㈠崟宸插彇娑�" .equalsIgnoreCase(order.getOrderLineStatusDesc())) {
+            if ("閫�娆�".equalsIgnoreCase(order.getOrderLineStatusDesc())
+                    || "璁㈠崟宸插彇娑�".equalsIgnoreCase(order.getOrderLineStatusDesc())) {
                 invalidCount++;
             }
         }
@@ -2469,4 +2473,15 @@
         return commonOrderMapper.listByGoodsIdAndUidAndMinThirdCreateTime(goodsId, uid, minThirdCreateTime, 0, 1000);
     }
 
+    @Override
+    public List<CommonOrder> listPayStateOrder(int sourceType, Date minThirdCreateTime, Date maxThirdCreateTime) {
+        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);
+    }
+
 }

--
Gitblit v1.8.0