Merge branch 'mfyx_3.6' of http://8.136.199.33:3000/cxzhang/hongze_mfyx into debug

services/order.go

@@ -220,7 +220,7 @@ func HandleOrderByWechatPay(itemCallback *WechatPayCallback) {
 			err = errors.New("AddCygxOrderUserCard, Err: " + e.Error())
 			return
 		}
-	} else if orderDetail.OrderType == 2 {
+	} else if orderDetail.OrderType == 2 || orderDetail.OrderType == 3 {
 		//如果是活动，把单场付费信息的活动写入 用户虚拟资产表
 		itemOrderVirtualAsset := new(order.CygxOrderVirtualAsset)
 		itemOrderVirtualAsset.OrderCode = orderDetail.OrderCode
@@ -332,7 +332,7 @@ func HandleOrderRefundByWechatPay(itemCallback *WechatPayCallback) {
 			err = errors.New("RemoveCygxOrderUserCard, Err: " + e.Error())
 			return
 		}
-	} else if orderDetail.OrderType == 2 {
+	} else if orderDetail.OrderType == 2 || orderDetail.OrderType == 3 {
 		//如果是活动，把单场付费信息的活动写入 用户虚拟资产表
 		itemOrderVirtualAsset := new(order.CygxOrderVirtualAsset)
 		itemOrderVirtualAsset.OrderCode = orderDetail.OrderCode