diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go index 1ed69f4b8..3b4662034 100644 --- a/business/jxstore/report/report.go +++ b/business/jxstore/report/report.go @@ -431,6 +431,9 @@ func RefreshStoreManageState(ctx *jxcontext.Context, storeIDs []int, vendorIDs [ return retVal, err } storeDetail, _ := dao.GetStoreDetail(db, storeMap.StoreID, vendorID, storeMap.VendorOrgCode) + if storeDetail == nil { + return retVal, err + } storeManage := buildStoreManageState(ctx, db, storeMap, storeDetail, messageFlag) if storeManage == nil { return retVal, err @@ -447,6 +450,9 @@ func RefreshStoreManageState(ctx *jxcontext.Context, storeIDs []int, vendorIDs [ return retVal, err } storeDetail, _ := dao.GetStoreDetail(db, storeMap.StoreID, vendorID, storeMap.VendorOrgCode) + if storeDetail == nil { + return retVal, err + } storeManage := buildStoreManageState(ctx, db, storeMap, storeDetail, messageFlag) if storeManage == nil { return retVal, err diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 05fc6a750..64fc0374f 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -129,7 +129,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin 客户备注:
%s

- +您有新订单啦!
商品明细:
品名 数量 单价 小计
diff --git a/conf/app.conf b/conf/app.conf index 26605bc3e..a18962ad6 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -385,6 +385,9 @@ fnAppID = "6a3e2073-1850-413b-9eb7-6c342ec36e1c" fnAppSecret = "a8248088-a742-4c33-a0db-03aeae00ca7d" fnCallbackURL = "http://callback-jxgy.jxc4.com/fn/msg" +jxPrintAppID = "1000" +jxPrintAppKey = "rfBd56ti2SMtYvSg" + storeName = "京西果园" [test]