0914PM

conf/log.conf

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

controllers/card/card.go

@@ -169,5 +169,16 @@ func (c *CardController) GiveCard() {
 
 // GetCardWithCustomer 获取卡及领取信息
 func (c *CardController) GetCardWithCustomer() {
+	cardid := c.GetString(":id")
+	cardDetail, err := c.serv.GetCardWithCustomer(cardid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(cardDetail)
+}
 
+// GetCardByCustomer 获取我的卡信息
+func (c *CardController) GetCardByCustomer() {
+	c.ResponseJSON("OK")
 }

models/coupon/coupon.go

@@ -388,7 +388,7 @@ func (m *CouponDAO) GetCustomerCouponByID(id string) (*model.TaCustomerCoupon, e
 		return nil, errors.New("无优惠券信息")
 	}
 	var customerCoupon = new(model.TaCustomerCoupon)
-	_, err := m.db.Where("customer_coupon_id=?", id).Get(&customerCoupon)
+	_, err := m.db.Where("customer_coupon_id=?", id).Get(customerCoupon)
 	return customerCoupon, err
 }
 

routers/wechat.go

@@ -20,7 +20,7 @@ func getWechatRoutes() beego.LinkNamespace {
 		beego.NSRouter("/customer", &customer.CustomerController{}, "get:GetCustWXByID"),
 		beego.NSRouter("/customer/user", &user.UserController{}, "get:GetUserCustomer"),
 		beego.NSRouter("/customer/coupon", &coupon.CouponController{}, "get:GetCouponByCustomer"),
-		// beego.NSRouter("/customer/card", &card.CardController{}, "get:GetCardByCustomer"),
+		beego.NSRouter("/customer/card", &card.CardController{}, "get:GetCardByCustomer"),
 
 		// 下单
 		beego.NSRouter("/order/goods", &goods.GoodsController{}, "post:PostOrder"),

service/course/order.go

@@ -100,12 +100,14 @@ func (s *CourseServ) Orders(
 		var isdy = false
 		if coupon.IsAll == 1 {
 			isdy = true
+			couseOrder.CouponAmount = couseOrder.Price
 		} else {
 			for _, target := range coupon.Targets {
 				if target.TargetId == course.CourseId {
 					isdy = true
 				}
 			}
+			couseOrder.CouponAmount = coupon.Price
 		}
 		if !isdy {
 			return errors.New("优惠券不可抵用该课程")
@@ -114,13 +116,12 @@ func (s *CourseServ) Orders(
 			OrdersId:   couseOrder.OrdersId,
 			CouponId:   coupon.CouponId,
 			CouponName: coupon.CouponName,
-			UsedAmount: coupon.Price,
+			UsedAmount: couseOrder.CouponAmount,
 		}
 		if err := s.dao.SaveOrdersCoupon(&ordersCoupon, couseOrder); err != nil {
 			utils.LogError("保存优惠信息出错: " + err.Error())
 			return errors.New("保存优惠信息出错")
 		}
-		couseOrder.CouponAmount = coupon.Price
 
 		// 优惠券核销
 		err = s.couponDAO.VerifyCustomerCoupon(customercouponid)