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-21 15:43:22 +08:00
parent 80a967622c
commit 1926e3b312
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -670,6 +670,11 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
s.createWaybillOn3rdProviders(savedOrderInfo, 0, nil) s.createWaybillOn3rdProviders(savedOrderInfo, 0, nil)
} }
} }
//if order.Status < model.OrderStatusDelivering {
// if order.VendorID == model.VendorIDMTWM && order.DeliveryType == model.OrderDeliveryTypePlatform {
// s.CancelOrder(jxcontext.AdminCtx, order, "")
// }
//}
} }
} }
// case model.WaybillStatusDelivering: // case model.WaybillStatusDelivering:

13
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/jxutils/weixinmsg" "git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
"regexp" "regexp"
"strings" "strings"
"time" "time"
@@ -1930,11 +1930,12 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// } // }
// } // }
//} //}
storeID := 100002 //storeID := 100002
data := ` //data := `
{"address":"甬旺农贸市场蔬菜摊","cityName": "苏州市","id": 100002,"name": "斜塘顺达广场店","payeeName": "李川川","status": 1,"tel1": "13812641804","tel2": ""} //{"address":"甬旺农贸市场蔬菜摊","cityName": "苏州市","id": 100002,"name": "斜塘顺达广场店","payeeName": "李川川","status": 1,"tel1": "13812641804","tel2": ""}
` //`
weixinmsg.SmartMessageTemplateSend("oYN_uskdlApt6sv5Y4m_t62iO0f4", weixinmsg.WX_NEWORDER_TEMPLATE_ID, globals.WxBackstageHost+fmt.Sprintf("%s%d", weixinmsg.WX_TO_ORDER_PAGE_URL, storeID), weixinmsg.WX_MINI_TO_ORDER_PAGE_URL+fmt.Sprintf("?jxStoreId=%v&data=%v", storeID, data), nil) //weixinmsg.SmartMessageTemplateSend("oYN_uskdlApt6sv5Y4m_t62iO0f4", weixinmsg.WX_NEWORDER_TEMPLATE_ID, globals.WxBackstageHost+fmt.Sprintf("%s%d", weixinmsg.WX_TO_ORDER_PAGE_URL, storeID), weixinmsg.WX_MINI_TO_ORDER_PAGE_URL+fmt.Sprintf("?jxStoreId=%v&data=%v", storeID, data), nil)
orderman.RefreshJdAfsOrderTotalShopMoney()
return err return err
} }