1

business/partner/purchase/mtwm/order_afs.go

@@ -373,12 +373,10 @@ func (c *PurchaseHandler) GetAfsStatusFromVendorStatus(resType int, notifyType s
 // 审核售后单申请
 func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.AfsOrder, approveType int, reason string, review map[string]interface{}) (err error) {
 	if globals.EnableMtwmStoreWrite {
-		globals.SugarLogger.Debugf("-----AgreeOrRefuseRefund review:= %s", utils.Format4Output(review, false))
 		var param *mtwmapi.ReviewAfterSalesInfo
 		if err = utils.Map2StructByJson(review, &param, false); err != nil {
 			return err
 		}
-		globals.SugarLogger.Debugf("-----AgreeOrRefuseRefund:= %s", utils.Format4Output(param, false))
 		err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromAfsOrder(order), order.VendorStoreID).ReviewAfterSales(param)
 		//if approveType == partner.AfsApproveTypeRefused {
 		//	err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromAfsOrder(order), order.VendorStoreID).OrderRefundReject(utils.Str2Int64(order.VendorOrderID), reason)

controllers/mtwm_callback.go

@@ -9,6 +9,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils/ddmsg"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
@@ -231,7 +232,35 @@ func (c *MtwmController) ImgCheckOutCallback() {
 	}
 
 	data := &CheckBackParam{}
-	utils.Map2StructByJson(utils.URLValues2Map(msg.FormData), data, false)
+	if err := utils.Map2StructByJson(utils.URLValues2Map(msg.FormData), data, false); err != nil {
+		c.Data["json"] = map[string]interface{}{"result_code": -1}
+		c.ServeJSON()
+		return
+	}
+
+	if data.AuditStatus == 0 {
+		c.Data["json"] = map[string]interface{}{"result_code": 1}
+		c.ServeJSON()
+		return
+	}
+
+	order, err := partner.CurOrderManager.LoadOrder(data.OrderViewId, model.VendorIDMTWM)
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"result_code": -1}
+		c.ServeJSON()
+		return
+	}
+	if data.AuditStatus == 2 { // 审核失败
+		order.ForceRequirePicture = 2
+		riskDesc := ""
+		for _, v := range data.RiskInfoList {
+			riskDesc += v.RiskDesc + ","
+		}
+		partner.CurOrderManager.OnOrderMsg(order, utils.Int2Str(data.AuditStatus), riskDesc)
+	} else if data.AuditStatus == 3 { // 审核成功
+		order.ForceRequirePicture = 3
+	}
+	dao.UpdateEntity(dao.GetDB(), order, "ForceRequirePicture")
 
 	ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "ImgCheckOutCallback", fmt.Sprintf("美团返图审核:%s", utils.Format4Output(data, false)))
 	globals.SugarLogger.Debugf("-----data := %s", utils.Format4Output(data, false))
@@ -253,7 +282,6 @@ type CheckBackParam struct {
 // OrderImgStatusCallback 针对强制返图订单，当订单返图就绪满足发配条件时，通过该消息通知三方是否可发配
 // http://callback.jxc4.com//mtwm/orderImgStatusCallback
 func (c *MtwmController) OrderImgStatusCallback() {
-
 	msg, callbackResponse := api.MtwmAPI.GetCallbackMsg(c.Ctx.Request)
 	if callbackResponse != nil {
 		c.Data["json"] = map[string]interface{}{"result_code": -1}
@@ -262,7 +290,25 @@ func (c *MtwmController) OrderImgStatusCallback() {
 	}
 
 	data := &CanSendDelivery{}
-	utils.Map2StructByJson(utils.URLValues2Map(msg.FormData), data, false)
+	if err := utils.Map2StructByJson(utils.URLValues2Map(msg.FormData), data, false); err != nil {
+		c.Data["json"] = map[string]interface{}{"result_code": -1}
+		c.ServeJSON()
+		return
+	}
+
+	order, err := partner.CurOrderManager.LoadOrder(data.OrderViewId, model.VendorIDMTWM)
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"result_code": -1}
+		c.ServeJSON()
+		return
+	}
+
+	if data.EnableDispatch {
+		order.ForceRequirePicture = 3
+	} else {
+		order.ForceRequirePicture = 2
+	}
+	dao.UpdateEntity(dao.GetDB(), order, "ForceRequirePicture")
 
 	ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "OrderImgStatusCallback", fmt.Sprintf("美团返图审核可发配:%s", utils.Format4Output(data, false)))
 	globals.SugarLogger.Debugf("-----data := %s", utils.Format4Output(data, false))