go/gopath/pkg/mod/cache/download/github.com/fsnotify/fsnotify/@v/list

@@ -0,0 +1 @@
+v1.4.7

go/gopath/pkg/mod/cache/download/github.com/fsnotify/fsnotify/@v/v1.4.7.info

@@ -0,0 +1 @@
+{"Version":"v1.4.7","Time":"2018-01-10T05:33:47Z"}

go/gopath/pkg/mod/cache/download/github.com/fsnotify/fsnotify/@v/v1.4.7.mod

@@ -0,0 +1 @@
+module github.com/fsnotify/fsnotify

go/gopath/pkg/mod/cache/download/github.com/golang/protobuf/@v/list

@@ -0,0 +1 @@
+v1.2.0

go/gopath/pkg/mod/cache/download/github.com/golang/protobuf/@v/v1.2.0.info

@@ -0,0 +1 @@
+{"Version":"v1.2.0","Time":"2018-08-14T21:14:27Z"}

go/gopath/pkg/mod/cache/download/github.com/golang/protobuf/@v/v1.2.0.mod

@@ -0,0 +1 @@
+module github.com/golang/protobuf

go/gopath/pkg/mod/cache/download/github.com/hpcloud/tail/@v/list

@@ -0,0 +1 @@
+v1.0.0

go/gopath/pkg/mod/cache/download/github.com/hpcloud/tail/@v/v1.0.0.info

@@ -0,0 +1 @@
+{"Version":"v1.0.0","Time":"2016-04-28T00:30:50Z"}

go/gopath/pkg/mod/cache/download/github.com/hpcloud/tail/@v/v1.0.0.mod

@@ -0,0 +1 @@
+module github.com/hpcloud/tail

go/gopath/pkg/mod/cache/download/github.com/onsi/ginkgo/@v/list

@@ -0,0 +1,2 @@
+v1.6.0
+v1.8.0

go/gopath/pkg/mod/cache/download/github.com/onsi/ginkgo/@v/v1.6.0.mod

@@ -0,0 +1 @@
+module github.com/onsi/ginkgo

go/gopath/pkg/mod/cache/download/github.com/onsi/ginkgo/@v/v1.8.0.info

@@ -0,0 +1 @@
+{"Version":"v1.8.0","Time":"2019-03-08T13:28:58Z"}

go/gopath/pkg/mod/cache/download/github.com/onsi/ginkgo/@v/v1.8.0.mod

@@ -0,0 +1 @@
+module github.com/onsi/ginkgo

go/gopath/pkg/mod/cache/download/github.com/onsi/gomega/@v/list

@@ -0,0 +1 @@
+v1.5.0

go/gopath/pkg/mod/cache/download/github.com/onsi/gomega/@v/v1.5.0.info

@@ -0,0 +1 @@
+{"Version":"v1.5.0","Time":"2019-03-12T19:43:52Z"}

go/gopath/pkg/mod/cache/download/github.com/onsi/gomega/@v/v1.5.0.mod

@@ -0,0 +1,15 @@
+module github.com/onsi/gomega
+
+require (
+	github.com/fsnotify/fsnotify v1.4.7 // indirect
+	github.com/golang/protobuf v1.2.0
+	github.com/hpcloud/tail v1.0.0 // indirect
+	github.com/onsi/ginkgo v1.6.0
+	golang.org/x/net v0.0.0-20180906233101-161cd47e91fd
+	golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f // indirect
+	golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e // indirect
+	golang.org/x/text v0.3.0 // indirect
+	gopkg.in/fsnotify.v1 v1.4.7 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v2 v2.2.1
+)

go/gopath/pkg/mod/cache/download/golang.org/x/net/@v/list

@@ -0,0 +1 @@
+v0.0.0-20180906233101-161cd47e91fd

go/gopath/pkg/mod/cache/download/golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.info

@@ -0,0 +1 @@
+{"Version":"v0.0.0-20180906233101-161cd47e91fd","Time":"2018-09-06T23:31:01Z"}

go/gopath/pkg/mod/cache/download/golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod

@@ -0,0 +1 @@
+module golang.org/x/net

go/gopath/pkg/mod/cache/download/golang.org/x/sync/@v/list

@@ -0,0 +1 @@
+v0.0.0-20180314180146-1d60e4601c6f

