wangfei 6 年之前
父節點
當前提交
2cda800ed6
共有 5 個文件被更改,包括 59 次插入7 次删除
  1. 0
    1
      controllers/goods/order.go
  2. 45
    0
      log/common.log
  3. 11
    1
      models/coupon/coupon.go
  4. 1
    1
      models/goods/orders.go
  5. 2
    4
      service/goods/orders.go

+ 0
- 1
controllers/goods/order.go 查看文件

@@ -103,7 +103,6 @@ func (c *GoodsController) PostOrder() {
103 103
 
104 104
 	// 订单优惠券
105 105
 	customercouponid := c.GetString("customercouponid")
106
-
107 106
 	//
108 107
 	var orderInfo model.TaGoodsOrders
109 108
 	var orderDetail []model.TaGoodsOrdersDetail

+ 45
- 0
log/common.log 查看文件

@@ -3259,3 +3259,48 @@
3259 3259
 2018/09/13 22:43:08 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3260 3260
 2018/09/13 22:43:09 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_GxgfJzv5XDJqhe4UMEnQHNxh1Po7akGhaKn5eKGzcgX8fbOqI9Jc1KWTvQ3j3rHXgQEhW8teC9hWD4MfmXnBgOpP5ym3unGtki1mDdjXSg0KgcXi6TWxk328ouEi5gj7MYPCL-kvHfn5gIYTOJLeAFAEZB","expires_in":7200})
3261 3261
 2018/09/13 22:43:09 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_GxgfJzv5XDJqhe4UMEnQHNxh1Po7akGhaKn5eKGzcgX8fbOqI9Jc1KWTvQ3j3rHXgQEhW8teC9hWD4MfmXnBgOpP5ym3unGtki1mDdjXSg0KgcXi6TWxk328ouEi5gj7MYPCL-kvHfn5gIYTOJLeAFAEZB])
