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

platformapi/dadaapi/order_test.go

@@ -2,6 +2,7 @@ package dadaapi
 
 //
 import (
+	"fmt"
 	"git.rosy.net.cn/baseapi"
 	//"fmt"
 	"testing"
@@ -69,12 +70,19 @@ func TestCancel(t *testing.T) {
 //
 func TestQueryOrderInfo(t *testing.T) {
 	dadaapi = New("dada154e2a41fd6cef3", "7f97d8f258b70b450f04e7ab274ed8f8", "6660", "http://callback.jxc4.com/dadadelivery/msg", true)
-	result, err := dadaapi.QueryOrderInfo("88421859678001")
+	result, err := dadaapi.QueryOrderInfo("1100561003845430062")
 	if err != nil {
 		t.Fatal(err)
 	}
 	t.Log(utils.Format4Output(result, false))
 }
 
-func TestAddTip(t *testing.T) {
+type Names struct {
+	Name string `json:"name"`
+}
+
+func TestAddTip(t *testing.T) {
+	name := &Names{Name: "京西菜市"}
+	name.Name = "京西菜市" + "-" + "京西菜市(号门店)"
+	fmt.Println(utils.Format4Output(name, false))
 }

platformapi/ebaiapi/shop_sku_test.go

@@ -277,3 +277,35 @@ func TestDeleteStoreSku(t *testing.T) {
 	fmt.Println((49 & 4) == 0)
 
 }
+
+func TestDeleteSku(t *testing.T) {
+	param1 := &SkuListParams{
+		Page:     1,
+		PageSize: 100,
+	}
+	skuInfo, err := api.SkuList("669089", param1)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	skuIds := make([]int64, 0, 0)
+
+	for i := 1; i <= skuInfo.Pages; i++ {
+		param := &SkuListParams{
+			Page:     i,
+			PageSize: 100,
+		}
+		skuInfo2, err2 := api.SkuList("669089", param)
+		if err2 != nil {
+			fmt.Println(err2)
+		}
+		for _, v := range skuInfo2.List {
+			skuIds = append(skuIds, v.SkuID)
+		}
+	}
+	for i := 1; i <= skuInfo.Pages; i++ {
+		data, err := api.SkuDelete(utils.GetUUID(), "669089", skuIds[i-1:i*100], nil)
+		fmt.Println(data)
+		fmt.Println(err)
+	}
+}

platformapi/fnpsapi/fn_test.go

@@ -180,8 +180,8 @@ func TestGetOrder(t *testing.T) {
 
 func TestQueryOrder(t *testing.T) {
 	api = New("6705486294797503379", "c1e6c280-e618-4103-9d0a-673bc54fb22e", "51658", "")
-	api.accessToken = "c7ed10b7-3ecf-4def-adc1-9f43d5e9480c"
+	api.accessToken = "25a4ac91-8be3-47fa-8b45-1dcd9556780d"
-	data, err := api.QueryOrder("88421859678001") // 1100537991119839487  1100536591119839487
+	data, err := api.QueryOrder("1100558321115378179") // 1100537991119839487  1100536591119839487
 	globals.SugarLogger.Debug("data:= %s", utils.Format4Output(data, false))
 	globals.SugarLogger.Debug("err:= %s", utils.Format4Output(err, false))
 }

platformapi/fnpsapi/order.go

@@ -210,8 +210,8 @@ func (a *API) QueryOrder(partnerOrderCode string) (result *GetOrderDetailRes, er
 	if err := json.Unmarshal([]byte(data["business_data"].(string)), &fnResult); err != nil {
 		return nil, err
 	}
-	fnResult.OrderActualAmountCent += int64(utils.WayBillDeliveryMarkUp)
+	fnResult.OrderActualAmountCent += (int64(utils.WayBillDeliveryMarkUp) * 2)
-	fnResult.OrderTotalAmountCent += int64(utils.WayBillDeliveryMarkUp)
+	fnResult.OrderTotalAmountCent += (int64(utils.WayBillDeliveryMarkUp) * 2)
 	return fnResult, nil
 }
 

platformapi/jdapi/store_sku.go

@@ -332,3 +332,14 @@ func (a *API) DelVipPrice(outStationNo string, skuIds []*SkuIdEntity) (err error
 	_, err = a.AccessAPINoPage("vender/delVipPrice", jdParams, nil, nil, genNoPageResultParser("code", "msg", "", "0"))
 	return err
 }
+
+// AuerySkuInfoList 查询已经上传的商品列表
+func (a *API) AuerySkuInfoList(pageNo, pageSize int64) error {
+	jdParams := map[string]interface{}{
+		"pageNo":   pageNo,
+		"pageSize": pageSize,
+	}
+	data, err := a.AccessAPINoPage("pms/querySkuInfoList", jdParams, nil, nil, genNoPageResultParser("code", "msg", "", "0"))
+	fmt.Println(data)
+	return err
+}

platformapi/kuaishou_mini/kuaishou_api.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"git.rosy.net.cn/baseapi/platformapi"
 	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/jx-callback/globals"
 	"net/http"
 	"sort"
 	"strings"
@@ -15,7 +14,7 @@ import (
 
 const (
 	// KuaiShouBashUrl 基础域名
-	KuaiShouBashUrl = "https://open.kuaishou.com" // 域名
+	KuaiShouBashUrl = "http://open.kuaishou.com" // 域名
 
 	KuaiShouAuthLogin         = KuaiShouBashUrl + "/oauth2/mp/code2session"                 // 授权登录
 	KuaiShouGetToken          = KuaiShouBashUrl + "/oauth2/access_token"                    // 获取授权token
@@ -87,10 +86,8 @@ func (a *API) GetToken() error {
 func (a *API) AccessAPI1(url string, params map[string]interface{}) (retVal map[string]interface{}, err error) {
 	err = platformapi.AccessPlatformAPIWithRetry(a.client,
 		func() *http.Request {
-			globals.SugarLogger.Debugf("====param := %s", utils.Format4Output(params, false))
+			request, _ := http.NewRequest(http.MethodPost, url, strings.NewReader(utils.Format4Output(params, false)))
-			globals.SugarLogger.Debugf("====url := %s", utils.Format4Output(url, false))
+			request.Header.Set("Content-Type", "application/json")
-			request, _ := http.NewRequest(http.MethodPost, url, strings.NewReader(utils.Map2URLValues(params).Encode()))
-			request.Header.Set("Content-Type", "application/json;charset=UTF-8")
 			return request
 		},
 		a.config,

platformapi/kuaishou_mini/kuaishou_model.go

@@ -46,7 +46,12 @@ type PreCreateOrderReq struct {
 type PreCreateOrderResponse struct {
 	Result    int                     `json:"result"`
 	ErrorMsg  string                  `json:"error_msg"`
-	OrderInfo string `json:"order_info"` //拉起收银台的 orderInfo
+	OrderInfo CreateOrderResponseInfo `json:"order_info"` //拉起收银台的 orderInfo
+}
+
+type CreateOrderResponseInfo struct {
+	OrderInfoToken string `json:"order_info_token"`
+	OrderNo        string `json:"order_no"`
 }
 
 // GetOrderDetailRes 获取支付订单详情

platformapi/kuaishou_mini/kuaishou_pay.go

@@ -9,27 +9,26 @@ import (
 )
 
 // PreCreateOrder 预下单生成支付信息
-func (a *API) PreCreateOrder(param *PreCreateOrderReq) (string, error) {
+func (a *API) PreCreateOrder(param *PreCreateOrderReq) (*CreateOrderResponseInfo, error) {
 	if a.appId == "" || a.appSecret == "" {
-		return "", errors.New("appId/appSecret 不能为空")
+		return nil, errors.New("appId/appSecret 不能为空")
 	}
 
 	param.Sign = a.sign(utils.Struct2MapByJson(param))
 	result, err := a.AccessAPI1(a.FullUrl(KuaiShouPreCreateOrder), utils.Struct2MapByJson(param))
 	if err != nil {
-		return "", err
+		return nil, err
 	}
-
 	order := PreCreateOrderResponse{}
 	if err := utils.Map2StructByJson(result, &order, false); err != nil {
-		return "", err
+		return nil, err
 	}
 
 	if order.Result != 1 {
-		return "", errors.New(order.ErrorMsg)
+		return nil, errors.New(order.ErrorMsg)
 	}
 
-	return order.OrderInfo, nil
+	return &order.OrderInfo, nil
 }
 
 // GetOrderDetail 订单详情查询接口

platformapi/kuaishou_mini/kuaishou_test.go

@@ -84,7 +84,7 @@ func TestPreCreateOrder(t *testing.T) {
 		NotifyUrl:            "https://callback-jxgy.jxc4.com/kuaishou/kuaiShouCallback",
 		GoodsId:              "1122",
 		GoodsDetailUrl:       "/page/index/anima",
-		//MultiCopiesGoodsInfo: `[{"copies":2}]`,
+		MultiCopiesGoodsInfo: `[{"copies":2}]`,
 		CancelOrder:          1,
 	}
 	data, err := api.PreCreateOrder(param)
@@ -103,3 +103,7 @@ func TestAaww(t *testing.T) {
 		fmt.Println(utils.Str2Int64(value))
 	}
 }
+
+func TestLen(t *testing.T) {
+	fmt.Println(len("ChJrc01wUGF5Lm9yZGVyVG9rZW4SUP-S69vDW6NXUdGJJzqMLVObb1kgoXHrLPA-DPFFatGblYLtl9RfSthO5gpYCYgqVvxssxqhTaEo7o_IMSFE3vaj_kCyB9VXrN6cUMzbR7I5GhKdjrmQJwdL5mBuRor3eHSGhfsiIM_Zx5g9T__A6TwjoclKptFlQTKaRvh5aIr_EAJvYYR0KAUwAQ"))
+}

platformapi/mtwmapi/mtwmapi_test.go

@@ -27,7 +27,7 @@ func init() {
 	//api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "")
 
 	//商超
-	api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_nFTOat5DYhvqHIZbDZRJkQ") //token_n4TwqCntWWuvQwAawzxC0w
+	//api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_vFHMcmYdq9AEhka8FHRHlw") //token_n4TwqCntWWuvQwAawzxC0w
 	cookieStr := `
 		acctId=57396785; token=0bWbK5VbK50E2BmIhIH2zHB-am_y7mB37yXHm6RLZWx4*; wmPoiId=-1;
 	`

platformapi/mtwmapi/retail_test.go

@@ -120,10 +120,10 @@ func TestRetailListAll(t *testing.T) {
 
 // 删除所有门店商品
 func TestReloadStoreSku(t *testing.T) {
-	result, err := api.RetailListAll("17223201")
+	result, err := api.RetailListAll("17924337")
 	if err == nil {
 		for i := 0; i < len(result); i++ {
-			err := api.RetailDelete(utils.Int64ToStr(time.Now().Unix()), "17223201", result[i].AppFoodCode)
+			err := api.RetailDelete(utils.Int64ToStr(time.Now().Unix()), "17924337", result[i].AppFoodCode)
 			if err != nil {
 				fmt.Println(err)
 			}