Merge branch '2.1.0' of http://git.ycjcjy.com/SpaceOfCheng/services into 2.1.0

conf/db.conf

@@ -5,9 +5,8 @@ db_type      = mysql
 con_protocol = tcp
 
 ; 数据库地址，可以使用IP
-# db_addr      = 47.101.36.130
-db_addr = 192.168.0.122
-# db_addr      = localhost
+; db_addr      = 47.101.36.130
+db_addr        = 192.168.0.122
 # db_addr      = rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com
 
 ; 端口

conf/log.conf

@@ -1,4 +1,4 @@
 [common]
-filename="E:\\GoProject\\src\\spaceofcheng\\services\\log\\common.log"
+filename="E:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
 # log level "emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"
 level="debug"

controllers/customerremark/customerremark.go

@@ -55,6 +55,15 @@ func (c *CustomerRemarkController) AddRemark() {
 	c.ResponseJSON(newRemark)
 }
 
+func (c *CustomerRemarkController) IsExist() {
+	recommendCode := c.GetString(":recommendCode")
+	num, err := c.dao.IsExist(recommendCode)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(num)
+}
+
 func (c *CustomerRemarkController) SearchCustomer() {
 	salesId := c.GetString(":salesId")
 	customerInfo := c.GetString(":customerInfo")

controllers/flashbuy/flashbuy.go

@@ -136,3 +136,11 @@ func (c *FlashBuyController) FlashBuy() {
 	}
 	c.ResponseJSON("恭喜您！抢购成功！")
 }
+
+func (c *FlashBuyController) GetFlashModelList() {
+	model, err := c.dao.GetFlashModelList()
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(model)
+}

models/customer/customer.go

@@ -282,7 +282,7 @@ func (m *CustomerDAO) GetSalesByRecommendCode(recommendCode string) (*model.SysU
 
 func (m *CustomerDAO) GetSalesCaseById(userId string) (*model.SysUserCase, error) {
 	userCase := new(model.SysUserCase)
-	if _, err := m.db.Where("user_id = ?", userId).Get(&userCase); err != nil {
+	if _, err := m.db.Where("user_id = ?", userId).Get(userCase); err != nil {
 		return nil, err
 	}
 	return userCase, nil

models/customer/vip.go

@@ -3,14 +3,19 @@ package customer
 import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
+	"time"
 )
 
 // GetValidVIPCards 依据客户ID 获取 VIP 卡
 // 按照过期时间升序, 即 将到期的在最上面
 // VIP 卡可以跨案场使用
 func (m *CustomerDAO) GetValidVIPCards(custID string) (vips []model.TaCustomerVip, err error) {
+	now := time.Now().Local().Format("2006-01-02 15:04:05")
+
 	err = m.db.Where("customer_id=?", custID).
 		And("status=?", models.STATUS_NORMAL).
+		And(`DATE_FORMAT(begin_date, "%Y-%m-%d %T")<=?`, now).
+		And(`DATE_FORMAT(end_date, "%Y-%m-%d %T")>=?`, now).
 		And("balance>0").
 		Asc("end_date").
 		Find(&vips)

models/customerremark/customerremark.go

@@ -128,3 +128,11 @@ FROM
 	return len(customerReceive), err
 
 }
+
+func (m *CustomerRemarkDAO) IsExist(recommendCode string) (int, error) {
+	var user []model.SysUser
+	sql := `select * from sys_user where recommend_code = '` + recommendCode + `' 
+	and status > ` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&user)
+	return len(user), err
+}

models/flashbuy/flashbuy.go

@@ -275,3 +275,10 @@ func (m *FlashbuyDAO) SaveCustomerFlashBuy(cstFlashBuy model.TaCustomerFlashBuy)
 	_, err := m.db.Insert(cstFlashBuy)
 	return &cstFlashBuy, err
 }
+
+func (m *FlashbuyDAO) GetFlashModelList() ([]model.TdFlashbuyModel, error) {
+	var model []model.TdFlashbuyModel
+	sql := `select * from td_flashbuy_model`
+	err := m.db.Sql(sql).Find(&model)
+	return model, err
+}

models/goods/types.go

