fix

app_test.go

@@ -1,19 +1,18 @@
 package main
 
 import (
-
-	// pad "fresh/proto/ad"
-	// pcategory "fresh/proto/category"
-	// pgoods "fresh/proto/goods"
-	// pcart "fresh/proto/cart"
-	// pregion "fresh/proto/region"
-
 	"log"
 	"testing"
 
 	"github.com/kataras/iris/httptest"
 )
 
+// pad "fresh/proto/ad"
+// pcategory "fresh/proto/category"
+// pgoods "fresh/proto/goods"
+// pcart "fresh/proto/cart"
+// pregion "fresh/proto/region"
+
 // porder "fresh/proto/order"
 
 var app = newApp()
@@ -266,11 +265,18 @@ var app = newApp()
 // 	log.Printf("[TestUpdateUserAddress] %v", data)
 // }
 
-func TestDeleteUserAddress(t *testing.T) {
+// func TestDeleteUserAddress(t *testing.T) {
+// 	e := httptest.New(t, app)
+//
+// 	body := e.DELETE("/address/8/delete").WithHeader("token", "00a1c0366b96e5c3bfff8bd1d85fa557").Expect().Status(httptest.StatusOK).Body()
+// 	log.Printf("[TestDeleteUserAddress] %v", body)
+// }
+
+func TestUserAddressSetDefault(t *testing.T) {
 	e := httptest.New(t, app)
 
-	body := e.DELETE("/address/8/delete").WithHeader("token", "00a1c0366b96e5c3bfff8bd1d85fa557").Expect().Status(httptest.StatusOK).Body()
-	log.Printf("[TestDeleteUserAddress] %v", body)
+	body := e.PATCH("/address/814/setDefault").WithHeader("token", "00a1c0366b96e5c3bfff8bd1d85fa557").Expect().Status(httptest.StatusOK).Body()
+	log.Printf("[TestSetUserAddressDefault] %v", body)
 }
 
 // func TestCreateOrder(t *testing.T) {

config/database.yml

@@ -5,11 +5,7 @@ development:
   username: root
   password: root
   database: fresh
-<<<<<<< HEAD
-  maxConns: 1000
-=======
-  maxConns: 1
->>>>>>> 263be310110abd1ea512ca4d6593e4da196a3767
+  maxConns: 10
   idleConns: 1
   encoding: utf8
 

controllers/address_controller.go

@@ -97,6 +97,26 @@ func (c *addressController) Update(ctx iris.Context) {
 	c.WriteProto(ctx, result)
 }
 
+// SetDefault 设置默认收货地址
+func (c *addressController) SetDefault(ctx iris.Context) {
+	u, err := model.LoadUserBy(ctx.GetHeader("token"))
+	if err != nil {
+		ctx.Text(err.Error())
+		return
+	}
+
+	id, _ := ctx.Params().GetInt("id")
+	ua, err := model.LoadAddress(uint32(id), u.ID)
+	if err != nil {
+		ctx.Text(err.Error())
+	}
+
+	if err := ua.SetDefault(); err != nil {
+		ctx.Text(err.Error())
+	}
+	ctx.WriteString("0")
+}
+
 func (c *addressController) createOrUpdate(ctx iris.Context) (*model.UserAddress, error) {
 	params := &paddress.CreateParam{}
 	if err := c.ReadProto(ctx, params); err != nil {

model/user_address.go

@@ -78,6 +78,17 @@ func LoadDefaultAddress(userID uint32) (*UserAddress, error) {
 	return ua, nil
 }
 
+// LoadAddress 最普通获取地址方式
+func LoadAddress(id, userID uint32) (*UserAddress, error) {
+	query := "SELECT * FROM tp_user_address WHERE address_id = ? AND user_id = ?"
+	ua := &UserAddress{}
+	err := DataSource.Session.QueryRow(query, id, userID).Scan(ua.Values()...)
+	if err != nil {
+		return nil, fmt.Errorf("[LoadAddress] %v", err)
+	}
+	return ua, nil
+}
+
 // Create 创建
 func (u *UserAddress) Create(userID uint32) error {
 	u.UserID = userID
@@ -114,6 +125,22 @@ func (u *UserAddress) Delete() error {
 	return err
 }
 
+// SetDefault 设置默认地址
+func (u *UserAddress) SetDefault() error {
+	return DataSource.TxExec(func(tx *sql.Tx) error {
+		update := `UPDATE tp_user_address SET is_default = 0 WHERE user_id = ? AND is_default = 1`
+		_, err := tx.Exec(update, u.UserID)
+		if err == nil {
+			update = `UPDATE tp_user_address SET is_default = 1 WHERE address_id = ?`
+			_, err = tx.Exec(update, u.ID)
+		}
+		if err != nil {
+			err = fmt.Errorf("[UserAddress.SetDefault] %v", err)
+		}
+		return err
+	})
+}
+
 func (u *UserAddress) Fields() []interface{} {
 	return []interface{}{
 		&u.ID,

model/user_test.go

@@ -19,6 +19,7 @@ package model
 // 	log.Printf("%v \n %s", u, token)
 // 	userID = u.ID
 // }
+
 //
 // func TestLoadUserAddress(t *testing.T) {
 // 	uas, err := LoadUserAddress(userID)
@@ -28,3 +29,9 @@ package model
 // 		log.Printf("%v", ua)
 // 	}
 // }
+
+// func TestSetDefaultAddress(t *testing.T) {
+// 	a, err := LoadAddress(831, userID)
+// 	checkErr(err)
+// 	checkErr(a.SetDefault())
+// }

router/route.go

@@ -26,6 +26,7 @@ func (r *Route) Init(app *iris.Application) {
 	address.Post("/create", ctr.AddressController.Create)
 	address.Put("/{id:int}/update", ctr.AddressController.Update)
 	address.Delete("/{id:int}/delete", ctr.AddressController.Delete)
+	address.Patch("/{id:int}/setDefault", ctr.AddressController.SetDefault)
 
 	goods := app.Party("/goods")
 	goods.Get("/new", ctr.GoodsController.NewGoods)

web/pages/goods-details/index.js

@@ -254,14 +254,12 @@ Page({
 
   addToCart: function(cb){
     var self = this;
-    if (this.data.specs && !this.data.canSubmit) {
-      if (!this.data.canSubmit){
-        wx.showModal({
-          title: '提示',
-          content: '请选择商品规格！',
-          showCancel: false
-        })
-      }
+    if (this.data.specs.length > 0 && !this.data.canSubmit) {
+      wx.showModal({
+        title: '提示',
+        content: '请选择商品规格！',
+        showCancel: false
+      })
       this.bindGuiGeTap();
       return;
     }
@@ -327,6 +325,10 @@ Page({
       }
     });
 
+    if (cart.length == 0) {
+      cart.push({id: self.data.id, num: self.data.buyNumber});
+    }
+
     return cart;
   },
 

web/pages/order-list/index.js

@@ -22,7 +22,7 @@ Page({
     var orderId = e.currentTarget.dataset.id;
     console.log(orderId);
     wx.navigateTo({
-      url: "/pages/order-details/index?id=" + orderID
+      url: "/pages/order-details/index?id=" + orderId
     })
   },
 

web/pages/select-address/index.js

@@ -12,12 +12,9 @@ Page({
   selectTap: function (e) {
     var id = e.currentTarget.dataset.id;
     wx.request({
-      url: 'https://api.it120.cc/'+ app.globalData.subDomain +'/user/shipping-address/update',
-      data: {
-        token:app.globalData.token,
-        id:id,
-        isDefault:'true'
-      },
+      url: app.globalData.domain + '/address/' + id +'/setDefault',
+      method: "PATCH",
+      header: {token: app.globalData.token},
       success: (res) =>{
         wx.navigateBack({})
       }