liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-06-10 17:12:54 +08:00
parent afff3d43c1
commit 897ecdcca0
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/tempop/tempop.go
View File

@@ -4,7 +4,7 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/business/jxstore/report" "git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg"
"regexp" "regexp"
"strings" "strings"
"time" "time"
@@ -1928,7 +1928,8 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// } // }
// } // }
//} //}
report.RefreshJDMembers(ctx) //report.RefreshJDMembers(ctx)
weixinmsg.SmartMessageTemplateSend("oYN_uskdlApt6sv5Y4m_t62iO0f4", weixinmsg.WX_AFS_ORDER_WAIT4APPROVE_TEMPLATE_ID, globals.WxBackstageHost+fmt.Sprintf("%s%d", weixinmsg.WX_TO_ORDER_PAGE_URL, 667092), weixinmsg.WX_MINI_TO_ORDER_PAGE_URL+fmt.Sprintf("?jxStoreId=%v", 667092), map[string]interface{}{"1123": 1})
return err return err
} }

9
business/jxutils/weixinmsg/weixinmsg_test.go
View File

@@ -3,7 +3,6 @@ package weixinmsg
import ( import (
"testing" "testing"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/globals/api2" "git.rosy.net.cn/jx-callback/globals/api2"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
@@ -21,8 +20,8 @@ func TestGetWeixinOpenIDsFromStoreID(t *testing.T) {
} }
func TestSendStoreMessage(t *testing.T) { func TestSendStoreMessage(t *testing.T) {
_, err := SendStoreMessage(jxcontext.AdminCtx, "title", "content", []int{1}, false, true) //_, err := SendStoreMessage(jxcontext.AdminCtx, "title", "content", []int{1}, false, true)
if err != nil { //if err != nil {
t.Fatal(err) // t.Fatal(err)
} //}
} }

2
business/partner/purchase/mtwm/order_afs.go
View File

@@ -46,7 +46,7 @@ func (c *PurchaseHandler) isAfsMsg(msg *mtwmapi.CallbackMsg) bool {
//status, err := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), order.VendorStoreID).OrderViewStatus(orderID) //status, err := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), order.VendorStoreID).OrderViewStatus(orderID)
//if err == nil { //if err == nil {
//return utils.Int2Str(status) == mtwmapi.OrderStatusFinished //return utils.Int2Str(status) == mtwmapi.OrderStatusFinished
return true //有的美团订单售前退款，也当做售后处理试试 return true //TODO 有的美团订单售前退款，也当做售后处理试试
//} //}
} }
//globals.SugarLogger.Warnf("mtwm isAfsMsg OrderGetOrderDetail2 orderID:%d failed with error:%v", orderID, err) //globals.SugarLogger.Warnf("mtwm isAfsMsg OrderGetOrderDetail2 orderID:%d failed with error:%v", orderID, err)