sfps

controllers/fn_callback.go

@@ -11,7 +11,6 @@ type FnController struct {
 	web.Controller
 }
 
-
 // 门店回掉
 func (c *FnController) FnStore() {
 	if c.Ctx.Input.Method() == http.MethodPost {
@@ -33,7 +32,7 @@ func (c *FnController) FnStore() {
 // 订单状态
 func (c *FnController) FnOrder() {
 	if c.Ctx.Input.Method() == http.MethodPost {
-		msg, callbackResponse := api.FnAPI.GetChainOrderStatusNotify(c.Ctx.Request)
+		msg, result, callbackResponse := api.FnAPI.GetChainOrderStatusNotify(c.Ctx.Request)
 		if callbackResponse.Code == -1 {
 			c.Data["code"] = callbackResponse
 			c.ServeJSON()
@@ -41,7 +40,7 @@ func (c *FnController) FnOrder() {
 		}
 
 		// 订单回调
-		callbackResponse = fn.OnWaybillMsg(msg)
+		callbackResponse = fn.OnWaybillMsg(msg, result)
 		c.Data["code"] = callbackResponse
 		c.ServeJSON()
 	} else {
@@ -66,4 +65,3 @@ func (c *FnController) FnAbnormal() {
 		c.Abort("404")
 	}
 }
-

controllers/jx_order.go

@@ -243,12 +243,13 @@ func (c *OrderController) GetOrderWaybillInfo() {
 // @Param	vendorOrderID	formData	string	true	"订单ID"
 // @Param	vendorID		formData	int		true	"订单所属的厂商ID"
 // @Param	tipFee			formData	int		true	"小费"
+// @Param	isPay			formData	int		false	"是否确认支付[1是]"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /UpdateOrderWaybillTip [post]
 func (c *OrderController) UpdateOrderWaybillTip() {
 	c.callUpdateOrderWaybillTip(func(params *tOrderUpdateOrderWaybillTipParams) (retVal interface{}, errCode string, err error) {
-		errCode, err = defsch.FixedScheduler.SetOrderWaybillTip(params.Ctx, params.VendorOrderID, params.VendorID, int64(params.TipFee))
+		errCode, err = defsch.FixedScheduler.SetOrderWaybillTip(params.Ctx, params.VendorOrderID, params.VendorID, int64(params.TipFee), params.IsPay)
 		return retVal, "", err
 	})
 }

controllers/jx_order2.go

@@ -123,12 +123,13 @@ func (c *JxOrderController) Pay4StoreMyselfDeliverOrder() {
 // @Param	vendorOrderID	formData	string	false	"订单ID"
 // @Param	payType			formData	int		true	"支付类型"
 // @Param	vendorPayType	formData	string	true	"平台支付类型"
+// @Param	code			formData	string	false	"app吊起微信支付时,需要code获取openID"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /Pay4User [post]
 func (c *JxOrderController) Pay4User() {
 	c.callPay4User(func(params *tJxorderPay4UserParams) (retVal interface{}, errCode string, err error) {
-		retVal, err = localjx.Pay4User(params.Ctx, params.ThingID, params.VendorOrderID, params.PayType, params.VendorPayType, params.SubAppID)
+		retVal, err = localjx.Pay4User(params.Ctx, params.ThingID, params.VendorOrderID, params.PayType, params.VendorPayType, params.SubAppID, params.Code)
 		return retVal, "", err
 	})
 }

controllers/jx_report.go

@@ -126,7 +126,7 @@ func (c *ReportController) GetManageState() {
 // @Param	storeIDs		query		string	false	"门店ID列表[1,2,3]"
 // @Param	brandIDs		query		string	false	"品牌ID列表[1,2,3]"
 // @Param	vendorID		query		int		true	"平台ID"
-// @Param	sortType		query		int		false	"排序类型,1 覆盖范围，2市场规模，3营业时长，4商品数，5虚高商品数，6活动丰富度，7无效订单数，8拒绝订单数，9门店评分，正升序，负倒序"
+// @Param	sortType		query		int		false	"排序类型,1 覆盖范围，2市场规模，3营业时长，4商品数，5虚高商品数，6活动丰富度，7无效订单数，8拒绝订单数，9门店评分，10完成订单数,正升序，负倒序"
 // @Param	offset			query		int		false	"门店列表起始序号（以0开始，缺省为0）"
 // @Param	pageSize		query		int		false	"门店列表页大小（缺省为50，-1表示全部）"
 // @Success 200 {object} controllers.CallResult

controllers/sfps_callback.go

@@ -32,6 +32,7 @@ func (c *SFPSController) SfOrder() {
 
 // SfAbnormal 异常回调
 func (c *FnController) SfAbnormal() {
+
 	if c.Ctx.Input.Method() == http.MethodPost {
 		msg, callbackResponse := api.SfPsAPI.GetRiderExceptionCallback(c.Ctx.Request)
 		if callbackResponse.ErrorCode == -1 {