bug fix

controllers/goods/order.go

@@ -146,12 +146,15 @@ func (c *GoodsController) PostOrder() {
 func (c *GoodsController) ConfirmOrders() {
 	ordersID := c.GetString(":ordersid")
 
+	// 备注
+	remark := c.GetString("remark")
+
 	// 订单优惠券
 	customercouponid := c.GetString("customercouponid")
 	if customercouponid == "undefined" {
 		customercouponid = ""
 	}
-	if err := c.serv.ConfirmOrder(ordersID, customercouponid); err != nil {
+	if err := c.serv.ConfirmOrder(ordersID, customercouponid, remark); err != nil {
 		c.ResponseError(err)
 	}
 

models/course/order.go

@@ -68,6 +68,14 @@ func (m *CourseDAO) SaveOrdersCoupon(coupon *model.TaCourseOrdersCoupon, order *
 
 // UpdateOrderPay 更新订单为已支付
 func (m *CourseDAO) UpdateOrderPay(info *model.TaCourseOrders) error {
+	if info.ActualAmount == "" {
+		info.ActualAmount = "0.0"
+	}
+
+	if info.CouponAmount == "" {
+		info.CouponAmount = "0.0"
+	}
+
 	info.IsPay = models.BOOL_TRUE
 	info.Status = models.STATUS_NORMAL
 	var cols = []string{

service/course/order.go

@@ -40,6 +40,7 @@ func (s *CourseServ) PreOrders(
 	couseOrder.OrdersId = guid.NewGUIDString()
 	couseOrder.Price = course.Price // 课程价格, 即为订单价格
 	couseOrder.ActualAmount = course.Price
+	couseOrder.CouponAmount = "0.0"
 	couseOrder.CourseName = course.CourseName
 	couseOrder.CourseNum = course.CourseNum
 	couseOrder.OrgId = org.OrgId
@@ -72,7 +73,7 @@ func (s *CourseServ) ConfirmOrders(ordersID, customercouponid string) error {
 		return errors.New("没有订单信息")
 	}
 
-	if couseOrder.IsPay != models.BOOL_TRUE {
+	if couseOrder.IsPay == models.BOOL_TRUE {
 		return errors.New("订单已付款，请勿重复付款！")
 	}
 
@@ -402,18 +403,6 @@ func (s *CourseServ) SaveOrder(order *model.TaCourseOrders, course *course.Cours
 		return errors.New("下单失败, 请重试")
 	}
 
-	// 默认城币购买
-	// courseObtaimType := models.COURSE_GETBY_COINCHG
-	// if coupons != nil && len(coupons) > 0 {
-	// 	for _, c := range coupons {
-	// 		if c.CouponType == models.COURSE_COUPON_CARD {
-	// 			courseObtaimType = models.COURSE_GETBY_CARD
-	// 		} else if c.CouponType == models.COURSE_COUPON_COUPON {
-	// 			courseObtaimType = models.COURSE_GETBY_COUPON
-	// 		}
-	// 	}
-	// }
-
 	// 我的课程信息
 	custCourse := model.TaCustomerCourse{
 		CourseId:         order.CourseId,

service/goods/orders.go

@@ -76,9 +76,7 @@ func (s *GoodsServ) PreOrders(
 }
 
 // ConfirmOrder 订单确认
-func (s *GoodsServ) ConfirmOrder(
-	ordersID, customercouponid string,
-) error {
+func (s *GoodsServ) ConfirmOrder(ordersID, customercouponid, remark string) error {
 	info, err := s.dao.GetOrdersByID(ordersID)
 	if err != nil {
 		return utils.LogError("获取订单失败", err)
@@ -92,6 +90,10 @@ func (s *GoodsServ) ConfirmOrder(
 		return errors.New("订单已付款，请勿重复付款！")
 	}
 
+	if info.Remark == "" {
+		info.Remark = remark
+	}
+
 	if info.PayType == "sales" {
 		// 内部人员, 可以直接购买
 		// TODO
@@ -256,6 +258,15 @@ func (s *GoodsServ) ConfirmOrder(
 	orders := info.TaGoodsOrders
 	orders.IsPay = models.BOOL_TRUE
 	orders.Status = models.STATUS_NORMAL
+
+	if orders.ActualAmount == "" {
+		orders.ActualAmount = "0.0"
+	}
+
+	if orders.CouponAmount == "" {
+		orders.CouponAmount = "0.0"
+	}
+
 	if err := s.dao.UpdateOrders(&orders, []string{
 		"status", "is_pay", "coupon_amount", "actual_amount",
 	}); err != nil {

tests/courseorder_test.go

@@ -0,0 +1,74 @@
+package tests
+
+import (
+	"net/http"
+	"net/url"
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/utils"
+	"testing"
+	"time"
+
+	"github.com/astaxie/beego"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestPreCourseOrder(t *testing.T) {
+	Convey("课程下单", t, func() {
+
+		Convey("正常下单", func() {
+			params := url.Values{}
+			params.Add("info", `{"CourseId":"ecc55f91-52b4-4e9b-89a8-b9b3362730f9","CaseId":"10","Price":"2.00"}`)
+			result := &controllers.JSONMessage{}
+			api := "/api/wechat/MQ/order/course"
+
+			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)
+
+			beego.Trace(result)
+
+			So(code, ShouldEqual, http.StatusOK)
+			So(err, ShouldBeNil)
+
+			// 业务返回判断
+			So(result.Code, ShouldEqual, http.StatusOK)
+			So(result.Result, ShouldNotBeEmpty)
+
+			orderID := result.Result.(map[string]interface{})["OrdersId"].(string)
+
+			Convey("下单确认", func() {
+				result := &controllers.JSONMessage{}
+				api := "/api/wechat/MQ/order/course/" + 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)
+
+				beego.Trace(result)
+
+				So(code, ShouldEqual, http.StatusOK)
+				So(err, ShouldBeNil)
+
+				// 业务返回判断
+				So(result.Code, ShouldEqual, http.StatusOK)
+			})
+		})
+	})
+}