@@ -50,6 +50,6 @@ type OrdersWithGoods struct {
 // OrdersDetail 订单详情
 type OrdersDetail struct {
 	model.TaGoodsOrders `xorm:"extends"`
-	Goods               []DetailWithType
-	Coupons             []model.TaGoodsOrdersCoupon
+	Goods               []DetailWithType            `xorm:"-"`
+	Coupons             []model.TaGoodsOrdersCoupon `xorm:"-"`
 }

models/vipcard/vipcard.go

@@ -214,6 +214,7 @@ func (m *VipcardDAO) InsertCustomerVipChange(change model.TaCustomerVipChange) e
 	change.ChangeId = utils.GetGUID()
 	change.Status = models.STATUS_NORMAL
 	change.CreateDate = time.Now()
+
 	_, err := m.db.Insert(change)
 	return err
 }

routers/common.go

@@ -333,5 +333,6 @@ func getCommonRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/flashbuy/:flashBuyId/:flashBuyStatus", &flashbuy.FlashBuyController{}, "put:UpdateFlashBuy"),
 		beego.NSRouter("/flashbuy/:qrcode", &flashbuy.FlashBuyController{}, "get:VerifyCustomerFlashBuyList"),
 		beego.NSRouter("/flashbuy/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "put:Verify"),
+		beego.NSRouter("/flashbuy/model", &flashbuy.FlashBuyController{}, "get:GetFlashModelList"),
 	)
 }

routers/guest.go

@@ -6,6 +6,7 @@ import (
 	"spaceofcheng/services/controllers/cases"
 	"spaceofcheng/services/controllers/course"
 	"spaceofcheng/services/controllers/customer"
+	"spaceofcheng/services/controllers/customerremark"
 	"spaceofcheng/services/controllers/goods"
 	"spaceofcheng/services/controllers/message"
 	"spaceofcheng/services/controllers/user"
@@ -66,5 +67,7 @@ func getGuestRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/case/checkin", &cases.SigninController{}, "post:AddSignin"),
 		beego.NSRouter("/wechat", &controllers.WechatController{}, "get,post:WechatInfo"),
 		// beego.NSRouter("/wechat", &controllers.WechatController{}, "post:WxReceive"),
+
+		beego.NSRouter("/customerremark/:recommendCode", &customerremark.CustomerRemarkController{}, "get:IsExist"),
 	)
 }

routers/wechat.go

@@ -95,15 +95,15 @@ func getWechatRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/user/luckdraw/record/:id", &luckdraw.LuckDrawController{}, "get:GetRecordByID"),
 
 		// 抢购
-		beego.NSRouter("/flashbuy/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetFlashBuyById"),
-		beego.NSRouter("/flashbuy/:customerId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyByCustomerId"),
-		beego.NSRouter("/flashbuy/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyId"),
+		beego.NSRouter("/flashbuy/flash/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetFlashBuyById"),
+		beego.NSRouter("/flashbuy/customer/:customerId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyByCustomerId"),
+		beego.NSRouter("/flashbuy/customerFlash/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyId"),
 		beego.NSRouter("/flashbuy/:id", &flashbuy.FlashBuyController{}, "post:FlashBuy"),
 
 		// 客户备注
 		beego.NSRouter("/customerremark/record/:salesId/:customerId", &customerremark.CustomerRemarkController{}, "get:GetCustomerReceiveRecord"),
 		beego.NSRouter("/customerremark/:salesId/:customerId", &customerremark.CustomerRemarkController{}, "get:GetCustomerRemarkList"),
-		beego.NSRouter("/customerremark/:salesId/:customerInfo", &customerremark.CustomerRemarkController{}, "get:SearchCustomer"),
+		beego.NSRouter("/customerremark/search/:salesId/:customerInfo", &customerremark.CustomerRemarkController{}, "get:SearchCustomer"),
 		beego.NSRouter("/customerremark", &customerremark.CustomerRemarkController{}, "post:AddRemark"),
 	)
 }

service/customerremark/customerremark.go

@@ -80,3 +80,11 @@ func (s *CustomerRemarkServ) SearchCustomer(customerInfo, salesId string) (*mode
 	}
 	return &customer, nil
 }
