- use baseURL when playback callback msg.

2018-06-29 10:59:23 +08:00
parent 6b865b5f4c
commit 6229a986c6
3 changed files with 33 additions and 20 deletions
--- a/platformapi/dadaapi/dadaapi_test.go
+++ b/platformapi/dadaapi/dadaapi_test.go
@@ -139,22 +139,23 @@ func TestCancelOrder(t *testing.T) {
 }

 func TestCallbackMsgPlayback(t *testing.T) {
+	baseURL := "http://callback.test.jxc4.com:8080/"
 	playbackData := [][]string{
 		[]string{
 			"{\"signature\":\"2b10053038eef28af360fa2603d59fd1\",\"client_id\":\"275159553154971\",\"order_id\":\"815433510000122\",\"order_status\":1,\"cancel_reason\":\"\",\"cancel_from\":0,\"dm_id\":0,\"update_time\":1530171995}",
-			"http://callback.test.jxc4.com:8080/dadadelivery/msg",
+			baseURL + "dadadelivery/msg",
 		},
 		[]string{
 			"{\"signature\":\"14cb9d55179d47de73e09d3b5e800fea\",\"client_id\":\"275159553154971\",\"order_id\":\"815433510000122\",\"order_status\":2,\"cancel_reason\":\"\",\"cancel_from\":0,\"dm_id\":4690995,\"dm_name\":\"王杰\",\"dm_mobile\":\"15982842356\",\"update_time\":1530172054}",
-			"http://callback.test.jxc4.com:8080/dadadelivery/msg",
+			baseURL + "dadadelivery/msg",
 		},
 		[]string{
 			"{\"signature\":\"1058519a18dd8ee8ba6a1638e53bed66\",\"client_id\":\"275159553154971\",\"order_id\":\"815433510000122\",\"order_status\":3,\"cancel_reason\":\"\",\"cancel_from\":0,\"dm_id\":4690995,\"dm_name\":\"王杰\",\"dm_mobile\":\"15982842356\",\"update_time\":1530173065}",
-			"http://callback.test.jxc4.com:8080/dadadelivery/msg",
+			baseURL + "dadadelivery/msg",
 		},
 		[]string{
 			"{\"signature\":\"9c7a5d72d4e9bdea7b452f38e5c5a0dc\",\"client_id\":\"275159553154971\",\"order_id\":\"815433510000122\",\"order_status\":4,\"cancel_reason\":\"\",\"cancel_from\":0,\"dm_id\":4690995,\"dm_name\":\"王杰\",\"dm_mobile\":\"15982842356\",\"update_time\":1530173559}",
-			"http://callback.test.jxc4.com:8080/dadadelivery/msg",
+			baseURL + "dadadelivery/msg",
 		},
 	}
 	for _, v := range playbackData {
--- a/platformapi/elmapi/elmapi_test.go
+++ b/platformapi/elmapi/elmapi_test.go
@@ -71,41 +71,47 @@ func TestRefreshTokenIndividual(t *testing.T) {
 	sugarLogger.Debug(result)
 }

+/*
+DELETE t1
+FROM elemeorder t1
+WHERE t1.orderid = 3025365125607913707;
+*/
 func TestCallbackMsgPlayback(t *testing.T) {
+	baseURL := "http://callback.test.jxc4.com:8080/"
 	playbackData := [][]string{
 		[]string{
 			"{\"requestId\":\"200016744375484334\",\"type\":10,\"appId\":78247922,\"message\":\"{\\\"id\\\":\\\"3025365125607913707\\\",\\\"orderId\\\":\\\"3025365125607913707\\\",\\\"address\\\":\\\"新世纪百货(民心佳园店)民心家园45栋22-3 民心佳园45栋22-3\\\",\\\"createdAt\\\":\\\"2018-06-28T14:25:53\\\",\\\"activeAt\\\":\\\"2018-06-28T14:25:53\\\",\\\"deliverFee\\\":1.0,\\\"deliverTime\\\":null,\\\"description\\\":\\\"猪脚砍成小块 一定要砍 谢谢\\\",\\\"groups\\\":[{\\\"name\\\":\\\"1号篮子\\\",\\\"type\\\":\\\"normal\\\",\\\"items\\\":[{\\\"id\\\":1419971532,\\\"skuId\\\":200000225250841518,\\\"name\\\":\\\"前脚约450g/份\\\",\\\"categoryId\\\":1,\\\"price\\\":32.0,\\\"quantity\\\":1,\\\"total\\\":32.0,\\\"additions\\\":[],\\\"newSpecs\\\":[],\\\"attributes\\\":[],\\\"extendCode\\\":\\\"\\\",\\\"barCode\\\":\\\"1631\\\",\\\"weight\\\":450.0,\\\"userPrice\\\":0.0,\\\"shopPrice\\\":0.0,\\\"vfoodId\\\":1392153708},{\\\"id\\\":1419974600,\\\"skuId\\\":200000225254000558,\\\"name\\\":\\\"红花生米约500g/份\\\",\\\"categoryId\\\":1,\\\"price\\\":11.43,\\\"quantity\\\":1,\\\"total\\\":11.43,\\\"additions\\\":[],\\\"newSpecs\\\":[],\\\"attributes\\\":[],\\\"extendCode\\\":\\\"\\\",\\\"barCode\\\":\\\"654\\\",\\\"weight\\\":500.0,\\\"userPrice\\\":0.0,\\\"shopPrice\\\":0.0,\\\"vfoodId\\\":1392165882},{\\\"id\\\":1419958462,\\\"skuId\\\":200000225237475246,\\\"name\\\":\\\"莲藕约500g/份\\\",\\\"categoryId\\\":1,\\\"price\\\":8.0,\\\"quantity\\\":1,\\\"total\\\":8.0,\\\"additions\\\":[],\\\"newSpecs\\\":[],\\\"attributes\\\":[],\\\"extendCode\\\":\\\"\\\",\\\"barCode\\\":\\\"3171\\\",\\\"weight\\\":500.0,\\\"userPrice\\\":0.0,\\\"shopPrice\\\":0.0,\\\"vfoodId\\\":1392164749}]}],\\\"invoice\\\":null,\\\"book\\\":false,\\\"onlinePaid\\\":true,\\\"railwayAddress\\\":null,\\\"phoneList\\\":[\\\"18983425091\\\"],\\\"shopId\\\":157465482,\\\"shopName\\\":\\\"好菜鲜生(民心店)\\\",\\\"daySn\\\":3,\\\"status\\\":\\\"unprocessed\\\",\\\"refundStatus\\\":\\\"noRefund\\\",\\\"userId\\\":82003158,\\\"userIdStr\\\":\\\"82003158\\\",\\\"totalPrice\\\":37.43,\\\"originalPrice\\\":52.43,\\\"consignee\\\":\\\"代**\\\",\\\"deliveryGeo\\\":\\\"106.56272398,29.62484594\\\",\\\"deliveryPoiAddress\\\":\\\"新世纪百货(民心佳园店)民心家园45栋22-3 民心佳园45栋22-3\\\",\\\"invoiced\\\":false,\\\"income\\\":35.56,\\\"serviceRate\\\":0.05,\\\"serviceFee\\\":-1.87,\\\"hongbao\\\":0.0,\\\"packageFee\\\":0.0,\\\"activityTotal\\\":-15.0,\\\"shopPart\\\":-15.0,\\\"elemePart\\\":-0.0,\\\"downgraded\\\":false,\\\"vipDeliveryFeeDiscount\\\":0.0,\\\"openId\\\":\\\"\\\",\\\"secretPhoneExpireTime\\\":null,\\\"orderActivities\\\":[{\\\"categoryId\\\":12,\\\"name\\\":\\\"在线支付立减优惠\\\",\\\"amount\\\":-15.0,\\\"elemePart\\\":0.0,\\\"restaurantPart\\\":-15.0,\\\"familyPart\\\":0.0,\\\"id\\\":1236491610,\\\"orderAllPartiesPartList\\\":[{\\\"partName\\\":\\\"商家补贴\\\",\\\"partAmount\\\":\\\"15.0\\\"}]}],\\\"invoiceType\\\":null,\\\"taxpayerId\\\":\\\"\\\",\\\"coldBoxFee\\\":0.0,\\\"cancelOrderDescription\\\":null,\\\"cancelOrderCreatedAt\\\":null,\\\"orderCommissions\\\":[]}\",\"shopId\":157465482,\"timestamp\":1530167153482,\"signature\":\"9A1D366FE631A54390A20A2E023B41A8\",\"userId\":336072266326420104}",
-			"http://callback.test.jxc4.com:8080/eleme/msg",
+			baseURL + "eleme/msg",
 			"application/json; charset=utf-8",
 		},
 		[]string{
 			"{\"requestId\":\"200016744381715374\",\"type\":12,\"appId\":78247922,\"message\":\"{\\\"orderId\\\":\\\"3025365125607913707\\\",\\\"state\\\":\\\"valid\\\",\\\"shopId\\\":157465482,\\\"updateTime\\\":1530167232,\\\"role\\\":3}\",\"shopId\":157465482,\"timestamp\":1530167232500,\"signature\":\"4B491256CC0015603F12CACAE9AFA004\",\"userId\":336072266326420104}",
-			"http://callback.test.jxc4.com:8080/eleme/msg",
+			baseURL + "eleme/msg",
 			"application/json; charset=utf-8",
 		},
 		[]string{
 			"sign=d75dc693f00ced3ace82c46a46a57e0e61034f14&timestamp=1530168075&delivery_id=423296&status=0&appkey=3c0a05d464c247c19d7ec13accc78605&order_id=3025365125607913707&mt_peisong_id=1530168075083323",
-			"http://callback.test.jxc4.com:8080/mtps/status",
+			baseURL + "mtps/status",
 			"",
 		},
 		[]string{
 			"sign=f539529a0c1db827135f5ff576d581016ef9f8ef&timestamp=1530168134&delivery_id=423296&status=20&appkey=3c0a05d464c247c19d7ec13accc78605&courier_phone=17783604157&courier_name=%E7%99%BD%E5%B7%9D%E8%8B%B1&order_id=3025365125607913707&mt_peisong_id=1530168075083323",
-			"http://callback.test.jxc4.com:8080/mtps/status",
+			baseURL + "mtps/status",
 			"",
 		},
 		[]string{
 			"sign=552cd6f662e7117d9975d55a86313bdf7cdce964&timestamp=1530169704&delivery_id=423296&status=30&appkey=3c0a05d464c247c19d7ec13accc78605&courier_phone=17783604157&courier_name=%E7%99%BD%E5%B7%9D%E8%8B%B1&order_id=3025365125607913707&mt_peisong_id=1530168075083323",
-			"http://callback.test.jxc4.com:8080/mtps/status",
+			baseURL + "mtps/status",
 			"",
 		},
 		[]string{
 			"sign=eec01e70060faa86a81d9e5ee520db69594504e0&timestamp=1530169998&delivery_id=423296&status=50&appkey=3c0a05d464c247c19d7ec13accc78605&courier_phone=17783604157&courier_name=%E7%99%BD%E5%B7%9D%E8%8B%B1&order_id=3025365125607913707&mt_peisong_id=1530168075083323",
-			"http://callback.test.jxc4.com:8080/mtps/status",
+			baseURL + "mtps/status",
 			"",
 		},
 		[]string{
 			"{\"requestId\":\"200016744576047022\",\"type\":18,\"appId\":78247922,\"message\":\"{\\\"orderId\\\":\\\"3025365125607913707\\\",\\\"state\\\":\\\"settled\\\",\\\"shopId\\\":157465482,\\\"updateTime\\\":1530169999,\\\"role\\\":3}\",\"shopId\":157465482,\"timestamp\":1530169999773,\"signature\":\"7D0DCE6C3514B16DA97171E5CDFABE0F\",\"userId\":336072266326420104}",
-			"http://callback.test.jxc4.com:8080/eleme/msg",
+			baseURL + "eleme/msg",
 			"application/json; charset=utf-8",
 		},
 	}
--- a/platformapi/jdapi/jdapi_test.go
+++ b/platformapi/jdapi/jdapi_test.go
@@ -176,43 +176,49 @@ func TestSimulateSendNewOrderMsg(t *testing.T) {
 	sugarLogger.Debug(string(bodyData))
 }

+/*
+DELETE t1
+FROM jdorder t1
+WHERE t1.jdorderid = 815438712001141;
+*/
 func TestCallbackMsgPlayback(t *testing.T) {
+	baseURL := "http://callback.test.jxc4.com:8080/"
 	playbackData := [][]string{
 		[]string{
 			"timestamp=2018-06-28+16%3A33%3A06&sign=B9FF8D5428F1DD1031DEF84AD08AB546&v=1.0&jd_param_json=%7B%22billId%22%3A%22815438712001141%22%2C%22statusId%22%3A%2232000%22%2C%22timestamp%22%3A%222018-06-28+16%3A33%3A03%22%7D&token=91633f2a-c5f5-4982-a925-a220d19095c3&app_key=1dba76d40cac446ca500c0391a0b6c9d&format=json",
-			"http://callback.test.jxc4.com:8080/djsw/newOrder",
+			baseURL + "djsw/newOrder",
 		},
 		[]string{
 			"timestamp=2018-06-28+16%3A40%3A19&sign=10C8ACAC71D954C0607046AC669079ED&v=1.0&jd_param_json=%7B%22billId%22%3A%22815438712001141%22%2C%22statusId%22%3A%222%22%2C%22timestamp%22%3A%222018-06-28+16%3A40%3A19%22%7D&token=91633f2a-c5f5-4982-a925-a220d19095c3&app_key=1dba76d40cac446ca500c0391a0b6c9d&format=json",
-			"http://callback.test.jxc4.com:8080/djsw/pickFinishOrder",
+			baseURL + "djsw/pickFinishOrder",
 		},
 		[]string{
 			"timestamp=2018-06-28%2B16%253A40%253A19&sign=E270E90A7F1712331AD210CCB477ED32&v=1.0&jd_param_json=%257B%2522createPin%2522%253A%2522JD_33d45ba55afeb1%2522%252C%2522deliveryCarrierName%2522%253A%2522%25E8%25BE%25BE%25E8%25BE%25BE%25E4%25B8%2593%25E9%2580%2581%2522%252C%2522deliveryCarrierNo%2522%253A%25229966%2522%252C%2522deliveryStatus%2522%253A%252210%2522%252C%2522deliveryStatusTime%2522%253A%25222018-06-28%2B16%253A40%253A19%2522%252C%2522inputTime%2522%253A%25222018-06-28%2B16%253A40%253A19%2522%252C%2522orderId%2522%253A%2522815438712001141%2522%257D&token=91633f2a-c5f5-4982-a925-a220d19095c3&app_key=1dba76d40cac446ca500c0391a0b6c9d&format=json",
-			"http://callback.test.jxc4.com:8080/djsw/pushDeliveryStatus",
+			baseURL + "djsw/pushDeliveryStatus",
 		},
 		[]string{
 			"sign=5d506d2ed7d0f353bd578df64a47c1a2b596278a&timestamp=1530176122&delivery_id=423701&status=0&appkey=3c0a05d464c247c19d7ec13accc78605&order_id=815438712001141&mt_peisong_id=1530176122092538",
-			"http://callback.test.jxc4.com:8080/mtps/status",
+			baseURL + "mtps/status",
 		},
 		[]string{
 			"sign=037e8ef50ce575c3fcc00b9507a46432c0a64768&timestamp=1530176299&delivery_id=423701&status=20&appkey=3c0a05d464c247c19d7ec13accc78605&courier_phone=13281800720&courier_name=%E6%9D%8E%E5%B7%9D&order_id=815438712001141&mt_peisong_id=1530176122092538",
-			"http://callback.test.jxc4.com:8080/mtps/status",
+			baseURL + "mtps/status",
 		},
 		[]string{
 			"timestamp=2018-06-28+16%3A58%3A20&sign=1DD702433D915DE19F4AC3DD39287E04&v=1.0&jd_param_json=%7B%22billId%22%3A%22815438712001141%22%2C%22statusId%22%3A%2233040%22%2C%22timestamp%22%3A%222018-06-28+16%3A58%3A20%22%7D&token=91633f2a-c5f5-4982-a925-a220d19095c3&app_key=1dba76d40cac446ca500c0391a0b6c9d&format=json",
-			"http://callback.test.jxc4.com:8080/mtps/status",
+			baseURL + "djsw/deliveryOrder",
 		},
 		[]string{
 			"sign=73aae156870e530541d3da1c372411e9bc589470&timestamp=1530176533&delivery_id=423701&status=30&appkey=3c0a05d464c247c19d7ec13accc78605&courier_phone=13281800720&courier_name=%E6%9D%8E%E5%B7%9D&order_id=815438712001141&mt_peisong_id=1530176122092538",
-			"http://callback.test.jxc4.com:8080/mtps/status",
+			baseURL + "mtps/status",
 		},
 		[]string{
 			"sign=ffe6c9ac09d21505106631bb92fb983599dde69d&timestamp=1530177544&delivery_id=423701&status=50&appkey=3c0a05d464c247c19d7ec13accc78605&courier_phone=13281800720&courier_name=%E6%9D%8E%E5%B7%9D&order_id=815438712001141&mt_peisong_id=1530176122092538",
-			"http://callback.test.jxc4.com:8080/mtps/status",
+			baseURL + "mtps/status",
 		},
 		[]string{
 			"timestamp=2018-06-28+17%3A19%3A25&sign=06D8763C5B569485FD250F5C283E8B76&v=1.0&jd_param_json=%7B%22billId%22%3A%22815438712001141%22%2C%22statusId%22%3A%2233060%22%2C%22timestamp%22%3A%222018-06-28+17%3A19%3A04%22%7D&token=91633f2a-c5f5-4982-a925-a220d19095c3&app_key=1dba76d40cac446ca500c0391a0b6c9d&format=json",
-			"http://callback.test.jxc4.com:8080/mtps/status",
+			baseURL + "djsw/finishOrder",
 		},
 	}
 	for _, v := range playbackData {