Merge branch 'master' of https://e.coding.net/rosydev/baseapi

platformapi/mtwmapi/bill_list.go

@@ -10,6 +10,8 @@ const (
 	BillChargeTypeTimingFee  = 10 // 定时宝,保险费
 )
 
+//#region 获取门店订单的结算信息 bill/list
+
 type Bill struct {
 	AppPoiCode string `json:"app_poi_code"` // APP方门店id，传商家中台系统里门店的编码。如商家在操作绑定门店至开放平台应用中时，未绑定三方门店id信息，则默认APP方门店id与美团门店id相同。
 	StartDate  int64  `json:"start_date"`   // 秒级时间戳
@@ -31,18 +33,24 @@ type Bill struct {
 3）想要实现的效果；
 4）预计开发周期和上线时间；
 5）商家公司授权开通日账单接口的证明。（点击下载授权证明模板，授权证明以附件形式提供。）*/
-func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, error) {
+func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, int64, error) {
+	// 门店订单结算信息(配送费和定时保险费)
 	orderSettle := make(map[string]*SettleOrderList, 0)
-
+	// 门店订单的结算id
+	var settleID int64 = 0
 	for {
 		result, err := a.AccessAPI3("bill/list", true, utils.Struct2Map(param, "", false))
 		if err != nil {
-			return nil, err
+			return nil, 0, err
 		}
 
 		var data *StoreBillListRes
 		if err := utils.Map2StructByJson(result, &data, false); err != nil {
-			return nil, err
+			return nil, 0, err
+		}
+
+		if len(data.Data) > 0 && param.Offset == 0 {
+			settleID = utils.Str2Int64(data.Data[0].SettleSettingId)
 		}
 
 		for _, v := range data.Data {
@@ -70,7 +78,7 @@ func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, error)
 		}
 	}
 
-	return orderSettle, nil
+	return orderSettle, settleID, nil
 }
 
 // StoreBillListReq 门店结算查询条件
@@ -184,3 +192,5 @@ type SettleOrderList struct {
 	DeliveryFee        int64  `json:"delivery_fee"`        // 配送费
 	PlatformSettlement int64  `json:"platform_settlement"` // 平台结算金额
 }
+
+//#endregion

platformapi/mtwmapi/bill_list_test.go

@@ -1,7 +1,6 @@
 package mtwmapi
 
 import (
-	"fmt"
 	"git.rosy.net.cn/jx-callback/globals"
 	"testing"
 	"time"
@@ -19,19 +18,14 @@ func TestBillList(t *testing.T) {
 		Limit:      200,
 	}
 
-	data, err := api.GetStoreBillList(param)
+	data, settleId, err := api.GetStoreBillList(param)
 	if err != nil {
 		globals.SugarLogger.Debugf("err := %v", err)
 		return
 	}
 
+	globals.SugarLogger.Debugf("settleId := %d", settleId)
 	for _, v := range data {
 		globals.SugarLogger.Debugf("OrderId : %s , TimingFee : %d , DeliveryFee : %d , PlatformSettlement : %d ", v.OrderId, v.TimingFee, v.DeliveryFee, v.PlatformSettlement)
 	}
 }
-
-func TestA1(t *testing.T) {
-	a := -20
-	fmt.Println(a * -1)
-
-}

platformapi/mtwmapi/mtwmapi_test.go

@@ -60,7 +60,7 @@ func TestGetAccessToken(t *testing.T) {
 }
 
 func TestGetAccessToken2(t *testing.T) {
-	result, err := api.GetAccessToken2("17395411") //refresh_token_pLG7Jw7g9mu7oOzNSuJIUg
+	result, err := api.GetAccessToken2("17465429") //refresh_token_pLG7Jw7g9mu7oOzNSuJIUg
 	if err != nil {
 		t.Fatal(err)
 	}

platformapi/tiktok_shop/tiktok_api/sku_test.go

@@ -140,23 +140,7 @@ func TestBatchDecrypt(t *testing.T) {
 //}
 
 var c = []int64{
-	87893329,
+	64208920}
-	87542533,
-	86486240,
-	86454312,
-	85672244,
-	85672146,
-	85672027,
-	85671854,
-	85671727,
-	85671454,
-	85671173,
-	85670943,
-	84938439,
-	84936029,
-	83727966,
-	81521327,
-	80790189}
 
 //668851,
 //668841,
@@ -280,10 +264,11 @@ func TestDeleteSkuAndUploadSku7(t *testing.T) {
 	for _, v := range c {
 		for i := 1; i < 100; i++ {
 			result, err := a.GetSkuDetailList(&product_listV2_request.ProductListV2Param{
-				CheckStatus: 3, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架
+				CheckStatus: 1, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架
 				Page:        int64(i),
 				Size:        100,
 				StoreId:     v,
+				Status:      1,
 			})
 			if err != nil {
 				globals.SugarLogger.Debugf("=index := %d ,err := %s", i, utils.Format4Output(err, false))

platformapi/uinapp/uin_app_test.go

@@ -2,8 +2,10 @@ package uinapp
 
 import (
 	"fmt"
+	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/globals"
 	"testing"
+	"time"
 )
 
 var (
@@ -59,3 +61,8 @@ func TestCidSend(t *testing.T) {
 	})
 	fmt.Println(err)
 }
+
+func TestTime(t *testing.T) {
+	timestamp := utils.Int64ToStr(time.Now().UnixNano() / 1e6)
+	fmt.Println(timestamp)
+}