3262
+2018/09/14 09:12:47 [E] 用户没有设置默认案场
3263
+2018/09/14 09:12:51 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3264
+2018/09/14 09:12:52 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_qDb6JlAR6cvzBUes8kOWsmX4vXqTXvld3D1oogtQ5X_APmmHeI7dY3_TqzbTm4LDu2tunlo-UicbdEV0IfIo4PwMXqVC-r5lPCR3Gqnja8b26quBvBiMRsLPiEl0S4xs_-SHPVUXERdAdsQ6MBEdACAVKN","expires_in":7200})
3265
+2018/09/14 09:12:52 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_qDb6JlAR6cvzBUes8kOWsmX4vXqTXvld3D1oogtQ5X_APmmHeI7dY3_TqzbTm4LDu2tunlo-UicbdEV0IfIo4PwMXqVC-r5lPCR3Gqnja8b26quBvBiMRsLPiEl0S4xs_-SHPVUXERdAdsQ6MBEdACAVKN expires_in:7200])
3266
+2018/09/14 09:23:57 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3267
+2018/09/14 09:23:58 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_uK5ZysgjB8plDUCeQOS6uPUvYLON3hDKHhqdygYbTYEpnV_KHMWVp7KUjUd96OlvSmCBvGbyMJb_KsN4t_BR80SIhUK3Roz9Am7S-2_2OL-FNwze1mTpx1QoophPU9itNNYvcYsDuOZSGeIJRVYjAFAIMP","expires_in":7200})
3268
+2018/09/14 09:23:58 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_uK5ZysgjB8plDUCeQOS6uPUvYLON3hDKHhqdygYbTYEpnV_KHMWVp7KUjUd96OlvSmCBvGbyMJb_KsN4t_BR80SIhUK3Roz9Am7S-2_2OL-FNwze1mTpx1QoophPU9itNNYvcYsDuOZSGeIJRVYjAFAIMP expires_in:7200])
3269
+2018/09/14 09:24:51 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3270
+2018/09/14 09:24:52 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_1ucx-Mj9vXOR5WAl0lgtJdXg2jhOl0C7CwvXGGWBEXbtdXk4RxNn-30_ugQRwUtHC4Z26yP84rUI7suTs2ISRzGfK0dyrNQWm0lnDXUPcSM3IHl9rQvxut5PDfS5UCHGhP3Gg03Tro1S8WI8RVScABAXBY","expires_in":7200})
3271
+2018/09/14 09:24:52 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_1ucx-Mj9vXOR5WAl0lgtJdXg2jhOl0C7CwvXGGWBEXbtdXk4RxNn-30_ugQRwUtHC4Z26yP84rUI7suTs2ISRzGfK0dyrNQWm0lnDXUPcSM3IHl9rQvxut5PDfS5UCHGhP3Gg03Tro1S8WI8RVScABAXBY expires_in:7200])
3272
+2018/09/14 09:25:12 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3273
+2018/09/14 09:25:12 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_Y1L3i752waOt_lG3531zJHgzuaUav4JQaR18w3hvVOT80rn7IwQXSJu1FCZeGSRkDAwJ8U_ToRXiH7jX8JF3Fs3KMU2gWAm97N9smE57pUfWeLg5-uahc6jwwhUELb1rdjaMSFSwWeTJiykgTPPfAJAKGG","expires_in":7200})
3274
+2018/09/14 09:25:12 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_Y1L3i752waOt_lG3531zJHgzuaUav4JQaR18w3hvVOT80rn7IwQXSJu1FCZeGSRkDAwJ8U_ToRXiH7jX8JF3Fs3KMU2gWAm97N9smE57pUfWeLg5-uahc6jwwhUELb1rdjaMSFSwWeTJiykgTPPfAJAKGG expires_in:7200])
3275
+2018/09/14 09:25:42 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3276
+2018/09/14 09:25:42 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_Lhs2P_5Mwv-nR1Bsrp-05s91A_OyKOprrRPiKwmq86jG8mEOCNr66bFReh5xq3NQ1jEIr_WFoPNDS3AXse0t4SwN-7YwzaybMZKyvQBCnZTkadVEh65NzH5L3fQ6VZJzApFkTXj_Q-pMjrfbTWIeAEAILX","expires_in":7200})
3277
+2018/09/14 09:25:42 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_Lhs2P_5Mwv-nR1Bsrp-05s91A_OyKOprrRPiKwmq86jG8mEOCNr66bFReh5xq3NQ1jEIr_WFoPNDS3AXse0t4SwN-7YwzaybMZKyvQBCnZTkadVEh65NzH5L3fQ6VZJzApFkTXj_Q-pMjrfbTWIeAEAILX expires_in:7200])
3278
+2018/09/14 09:31:31 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3279
+2018/09/14 09:31:31 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_isfXgYEpR2aDv0p_n6Sm-liedNbNRUDD0lZuCSxd7xnjKmZBSudlttvpPGjenYqK8c2-r_e5YQjHyUvcdi3GfLR28LJtzBJMHhGTtZbaBjm5QILG_1AnbwLi5R5xl7PN-MgPbd7Gv_NNFySUZGDhAJAHOL","expires_in":7200})
3280
+2018/09/14 09:31:31 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_isfXgYEpR2aDv0p_n6Sm-liedNbNRUDD0lZuCSxd7xnjKmZBSudlttvpPGjenYqK8c2-r_e5YQjHyUvcdi3GfLR28LJtzBJMHhGTtZbaBjm5QILG_1AnbwLi5R5xl7PN-MgPbd7Gv_NNFySUZGDhAJAHOL expires_in:7200])
3281
+2018/09/14 09:34:04 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3282
+2018/09/14 09:34:04 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_NETc2HLRTxGlPdze6iQtk40j_7cjcXS7x7gbeswZMNQGW0MbBjWYbrkChQ_WRFkWuVh0F8-Oyjrf_hxI5_JI6iIjt3y7RC5hCOhLPEUbrkzwZ2oYNv5x0NVI7cCh6QH2Y5IV7j_IZxLOLeIOMIKhAHAHDF","expires_in":7200})
3283
+2018/09/14 09:34:04 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_NETc2HLRTxGlPdze6iQtk40j_7cjcXS7x7gbeswZMNQGW0MbBjWYbrkChQ_WRFkWuVh0F8-Oyjrf_hxI5_JI6iIjt3y7RC5hCOhLPEUbrkzwZ2oYNv5x0NVI7cCh6QH2Y5IV7j_IZxLOLeIOMIKhAHAHDF expires_in:7200])
3284
+2018/09/14 09:34:45 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3285
+2018/09/14 09:34:45 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_xtQylVN2fOlkyxbzP9WmMf-uZJq9ElASxwnCi1-z-JIyNfp06OaZxPWtv8-S8ZOlxloBky35LrQQPPRRQ9ARnHpLtJt_8cKh_QgtHWNCBNQpBtW8LxDlmztaFfakKFBXJy5VUg2696FkVjM-IFDiACATQO","expires_in":7200})
3286
+2018/09/14 09:34:45 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_xtQylVN2fOlkyxbzP9WmMf-uZJq9ElASxwnCi1-z-JIyNfp06OaZxPWtv8-S8ZOlxloBky35LrQQPPRRQ9ARnHpLtJt_8cKh_QgtHWNCBNQpBtW8LxDlmztaFfakKFBXJy5VUg2696FkVjM-IFDiACATQO expires_in:7200])
3287
+2018/09/14 09:35:11 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3288
+2018/09/14 09:35:11 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_pAdmxtdHbK_ryEFLBDLvwjuk0Xaf8KQ6RMi6DyJQ7U32PMmlrzczSU3I4FTt5drTm3OTUdD6QyoqRxXV16wsm-3554vjBo2lWaxIW2zVMNBDX3YXfInqXsfN81Gx0MBoIh_LZdRZrEfcWLW3ZHDgAAAUCY","expires_in":7200})
3289
+2018/09/14 09:35:11 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_pAdmxtdHbK_ryEFLBDLvwjuk0Xaf8KQ6RMi6DyJQ7U32PMmlrzczSU3I4FTt5drTm3OTUdD6QyoqRxXV16wsm-3554vjBo2lWaxIW2zVMNBDX3YXfInqXsfN81Gx0MBoIh_LZdRZrEfcWLW3ZHDgAAAUCY expires_in:7200])
3290
+2018/09/14 09:35:40 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3291
+2018/09/14 09:35:40 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_kPg_BwUyetJhJXO3sHBHbC-MFRohzD9yROKsAn2GD5fhQDOQyoL9rdK9dKzDOaqipc1ucYROlyrDX-dpR0lJZrr7kZz0Qy5tOBKJTuWGHd0-fCTkcNBa6b878Rfyjv-JC2uOmnMm1xHUDKKPHNHaADARXR","expires_in":7200})
3292
+2018/09/14 09:35:40 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_kPg_BwUyetJhJXO3sHBHbC-MFRohzD9yROKsAn2GD5fhQDOQyoL9rdK9dKzDOaqipc1ucYROlyrDX-dpR0lJZrr7kZz0Qy5tOBKJTuWGHd0-fCTkcNBa6b878Rfyjv-JC2uOmnMm1xHUDKKPHNHaADARXR])
3293
+2018/09/14 09:35:59 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3294
+2018/09/14 09:35:59 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_M-1iOBH4aGqo32MrHKf--29lY7qJKOPDrtvbsvSatq5NfpSUrBBfFT5hcasY9PWchw2HEmlpEL6TD6Zz_YexQRu-Nl5IN7J-410egQx_tlF6n4l5arnn6bFM9jgI00OA9gYmrNd7GokSvhifPDMhACAFTC","expires_in":7200})
3295
+2018/09/14 09:35:59 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_M-1iOBH4aGqo32MrHKf--29lY7qJKOPDrtvbsvSatq5NfpSUrBBfFT5hcasY9PWchw2HEmlpEL6TD6Zz_YexQRu-Nl5IN7J-410egQx_tlF6n4l5arnn6bFM9jgI00OA9gYmrNd7GokSvhifPDMhACAFTC expires_in:7200])
3296
+2018/09/14 09:36:15 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3297
+2018/09/14 09:36:15 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_vrpQwPrOzzQ40-QUHKf--29lY7qJKOPDrtvbsvSatq5NfpSUrBBfFT5hcavSGssCrojtUjv5aef9AEUGao5Yy_MFwRpVmiPLXJf01iUCqZAafi_XOYWr4KGjkNVn4Rk7jrrGSD1efvhZwgdMYQDhACALDQ","expires_in":7200})
3298
+2018/09/14 09:36:15 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_vrpQwPrOzzQ40-QUHKf--29lY7qJKOPDrtvbsvSatq5NfpSUrBBfFT5hcavSGssCrojtUjv5aef9AEUGao5Yy_MFwRpVmiPLXJf01iUCqZAafi_XOYWr4KGjkNVn4Rk7jrrGSD1efvhZwgdMYQDhACALDQ expires_in:7200])
3299
+2018/09/14 09:37:29 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3300
+2018/09/14 09:37:29 [E] 解析用户微信映射信息失败: json: cannot unmarshal string into Go struct field WechatUser.sex of type float64
3301
+2018/09/14 09:37:29 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_utvK__7U9vBQEKNmOs01VRJWnC8_hT7KXogdHBLCpo6b-Jn-v7Z2LVXTFGqjmJHtPdLNyDFVzoH4vlH9TktXi2mM6KpkKX90Arjpc8dmDYo7RiZDdhzMwiKeq_QgDY7F_uXjAVPPcoqiAQ9TJEZbAAAVQL","expires_in":7200})
3302
+2018/09/14 09:37:29 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_utvK__7U9vBQEKNmOs01VRJWnC8_hT7KXogdHBLCpo6b-Jn-v7Z2LVXTFGqjmJHtPdLNyDFVzoH4vlH9TktXi2mM6KpkKX90Arjpc8dmDYo7RiZDdhzMwiKeq_QgDY7F_uXjAVPPcoqiAQ9TJEZbAAAVQL])
3303
+2018/09/14 09:38:13 [E] 解析用户微信映射信息失败: json: cannot unmarshal string into Go struct field WechatUser.sex of type float64
3304
+2018/09/14 09:38:56 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
3305
+2018/09/14 09:38:56 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_A3mHkRt2Hri-1lS-l4gAV2gKPLRLidrUUL9zrC18aBmLRCwuIXgrtVeK4AM4q3d2xolidx_GcpR_hOvsNyNBRJ9KMVr7UsZ0frOMG5QPzcNjQrn6_eZHsL0O73FQjZgUUmel7RRufLTUX81BWFOgAAAMVE","expires_in":7200})
3306
+2018/09/14 09:38:56 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_A3mHkRt2Hri-1lS-l4gAV2gKPLRLidrUUL9zrC18aBmLRCwuIXgrtVeK4AM4q3d2xolidx_GcpR_hOvsNyNBRJ9KMVr7UsZ0frOMG5QPzcNjQrn6_eZHsL0O73FQjZgUUmel7RRufLTUX81BWFOgAAAMVE expires_in:7200])

