From b791a3ed2bf5d81a065ee571f88623ddd4b4786c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 22 Oct 2025 10:42:47 +0800 Subject: [PATCH] 1 --- platformapi/jxprintapi/jxprintapi_test.go | 49 +++++++++++------------ platformapi/mtwmapi/callback.go | 3 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/platformapi/jxprintapi/jxprintapi_test.go b/platformapi/jxprintapi/jxprintapi_test.go index 8ac3a71e..31a91702 100644 --- a/platformapi/jxprintapi/jxprintapi_test.go +++ b/platformapi/jxprintapi/jxprintapi_test.go @@ -79,31 +79,30 @@ func TestGetPrinterStatus(t *testing.T) { // 20210615000012 func TestDoPrint(t *testing.T) { - result, err := api.DoPrint("120220915001594", `{ - "allSkuCount": "2", - "allSkuTypeCount": "1", - "appId": "1000", - "businessType": "1", - "buyerComment": "(缺货时电话与我联系)", - "consigneeAddress": "脉冲品质汽美车衣•改色•贴膜(沪太店)@#上海市上海市静安区彭浦镇绿苑小区", - "consigneeMobile": "18468578703,380", - "consigneeName": "刘*****", - "eBaiOrderNo": "好菜鲜生", - "eBailCode": "1126", - "officialName": "京西菜市", - "orderNo": "4016410104553361126", - "orderStatus": "5", - "payOrderTime": "2023-03-22 11:15:06", - "qrcOrder": "4016410104553361126", - "skuList": "[{\"skuName\":\"【精选好价】肥瘦五花肉(下午易缺货)250g/组\",\"skuCount\":\"X2\",\"salePrice\":\"¥22.10\",\"totalCountPrice\":\"¥44.20\",\"upc\":\"\"}]", - "storeName": "好菜鲜生(胜浦中胜路店)", - "storeTel": "13205196216", - "trySendTime": "2023-03-22 11:45:13", - "userPayMoney": "¥43.20", - "vendorID": "3", - "vendorName": "饿百新零售", - "vendorOrderNo": "5" -}`, 2) + result, err := api.DoPrint("120220915001330", `{ + "allSkuCount": "11", + "allSkuTypeCount": "11", + "appId": "1000", + "businessType": "1", + "buyerComment": "【如遇缺货】:缺货时电话与我沟通 收货人隐私号 18428944043,9133,手机号 157****5586", + "consigneeAddress": "鹭岛国际4期-6栋-1单元 (6栋一单元1711)@#四川省成都市武侯区红牌楼街道鹭岛国际4期", + "consigneeMobile": "18428944043,9133", + "consigneeName": "测试订单无需拣货", + "eBailCode": "", + "officialName": "测试订单无需拣货", + "orderNo": "3401827041718147024", + "orderStatus": "10", + "payOrderTime": "2025-10-20 18:46:58", + "qrcOrder": "3401827041718147024", + "skuList": "[{\"skuName\":\"【新鲜】精猪瘦肉片约150g/份\",\"skuCount\":\"X1\",\"salePrice\":\"¥7.90\",\"totalCountPrice\":\"¥7.90\",\"upc\":\"\"},{\"skuName\":\"(火锅)海带结约150g/袋\",\"skuCount\":\"X1\",\"salePrice\":\"¥4.80\",\"totalCountPrice\":\"¥4.80\",\"upc\":\"\"},{\"skuName\":\"【新鲜】西红柿 番茄约500g/份(约450-500g左右)\",\"skuCount\":\"X1\",\"salePrice\":\"¥5.90\",\"totalCountPrice\":\"¥5.90\",\"upc\":\"\"},{\"skuName\":\"【新鲜】嫩豆腐1块约250g/份\",\"skuCount\":\"X1\",\"salePrice\":\"¥2.30\",\"totalCountPrice\":\"¥2.30\",\"upc\":\"\"},{\"skuName\":\"奶油生菜约500g/份\",\"skuCount\":\"X1\",\"salePrice\":\"¥5.90\",\"totalCountPrice\":\"¥5.90\",\"upc\":\"\"},{\"skuName\":\"【新鲜】平菇 蘑菇约150g/份\",\"skuCount\":\"X1\",\"salePrice\":\"¥3.60\",\"totalCountPrice\":\"¥3.60\",\"upc\":\"\"},{\"skuName\":\"【新鲜】鲜香菇 蘑菇约150g/份\",\"skuCount\":\"X1\",\"salePrice\":\"¥4.10\",\"totalCountPrice\":\"¥4.10\",\"upc\":\"\"},{\"skuName\":\"【火锅食材】现切莴笋条 火锅配菜约250g/份\",\"skuCount\":\"X1\",\"salePrice\":\"¥4.10\",\"totalCountPrice\":\"¥4.10\",\"upc\":\"\"},{\"skuName\":\"【火锅伴侣】火锅套餐 素菜组合约1kg/组\",\"skuCount\":\"X1\",\"salePrice\":\"¥14.30\",\"totalCountPrice\":\"¥14.30\",\"upc\":\"\"},{\"skuName\":\"【火锅伴侣】火锅丸子组合(随机2-4种)约250g/份\",\"skuCount\":\"X1\",\"salePrice\":\"¥8.30\",\"totalCountPrice\":\"¥8.30\",\"upc\":\"\"},{\"skuName\":\"【火锅侠】牛肉卷约100g/份\",\"skuCount\":\"X1\",\"salePrice\":\"¥11.70\",\"totalCountPrice\":\"¥11.70\",\"upc\":\"\"}]", + "storeName": "京西菜市(武侯大道店)", + "storeTel": "18140114975", + "trySendTime": "2025-10-20 19:27:01", + "userPayMoney": "¥74.33", + "vendorID": "1", + "vendorName": "美团外卖", + "vendorOrderNo": "7" +}`, 17) if err != nil { t.Fatal(err) } diff --git a/platformapi/mtwmapi/callback.go b/platformapi/mtwmapi/callback.go index 474949d0..85f1a682 100644 --- a/platformapi/mtwmapi/callback.go +++ b/platformapi/mtwmapi/callback.go @@ -35,7 +35,8 @@ const ( MsgTypeStoreStatusChanged = "storeStatusChanged" MsgTypeStoreAuditStatusChanged = "storeAuditStatusChanged" - MsgTypeSkuDelete = "skuDelete" + MsgTypeSkuDelete = "skuDelete" // 线上商品删除回调 + MsgTypeSkuUpdate = "skuUpdate" // 线上修改商品回调(非api操作商品回调) MsgTypeStoreBind = "storeBind" MsgTypeOrderAgree = "agree" // 同意退款回调