go/gopath/pkg/mod/cache/download/golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.info

@@ -0,0 +1 @@
+{"Version":"v0.0.0-20180314180146-1d60e4601c6f","Time":"2018-03-14T18:01:46Z"}

go/gopath/pkg/mod/cache/download/golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod

@@ -0,0 +1 @@
+module golang.org/x/sync

go/gopath/pkg/mod/cache/download/golang.org/x/sys/@v/list

@@ -0,0 +1 @@
+v0.0.0-20180909124046-d0be0721c37e

go/gopath/pkg/mod/cache/download/golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.info

@@ -0,0 +1 @@
+{"Version":"v0.0.0-20180909124046-d0be0721c37e","Time":"2018-09-09T12:40:46Z"}

go/gopath/pkg/mod/cache/download/golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod

@@ -0,0 +1 @@
+module golang.org/x/sys

go/gopath/pkg/mod/cache/download/golang.org/x/text/@v/list

@@ -0,0 +1 @@
+v0.3.0

go/gopath/pkg/mod/cache/download/golang.org/x/text/@v/v0.3.0.info

@@ -0,0 +1 @@
+{"Version":"v0.3.0","Time":"2017-12-14T13:08:43Z"}

go/gopath/pkg/mod/cache/download/golang.org/x/text/@v/v0.3.0.mod

@@ -0,0 +1 @@
+module golang.org/x/text

go/gopath/pkg/mod/cache/download/gopkg.in/check.v1/@v/list

@@ -0,0 +1 @@
+v0.0.0-20161208181325-20d25e280405

go/gopath/pkg/mod/cache/download/gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.info

@@ -0,0 +1 @@
+{"Version":"v0.0.0-20161208181325-20d25e280405","Time":"2016-12-08T18:13:25Z"}

go/gopath/pkg/mod/cache/download/gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod

@@ -0,0 +1 @@
+module gopkg.in/check.v1

go/gopath/pkg/mod/cache/download/gopkg.in/fsnotify.v1/@v/list

@@ -0,0 +1 @@
+v1.4.7

go/gopath/pkg/mod/cache/download/gopkg.in/fsnotify.v1/@v/v1.4.7.info

@@ -0,0 +1 @@
+{"Version":"v1.4.7","Time":"2018-01-10T05:33:47Z"}

go/gopath/pkg/mod/cache/download/gopkg.in/fsnotify.v1/@v/v1.4.7.mod

@@ -0,0 +1 @@
+module gopkg.in/fsnotify.v1

go/gopath/pkg/mod/cache/download/gopkg.in/tomb.v1/@v/list

@@ -0,0 +1 @@
+v1.0.0-20141024135613-dd632973f1e7

go/gopath/pkg/mod/cache/download/gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.info

@@ -0,0 +1 @@
+{"Version":"v1.0.0-20141024135613-dd632973f1e7","Time":"2014-10-24T13:56:13Z"}

go/gopath/pkg/mod/cache/download/gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod

@@ -0,0 +1 @@
+module gopkg.in/tomb.v1

go/gopath/pkg/mod/cache/download/gopkg.in/yaml.v2/@v/list

@@ -0,0 +1 @@
+v2.2.1

go/gopath/pkg/mod/cache/download/gopkg.in/yaml.v2/@v/v2.2.1.info

@@ -0,0 +1 @@
+{"Version":"v2.2.1","Time":"2018-03-28T19:50:20Z"}

go/gopath/pkg/mod/cache/download/gopkg.in/yaml.v2/@v/v2.2.1.mod

@@ -0,0 +1,5 @@
+module "gopkg.in/yaml.v2"
+
+require (
+	"gopkg.in/check.v1" v0.0.0-20161208181325-20d25e280405
+)

go/gopath/src/fohow.com/apps/controllers/cron_controller/init.go