+func (s *CustomerRemarkServ) IsExist(recommendCode string) (int, error) {
+	num, err := s.dao.IsExist(recommendCode)
+	if err != nil {
+		utils.LogError("获取推荐人失败: " + err.Error())
+		return 0, errors.New("获取推荐人失败")
+	}
+	return num, nil
+}

service/events/giveCard.go

@@ -56,7 +56,7 @@ var giveCard = func(e tinyevent.Event) error {
 		case ActGiveCoupon:
 			res := make(map[string]interface{})
 			if err := json.Unmarshal([]byte(act.ResourceDesc), &res); err != nil {
-				utils.LogError("解析优惠券赠送规则失败: " + err.Error())
+				utils.LogError("解析体验卡赠送规则失败: " + err.Error())
 				continue
 			}
 

service/flashbuy/flashbuy.go

@@ -251,3 +251,12 @@ func (s *FlashBuyServ) FlashBuy(id string) error {
 
 	return nil
 }
+
+func (s *FlashBuyServ) GetFlashModelList() ([]model.TdFlashbuyModel, error) {
+	model, err := s.dao.GetFlashModelList()
+	if err != nil {
+		utils.LogError("获取抢购活动模板失败: " + err.Error())
+		return nil, errors.New("获取抢购活动模板失败")
+	}
+	return model, nil
+}

service/goods/goods.go

@@ -34,6 +34,7 @@ func NewGoodsServ(ctx *utils.Context) *GoodsServ {
 		custDAO:   customer.NewCustomerDAO(ctx),
 		userDAO:   system.NewUserDAO(ctx),
 		couponDAO: coupon.NewCouponDAO(ctx),
+		vipDAO:    vipcard.NewVipcardDAO(ctx),
 	}
 }
 

service/goods/orders.go