+ 11
- 1
models/coupon/coupon.go 查看文件

@@ -109,7 +109,7 @@ func (m *CouponDAO) GetCouponInfoByCustomerCouponID(id string) (*CouponInfo, err
109 109
 	}
110 110
 	// 关联目标
111 111
 	var targes []model.TaCouponTarget
112
-	if err := m.db.Where("coupon_id=?", id).Find(&targes); err != nil {
112
+	if err := m.db.Where("coupon_id=?", cp.CouponId).Find(&targes); err != nil {
113 113
 		return nil, err
114 114
 	}
115 115
 
@@ -382,6 +382,16 @@ func (m *CouponDAO) GetCouponByCustomer(orgid, customerid string) ([]CustomerCou
382 382
 	return coupons, err
383 383
 }
384 384
 
385
+// GetCustomerCouponByID 获取我的优惠券想想
386
+func (m *CouponDAO) GetCustomerCouponByID(id string) (*model.TaCustomerCoupon, error) {
387
+	if id == "" {
388
+		return nil, errors.New("无优惠券信息")
389
+	}
390
+	var customerCoupon = new(model.TaCustomerCoupon)
391
+	_, err := m.db.Where("customer_coupon_id=?", id).Get(&customerCoupon)
392
+	return customerCoupon, err
393
+}
394
+
385 395
 // GetCouponWithTarget 获取优惠券与关联信息
386 396
 func (m *CouponDAO) GetCouponWithTarget(ids string) ([]CouponInfo, error) {
387 397
 	var cp []CouponInfo

+ 1
- 1
models/goods/orders.go 查看文件

@@ -78,7 +78,7 @@ func (m *GoodsDAO) SaveOrdersCoupon(coupons *model.TaGoodsOrdersCoupon, order *m
78 78
 		return errors.New("内部错误, 订单事务顺序出错")
79 79
 	}
80 80
 
81
-	if _, err := m.db.Insert(&coupons); err != nil {
81
+	if _, err := m.db.Insert(coupons); err != nil {
82 82
 		return err
83 83
 	}
84 84
 

+ 2
- 4
service/goods/orders.go 查看文件

@@ -55,16 +55,16 @@ func (s *GoodsServ) Orders(
55 55
 		}
56 56
 
57 57
 		// 如果是使用优惠券
58
-
59 58
 		if customercouponid != "" {
60 59
 			info.PayType = models.CONSUME_COUPON
61
-
62 60
 			// 根据id获取优惠券信息
63 61
 			coupon, err := s.couponDAO.GetCouponInfoByCustomerCouponID(customercouponid)
64 62
 			if err != nil {
65 63
 				utils.LogError("查询优惠券信息失败: " + err.Error())
66 64
 				return errors.New("查询优惠券信息失败")
67 65
 			}
66
+			// 优惠券校验
67
+			// s.couponDAO.GetCustomerCouponByID
68 68
 			// 遍历优惠券可抵用的商品
69 69
 			var dyGoods = model.TaGoodsOrdersDetail{
70 70
 				Price:   "0.0",
@@ -81,7 +81,6 @@ func (s *GoodsServ) Orders(
81 81
 					}
82 82
 				}
83 83
 			}
84
-
85 84
 			if dyGoods.GoodsId != "" {
86 85
 				// 优惠券可以抵用商品
87 86
 				var ordersCoupon = model.TaGoodsOrdersCoupon{
@@ -119,7 +118,6 @@ func (s *GoodsServ) Orders(
119 118
 		couponAmount, _ := strconv.ParseFloat(info.CouponAmount, 64)
120 119
 		payMoney, _ := strconv.ParseFloat(info.Amount, 64)
121 120
 		payMoney = payMoney - couponAmount
122
-
123 121
 		if accMoney < payMoney {
124 122
 			return errors.New("账户余额不足")
125 123
 		}