@@ -67,6 +67,8 @@ func exec(name string) {
 	case "take_cash": //提现
 		//takeCash()
 		autoTakeCash() //redis队列处理
+	case "admin_take_cash": //提现
+		takeCash()
 	case "orderReceiveAutomatically": //已发货订单7天自动收货
 		OrderReceiveAutomatically()
 	case "updateUserNicknameAndHead": //修复数据-只执行一次

go/gopath/src/fohow.com/apps/controllers/order_controller/order_controller.go

@@ -318,7 +318,7 @@ func (self *OrderController) MultipleCreate() {
 	}
 	order.Save()
 	//购物册清理
-	ClearCart(order.WxUserId, order.OrderId)
+	//ClearCart(order.WxUserId, order.OrderId)
 
 	//发放赠品
 	helpers.SetOrderPromotionPro(order.OrderId, wxUser.Id)
@@ -521,28 +521,6 @@ func (self *OrderController) MultCentCreate() {
 	self.ServeJSON()
 }
 
-func ClearCart(wxUserId int64, orderId string) {
-	orderDetails := order_model.GetAllDetailsOrderId(orderId, false)
-	for _, item := range orderDetails {
-		cartItem := order_model.GetCartByWxUidAndPid(wxUserId, item.ProductId)
-		if cartItem != nil {
-			cartItem.Delete()
-		}
-	}
-	//清除过期的秒杀商品项
-	list := order_model.GetCartItemsByWxUserId(wxUserId)
-	for _, item := range list {
-		product := product_model.GetProductById(item.ProductId, true)
-		if product != nil {
-			if product.SeckilShowPrice > 0 && product.SeckillEnd.Unix() < time.Now().Unix() {
-				cartItem := order_model.GetCartByWxUidAndPid(wxUserId, item.ProductId)
-				cartItem.Delete()
-			}
-		}
-
-	}
-}
-
 // 获取用户订单详情
 func (self *OrderController) Detail() {
 

go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_exchange_controller.go

@@ -175,6 +175,9 @@ func (self *PayController) payExchange(oId, payWay, returnUrl, source, remark st
 	if resultStore {
 		self.ReturnError(403, []string{apps.ProductStockNotEnough[0], fmt.Sprintf("%s商品库存不足", prdName)}, "", nil)
 	}
+	//购物册清理
+	order_model.ClearCart(order.WxUserId, order.OrderId)
+
 	//订单公共信息更新
 	order.AddressId = addressId
 	order.Remark = remark

go/gopath/src/fohow.com/apps/controllers/test_controller/test_controller.go

@@ -86,12 +86,13 @@ func (self *TestController) GetUserInfoFromRedis() {
 
 // 测试微信退款功能
 func (self *TestController) TestWxPayRefund() {
-	outRefundNo := "refdasdfasdf"
-	outTradeNo := "order12344o040111"
-	totalPrice := int64(1400)
-	transactionId := "4200000742202011107173434460"
+	outRefundNo := "order12344o0401111sdfasf"
+	outTradeNo := ""
+	totalPrice := int64(164964)
+	refundPrice := int64(1)
+	transactionId := "4200002141202405047474236773"
 	remark := "订单退款"
-	payData := wx_mp.GetRefundDataPay(outTradeNo, outRefundNo, totalPrice, transactionId, remark, "")
+	payData := wx_mp.GetRefundDataPay(outTradeNo, outRefundNo, refundPrice, totalPrice, transactionId, remark, "")
 	if payData != nil {
 		if payData["return_code"] == "SUCCESS" {
 			fmt.Printf("接口已全额退款")

go/gopath/src/fohow.com/apps/controllers/tool_controller/qrcode_controller.go

@@ -3,10 +3,11 @@ package tool_controller
 import (
 	"context"
 	"fmt"
-	"github.com/chromedp/chromedp"
 	"log"
 	"time"
 
+	"github.com/chromedp/chromedp"
+
 	// "os"
 	"net/url"
 	// "strings"
@@ -82,7 +83,8 @@ func (self *ToolController) GetHaibaoWithGoogle() {
 		//chromedp.WaitReady("body", chromedp.ByQuery), // 等待页面的 <body> 元素加载完成
 		chromedp.WaitReady("#overload", chromedp.ByID),
 		//chromedp.Sleep(5*time.Second),
-		chromedp.FullScreenshot(&buf, 90), // 调整质量参数
+		// chromedp.FullScreenshot(&buf, 90), // 调整质量参数
+		chromedp.FullScreenshot(&buf, 60), // 调整质量参数
 	)
 	if err != nil {
 		fmt.Println("error occured!")

go/gopath/src/fohow.com/apps/helpers/benefit_helper.go

@@ -193,7 +193,7 @@ func Refund(o *order_model.Order, refund *order_model.OrderRefund) error {
 			outRefundNo := createOrderId("refund")
 			remark := fmt.Sprintf("%s%s", refund.OrderId, "退款")
 			payCode := sys_config.GetPayConfigByDepart(o.Depart, false)
-			payData := wx_mp.GetRefundDataPay(outTradeNo, outRefundNo, refund.RefundFee, o.TradeNo, remark, payCode)
+			payData := wx_mp.GetRefundDataPay(outTradeNo, outRefundNo, refund.RefundFee, o.PaiedPrice, o.TradeNo, remark, payCode)
 			if payData != nil {
 				if payData["return_code"] == "SUCCESS" {
 					fmt.Printf("接口已全额退款")

go/gopath/src/fohow.com/apps/models/order_model/order.go

@@ -963,3 +963,24 @@ func UpdateOrderPromotions(promotions, noInvovedAmount, orderId string) {
 	o.Raw(sql, promotions, noInvovedAmount, orderId).Exec()
 
 }
+
+func ClearCart(wxUserId int64, orderId string) {
+	orderDetails := GetAllDetailsOrderId(orderId, false)
+	for _, item := range orderDetails {
+		cartItem := GetCartByWxUidAndPid(wxUserId, item.ProductId)
+		if cartItem != nil {
+			cartItem.Delete()
+		}
+	}
+	//清除过期的秒杀商品项
+	list := GetCartItemsByWxUserId(wxUserId)
+	for _, item := range list {
+		product := product_model.GetProductById(item.ProductId, true)
+		if product != nil {
+			if product.SeckilShowPrice > 0 && product.SeckillEnd.Unix() < time.Now().Unix() {
+				cartItem := GetCartByWxUidAndPid(wxUserId, item.ProductId)
+				cartItem.Delete()
+			}
+		}
+	}
+}

go/gopath/src/fohow.com/libs/wx_mp/pay.go

@@ -307,7 +307,7 @@ func getPayPrepayId(openid, outTradeNo string, totalPrice int64, body, notifyUrl
 }
 
 // 订单退款接口
-func GetRefundDataPay(outTradeNo, outRefundNo string, totalPrice int64, transactionId, remark, payCode string) (ret map[string]string) {
+func GetRefundDataPay(outTradeNo, outRefundNo string, refundFee, totalPrice int64, transactionId, remark, payCode string) (ret map[string]string) {
 	outTradeNo = fmt.Sprintf("%s_%d", outTradeNo, time.Now().Unix())
 	appId := beego.AppConfig.String("WxFohowXcxAppId") //获取小程序渠道appId
 	mechantInfo := GetMechantInfo(payCode)             //商户号配置信息
@@ -324,7 +324,7 @@ func GetRefundDataPay(outTradeNo, outRefundNo string, totalPrice int64, transact
 		//"out_trade_no":   outTradeNo,
 		"out_refund_no": outRefundNo,
 		"total_fee":     fmt.Sprintf("%d", totalPrice), //分为单位,订单总金额
-		"refund_fee":    fmt.Sprintf("%d", totalPrice), //分为单位,退款总金额
+		"refund_fee":    fmt.Sprintf("%d", refundFee),  //分为单位,退款总金额
 		//"notify_url":       notifyUrl,
 		"refund_desc": remark,
 	}
@@ -337,6 +337,7 @@ func GetRefundDataPay(outTradeNo, outRefundNo string, totalPrice int64, transact
 		//fmt.Println(err)
 		return nil
 	}
+	beego.BeeLogger.Warn("refund result----%v", ret)
 	return ret
 }
 

go/gopath/src/fohow.com/nginx/ngx_test_config

@@ -44,6 +44,16 @@ server {
        proxy_pass http://gva-server; # 设置代理服务器的协议和地址
     }
 
+    location /xcx_api/ {
+        proxy_next_upstream off;
+        proxy_set_header    X-Real-IP           $remote_addr;
+        proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
+        proxy_set_header    Host                $host;
+        proxy_http_version  1.1;
+        proxy_set_header    Connection  "";
+        proxy_pass          http://127.0.0.1:25565/;
+    }
+
     location / {
         proxy_next_upstream off;
         proxy_set_header    X-Real-IP           $remote_addr;
@@ -89,4 +99,3 @@ server {
 
 
 
-