diff --git a/controller/mall.go b/controller/mall.go index d832ce8..0924de7 100644 --- a/controller/mall.go +++ b/controller/mall.go @@ -480,8 +480,8 @@ func MallOrderCreate(c *gin.Context) { } RespOK(c, ret) - } else { // 其他则默认明慧账户收费 - webPay, err := wxpay.WebPay(order.SerialNo, order.Rm, user.WxOpenID, "N", wxpay.WxPayBuyGoods, configInfo.NotifyUrl, false) + } else { // 其他则默认明慧河马付账户收费 + webPay, err := wxpay.HmJsPayUnifiedOrderForBuyGoods(order.SerialNo, order.Rm, user.WxOpenID, configInfo.NotifyUrl) if err != nil { logger.Error(errors.New("WebPay err")) RespJson(c, status.InternalServerError, nil) @@ -495,21 +495,6 @@ func MallOrderCreate(c *gin.Context) { } RespOK(c, ret) - - //webPay, err := wxpay.HmJsPayUnifiedOrderForBuyGoods(order.SerialNo, order.Rm, user.WxOpenID, configInfo.NotifyUrl) - //if err != nil { - // logger.Error(errors.New("WebPay err")) - // RespJson(c, status.InternalServerError, nil) - // return - //} - // - //ret := map[string]interface{}{ - // "web_pay": webPay, - // "order_id": order.ID, - // "order": order, - //} - // - //RespOK(c, ret) } return