Merge branch 'cygx/mfyx_2.0' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/order.go

@@ -161,10 +161,10 @@ func (this *OrderController) OrderList() {
 		item.InviteName = inviteNameMap[v.Mobile]
 		item.PaymentProject = v.GoodsName
 
-		//if v.OrderStatus == 2 {
-		item.PayTime = v.PayTime.Format(utils.FormatDateTime)
-		//}
-		if orderType == 1 {
+		if v.OrderStatus != 0 && v.OrderStatus != 1 {
+			item.PayTime = v.PayTime.Format(utils.FormatDateTime)
+		}
+		if orderType == 1 && v.OrderStatus != 0 && v.OrderStatus != 1 {
 			if v.GoodsId == 1 {
 				item.StartDate = v.StartDate.Format(utils.FormatDateTime)
 				item.EndDate = v.EndDate.Format(utils.FormatDateTime)