@@ -70,6 +70,7 @@ func (s *GoodsServ) PreOrders(
 		if err != nil {
 			return nil, utils.LogError("查询用户VIP卡信息出错", err.Error())
 		}
+
 		if vips != nil && len(vips) > 0 {
 			for _, vip := range vips {
 				vipMoney, _ := strconv.ParseFloat(vip.Balance, 64)

tests/cases_test.go

@@ -12,7 +12,6 @@ import (
 func TestGetCmsCaseList(t *testing.T) {
 
 	Convey("获取案场列表", t, func() {
-
 		Convey("正常业务", func() {
 			params := url.Values{}
 			params.Add("orgid", "1")
@@ -26,13 +25,8 @@ func TestGetCmsCaseList(t *testing.T) {
 			So(err, ShouldBeNil)
 
 			// 业务返回判断
-			Convey("结果码 200", func() {
-				So(result.Code, ShouldEqual, http.StatusOK)
-			})
-
-			Convey("结果不为空", func() {
-				So(result.Result, ShouldNotBeEmpty)
-			})
+			So(result.Code, ShouldEqual, http.StatusOK)
+			So(result.Result, ShouldNotBeEmpty)
 		})
 
 		Convey("机构不传报错", func() {
@@ -45,9 +39,7 @@ func TestGetCmsCaseList(t *testing.T) {
 			So(err, ShouldBeNil)
 
 			// 业务返回判断
-			Convey("结果码 不是200", func() {
-				So(result.Code, ShouldNotEqual, http.StatusOK)
-			})
+			So(result.Code, ShouldNotEqual, http.StatusOK)
 		})
 
 	})

tests/goodsorder_test.go

@@ -1,24 +1,73 @@
 package tests
 
 import (
+	"net/http"
 	"net/url"
+	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/utils"
 	"testing"
+	"time"
 
 	. "github.com/smartystreets/goconvey/convey"
 )
 
-func TestGetCmsCaseList(t *testing.T) {
+func TestPreGoodsOrder(t *testing.T) {
 	Convey("商品下单", t, func() {
+
 		Convey("正常下单", func() {
 			params := url.Values{}
 			params.Add("info", `{"CaseId":"1","AreaId":"12","AreaName":"吧台","TableId":"28","TableNo":"城咖啡水吧台","Amount":"23","OrdersNum":1,"Remark":"","OrgId":"1","UserName":"奥利奥","PayType":"coupon"}`)
 			params.Add("detail", `[{"GoodsId":"61","GoodsName":"美式","SpecId":"40","SpecName":"去冰","Number":1,"Price":"23"}]`)
 
-			token, _ := utils.CreateToken(map[string]interface{}{})
+			result := &controllers.JSONMessage{}
+			api := "/api/wechat/MQ/order/goods"
+
+			token := &utils.JWTToken{
+				Guest:   false,
+				ID:      "oMOpz0kgTrasoAA3G70R7phomn1g", // openid
+				Expire:  time.Now().Local().Add(24 * 30 * time.Hour),
+				BatchNo: "",
+			}
+
+			code, _, err := NewRequestMock().
+				AddToken(token.ToMap()).
+				AddWechatUA().
+				Request(http.MethodPost, api, params, result)
 
-			wechatUA := "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12A365 MicroMessenger/5.4.1 NetType/WIFI"
+			So(code, ShouldEqual, http.StatusOK)
+			So(err, ShouldBeNil)
 
+			// 业务返回判断
+			So(result.Code, ShouldEqual, http.StatusOK)
+			So(result.Result, ShouldNotBeEmpty)
 		})
 	})
 }
+
+func TestConfirmOrders(t *testing.T) {
+	orderID := "cc84338e-488e-463b-a33e-7dc7f2cd10b6"
+
+	Convey("下单确认", t, func() {
+		result := &controllers.JSONMessage{}
+		api := "/api/wechat/MQ/order/goods/" + orderID
+
+		token := &utils.JWTToken{
+			Guest:   false,
+			ID:      "oMOpz0kgTrasoAA3G70R7phomn1g", // openid
+			Expire:  time.Now().Local().Add(24 * 30 * time.Hour),
+			BatchNo: "",
+		}
+
+		code, _, err := NewRequestMock().
+			AddToken(token.ToMap()).
+			AddWechatUA().
+			Request(http.MethodPut, api, nil, result)
+
+		So(code, ShouldEqual, http.StatusOK)
+		So(err, ShouldBeNil)
+
+		// 业务返回判断
+		So(result.Code, ShouldEqual, http.StatusOK)
+	})
+
+}

tests/tests.go

@@ -11,8 +11,6 @@ import (
 	"spaceofcheng/services/utils"
 	"testing"
 
-	_ "spaceofcheng/services/routers"
-
 	"github.com/astaxie/beego"
 	. "github.com/smartystreets/goconvey/convey"
 )

tests/utils.go

@@ -131,7 +131,7 @@ func (t *RequestMock) Request(meth, addr string, params interface{}, result inte
 	code = w.Code
 	body, _ = ioutil.ReadAll(w.Result().Body)
 
-	beego.Trace("testing", meth+" - "+addr, body)
+	beego.Trace("testing", meth+" - "+addr)
 
 	if result != nil {
 		err = json.Unmarshal(body, result)

utils/utils.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"time"
@@ -159,8 +160,35 @@ func GetFiveSeconds(t time.Time) string {
 	return str[:strLen-1] + strconv.Itoa(lastNum)
 }
 
+// 当前运行环境
+var processEnv string
+var appRoot string
+
 // GetAppRoot 获取系统根目录
 func GetAppRoot() string {
-	appRoot, _ := filepath.Abs(filepath.Dir(os.Args[0]))
+	if appRoot != "" {
+		return appRoot
+	}
+
+	if processEnv == "" {
+		for _, arg := range os.Args {
+			if strings.Index(arg, "-test.run") > -1 {
+				processEnv = "test"
+				break
+			}
+		}
+
+		if processEnv == "" {
+			processEnv = "production"
+		}
+	}
+
+	if processEnv == "test" {
+		_, file, _, _ := runtime.Caller(1)
+		appRoot, _ = filepath.Abs(filepath.Dir(filepath.Join(file, ".."+string(filepath.Separator))))
+	} else {
+		appRoot, _ = filepath.Abs(filepath.Dir(os.Args[0]))
+	}
+
 	return appRoot
 }