watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/DouyinTask.java

@@ -107,7 +107,8 @@ public class DouyinTask {
         logger.info("开始时间：{}， 结束时间：{}", startTime, endTime);
 
         // 同时处理爱贝源小店和美塔璞儿小店
-        Long[] shopIds = new Long[]{TaobaoConfig.DOUYIN_IAMBERRY_SHOP_ID, DOUYIN_METAPURE_SHOP_ID};
+//        Long[] shopIds = new Long[]{TaobaoConfig.DOUYIN_IAMBERRY_SHOP_ID, DOUYIN_METAPURE_SHOP_ID};
+        Long[] shopIds = new Long[]{187079746L};
         for (Long shopId : shopIds) {
             int rstSalesStoreId;
             String accountId;
@@ -122,7 +123,7 @@ public class DouyinTask {
                 accountType = DOUYIN_IAMBERRY_ACCOUNT_TYPE;
             } else {
                 // 美塔璞儿的抖店
-                rstSalesStoreId = 172;
+                rstSalesStoreId = 202;
                 salesCompanyId = 16;
                 accountId = DOUYIN_METAPURE_ACCOUNT_ID;
                 accountType = DOUYIN_METAPURE_ACCOUNT_TYPE;

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/TaobaoTask.java

@@ -300,6 +300,7 @@ public class TaobaoTask {
             order.setSkuId(t.getString("sku_id"));
             order.setStatus(t.getString("status"));
             order.setTotalFee(t.getString("total_fee"));
+            order.setOuterIid(t.getString("outer_iid"));
             trade.getOrders().add(order);
         }
         // 缓存订单信息的OAID
@@ -458,9 +459,13 @@ public class TaobaoTask {
                 warranty = 1;
                 item.setItemWarrantyStatus(1);
             }
+            logger.info("订单号:{},数量:{},产品编码:{}/{}", tid, tradeOrder.getNumIid(), tradeOrder.getOuterSkuId(), tradeOrder.getOuterIid());
             if (tradeOrder.getOuterSkuId() == null) {
-                logger.error("未搜索到产品编码,订单号:{} ", tid);
-                return null;
+                if (tradeOrder.getOuterIid() == null) {
+                    logger.error("未搜索到产品编码,订单号:{} ", tid);
+                    return null;
+                }
+                tradeOrder.setOuterSkuId(tradeOrder.getOuterIid());
             }
             ProductColor productColor = productColorMapper.getProductColorByBar(tradeOrder.getOuterSkuId());
             if(productColor.getProductIsSplit() == 1){

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -339,6 +339,8 @@ public class AwaitSendController {
             shopId = TaobaoConfig.DOUYIN_IAMBERRY_SHOP_ID;
         } else if (salesStoreId == 172) {
             shopId = TaobaoConfig.DOUYIN_METAPURE_SHOP_ID;
+        } else if (salesStoreId == 202) {
+            shopId = 187079746L;
         } else {
             throw new RuntimeException("未映射到抖音店铺，系统出小差啦~");
         }