1'

business/jxcallback/orderman/order.go

@@ -2701,32 +2701,36 @@ func UpdateTiktokShopTotalMoney() {
 // UpdateTaoSettleInfo 定时任务更新淘鲜达结算信息
 func UpdateTaoSettleInfo() {
 	db := dao.GetDB()
+	var count = 0
 	globals.SugarLogger.Debugf("======================UpdateTaoSettleInfo")
-	storeMaps, err := dao.GetStoresMapList(db, []int{model.VendorIDTaoVegetable}, nil, nil, -9, -1, "", "", "")
+
-	if err != nil {
-		return
-	}
 	timeStart := time.Now().Add(-24 * 90 * time.Hour)
 	startTime := time.Date(timeStart.Year(), timeStart.Month(), timeStart.Day(), 0, 0, 0, 0, timeStart.Location())
 
-	timeEnd := time.Now().Add(-24 * 70 * time.Hour)
+	timeEnd := time.Now()
 	endTiem := time.Date(timeEnd.Year(), timeEnd.Month(), timeEnd.Day()-1, 23, 59, 59, 0, timeStart.Location())
-	for _, v := range storeMaps {
+
-		globals.SugarLogger.Debugf("========storeID := %s", v.VendorStoreID)
+	storeMaps, err := dao.GetTaoOrderVendor(db, startTime, endTiem)
-		settleInfo, err := tao.GetOrderTotalShopMoney(v.VendorOrgCode, v.VendorStoreID, startTime, endTiem)
+	if err != nil {
+		return
+	}
+
+	for k, v := range storeMaps {
+		count++
+		globals.SugarLogger.Debugf("========storeID := %s", k)
+		settleInfo, err := tao.GetOrderTotalShopMoney(v, k, startTime, endTiem)
 		if err != nil {
 			globals.SugarLogger.Errorf("获取淘鲜达结算信息异常 := %v", err)
 			continue
 		}
 		if len(settleInfo) == model.NO {
-			globals.SugarLogger.Debugf("门店[%d:%s],暂无结算信息", v.StoreID, v.StoreName)
 			continue
 		}
 
 		for orderId2, settle := range settleInfo {
 			goodsOrder, err := partner.CurOrderManager.LoadOrder2(orderId2, model.VendorIDTaoVegetable)
 			if err != nil || goodsOrder == nil {
-				globals.SugarLogger.Debugf("门店[%d:%s],订单查询异常[%s:%v]", v.StoreID, v.StoreName, orderId2, err)
+				globals.SugarLogger.Debugf("门店[%d:%s],订单查询异常[%s:%v]", v, k, orderId2, err)
 				continue
 			}
 
@@ -2750,4 +2754,5 @@ func UpdateTaoSettleInfo() {
 			}
 		}
 	}
+	globals.SugarLogger.Debug("========count := %d", count)
 }

business/jxstore/misc/misc.go

@@ -204,7 +204,7 @@ func Init() {
 			"06:30:00",
 			"00:30:00",
 			"12:30:00",
-			"17:05:00",
+			"17:42:00",
 		})
 
 		// 每分钟轮询一次,推送骑手信息(假的订单)

business/model/dao/dao_order.go

@@ -1902,6 +1902,24 @@ func QueryOrdersForManageState(db *DaoDB, storeID, vendorID, status int, fromTim
 	return userCoupons, err
 }
 
+func GetTaoOrderVendor(db *DaoDB, startTime, endTime time.Time) (map[string]string, error) {
+	sql := ` SELECT * FROM goods_order g WHERE g.order_created_at >= ? AND g.order_created_at <= ? AND g.vendor_id = ? AND g.total_shop_money = ? `
+	param := []interface{}{startTime, endTime, model.VendorIDTaoVegetable, model.NO}
+	result := make([]*model.GoodsOrder, 0, 0)
+
+	if err := GetRows(db, result, sql, param); err != nil {
+		return nil, err
+	}
+
+	data := make(map[string]string, 0)
+	if len(result) > 0 {
+		for _, v := range result {
+			data[v.VendorStoreID] = v.VendorOrgCode
+		}
+	}
+	return data, nil
+}
+
 func GetOrderStoreIDs(db *DaoDB, beginAt, endAt time.Time, vendorID int) (storeIDs []int, err error) {
 	var (
 		stores []*model.Store

business/partner/purchase/tao_vegetable/order.go

@@ -916,7 +916,10 @@ func GetOrderTotalShopMoney(appOrgCode string, vendorStoreID string, start, end
 	}
 
 	var totalIndex int64 = 0
-	result, _ := api.QueryBillList(param)
+	result, err := api.QueryBillList(param)
+	if err != nil {
+		return settlement, nil
+	}
 	for _, v := range *result.TxdBillDetailBOS {
 		if *v.OrderType == "positive" {
 			settlement[*v.BizOrderId] = *v.ReceivableAmount
@@ -931,7 +934,10 @@ func GetOrderTotalShopMoney(appOrgCode string, vendorStoreID string, start, end
 
 		for i := 2; i <= int(totalIndex); i++ {
 			param.TxdBillListGetRequest.PageIndex = utils.Int64ToPointer(int64(i))
-			result2, _ := api.QueryBillList(param)
+			result2, err := api.QueryBillList(param)
+			if err != nil {
+				return settlement, nil
+			}
 			for _, v := range *result2.TxdBillDetailBOS {
 				if *v.OrderType == "positive" {
 					settlement[*v.BizOrderId] = *v.ReceivableAmount

business/partner/purchase/tiktok_store/callback.go

@@ -29,8 +29,8 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes
 	if CurPurchaseHandler != nil {
 		orderId, shopId, _ := api.TiktokStore.GetCallbackOrderId(msgId, msg)
 		orderDetail, err := GetTiktokApi(utils.Int64ToStr(shopId), 0, "").GetTiktokOrderDetail(orderId)
-		if err != nil {
 		globals.SugarLogger.Debugf("GetTiktokApi msg := %s", utils.Format4Output(msg, false))
+		if err != nil {
 			return tiktokShop.Err2CallbackResponse(err, "")
 		}
 		vendorStoreID := orderDetail.SkuOrderList[0].StoreInfo.StoreId