Merge branch 'mfyx_2.0' of http://8.136.199.33:3000/cxzhang/hongze_mfyx into debug

models/order/order_user_card.go

@@ -63,7 +63,21 @@ func AddCygxOrderUserCard(item *CygxOrderUserCard, itemOrder *CygxOrder) (err er
 
 	itemOrderAction := new(CygxOrderAction)
 
-	itemOrderAction.Action = "微信小程序已支付"
+	switch itemOrder.TradeType {
+	case "JSAPI":
+		itemOrderAction.Action = "公众号支付"
+	case "NATIVE":
+		itemOrderAction.Action = "扫码支付"
+	case "App":
+		itemOrderAction.Action = "App支付"
+	case "MICROPAY":
+		itemOrderAction.Action = "付款码支付"
+	case "MWEB":
+		itemOrderAction.Action = "H5支付"
+	case "FACEPAY":
+		itemOrderAction.Action = "刷脸支付"
+	}
+
 	itemOrderAction.OrderStatus = 2
 	itemOrderAction.OrderStatusText = "已支付"
 	itemOrderAction.OrderCode = item.OrderCode
@@ -95,6 +109,7 @@ func AddCygxOrderUserCard(item *CygxOrderUserCard, itemOrder *CygxOrder) (err er
 		qs = qs.Filter(expr, exprV)
 	}
 	_, err = qs.Update(updateParams) // 修改订单状态
+	fmt.Println("err", err)
 	if err != nil {
 		return
 	}

models/order/order_virtual_asset.go

@@ -41,8 +41,21 @@ func AddCygxOrderVirtualAsset(item *CygxOrderVirtualAsset, itemOrder *CygxOrder)
 	}()
 
 	itemOrderAction := new(CygxOrderAction)
+	switch itemOrder.TradeType {
+	case "JSAPI":
+		itemOrderAction.Action = "公众号支付"
+	case "NATIVE":
+		itemOrderAction.Action = "扫码支付"
+	case "App":
+		itemOrderAction.Action = "App支付"
+	case "MICROPAY":
+		itemOrderAction.Action = "付款码支付"
+	case "MWEB":
+		itemOrderAction.Action = "H5支付"
+	case "FACEPAY":
+		itemOrderAction.Action = "刷脸支付"
+	}
 
-	itemOrderAction.Action = "微信小程序已支付"
 	itemOrderAction.OrderStatus = 2
 	itemOrderAction.OrderStatusText = "已支付"
 	itemOrderAction.OrderCode = item.OrderCode
@@ -64,6 +77,7 @@ func AddCygxOrderVirtualAsset(item *CygxOrderVirtualAsset, itemOrder *CygxOrder)
 	updateParams["OutTradeCode"] = itemOrder.OutTradeCode
 	updateParams["ModifyTime"] = item.ModifyTime
 	updateParams["PaymentType"] = 1
+	updateParams["TradeType"] = itemOrder.TradeType
 	ptrStructOrTableName := "cygx_order"
 	whereParam := map[string]interface{}{"order_code": itemOrder.OrderCode}
 	qs := o.QueryTable(ptrStructOrTableName)

services/order.go

@@ -150,6 +150,11 @@ func HandleOrderHandle(itemCallback *WechatPayCallback) {
 		return
 	}
 
+	//修改过状态的不再二次处理
+	if orderDetail.OrderStatus == 2 {
+		return
+	}
+
 	go AddCygxOrderPayment(itemCallback) // 记录支付交易信息
 
 	if itemCallback.TradeState != "SUCCESS" { // 回调显示支付不成功，模版消息推送
@@ -158,10 +163,6 @@ func HandleOrderHandle(itemCallback *WechatPayCallback) {
 			return
 		}
 	}
-	//修改过状态的不再二次处理
-	if orderDetail.OrderStatus == 2 {
-		return
-	}
 
 	itemOrder := new(order.CygxOrder)
 	itemOrder.OrderCode = itemCallback.OutTradeNo