Merge branch '2.1.0' of http://git.ycjcjy.com/SpaceOfCheng/services into 2.1.0

service/goods/orders.go

@@ -209,6 +209,10 @@ func (s *GoodsServ) ConfirmOrder(ordersID string) error {
 		return utils.LogError("获取订单失败", err)
 	}
 
+	if orders.Status != models.STATUS_READY {
+		return errors.New("没有订单信息")
+	}
+
 	// 如果是内部人员
 	if orders.PayType == models.CONSUME_INNER {
 		// 查找禁用名单

tests/goodsorder_test.go

@@ -40,34 +40,31 @@ func TestPreGoodsOrder(t *testing.T) {
 			// 业务返回判断
 			So(result.Code, ShouldEqual, http.StatusOK)
 			So(result.Result, ShouldNotBeEmpty)
-		})
-	})
-}
 
-func TestConfirmOrders(t *testing.T) {
-	orderID := "cc84338e-488e-463b-a33e-7dc7f2cd10b6"
+			orderID := result.Result.(map[string]interface{})["OrdersId"].(string)
 
-	Convey("下单确认", t, func() {
-		result := &controllers.JSONMessage{}
-		api := "/api/wechat/MQ/order/goods/" + orderID
+			Convey("下单确认", func() {
+				result := &controllers.JSONMessage{}
+				api := "/api/wechat/MQ/order/goods/" + orderID
 
-		token := &utils.JWTToken{
-			Guest:   false,
-			ID:      "oMOpz0kgTrasoAA3G70R7phomn1g", // openid
-			Expire:  time.Now().Local().Add(24 * 30 * time.Hour),
-			BatchNo: "",
-		}
+				token := &utils.JWTToken{
+					Guest:   false,
+					ID:      "oMOpz0kgTrasoAA3G70R7phomn1g", // openid
+					Expire:  time.Now().Local().Add(24 * 30 * time.Hour),
+					BatchNo: "",
+				}
 
-		code, _, err := NewRequestMock().
-			AddToken(token.ToMap()).
-			AddWechatUA().
-			Request(http.MethodPut, api, nil, result)
+				code, _, err := NewRequestMock().
+					AddToken(token.ToMap()).
+					AddWechatUA().
+					Request(http.MethodPut, api, nil, result)
 
-		So(code, ShouldEqual, http.StatusOK)
-		So(err, ShouldBeNil)
+				So(code, ShouldEqual, http.StatusOK)
+				So(err, ShouldBeNil)
 
-		// 业务返回判断
-		So(result.Code, ShouldEqual, http.StatusOK)
+				// 业务返回判断
+				So(result.Code, ShouldEqual, http.StatusOK)
+			})
+		})
 	})
-
 }