diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go
index 9b8a0c9b4..be34a3fb5 100644
--- a/business/jxcallback/scheduler/basesch/basesch_ext.go
+++ b/business/jxcallback/scheduler/basesch/basesch_ext.go
@@ -3,6 +3,9 @@ package basesch
import (
"fmt"
+ "git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
+ "git.rosy.net.cn/jx-callback/globals/api"
+
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -13,6 +16,11 @@ import (
"git.rosy.net.cn/jx-callback/globals"
)
+const (
+ PrintResultSuccess = 0
+ PrintResultNoNetPrinter = 1
+)
+
func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *model.GoodsOrder, policyHandler partner.CreateWaybillPolicy) (bills []*model.Waybill, err error) {
userName := ctx.GetUserName()
globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s", order.VendorOrderID, userName)
@@ -52,7 +60,7 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven
globals.SugarLogger.Infof("SelfDeliveredAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName)
order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
if err == nil {
- if GetStoreDeliveryType(order, nil) == scheduler.StoreDeliveryTypeByStore {
+ if c.GetStoreDeliveryType(order, nil) == scheduler.StoreDeliveryTypeByStore {
err = c.SelfDeliverDelivered(order, userName)
} else {
err = c.Swtich2SelfDelivered(order, userName)
@@ -78,7 +86,7 @@ func (c *BaseScheduler) PickupGoodsAndUpdateStatus(ctx *jxcontext.Context, vendo
globals.SugarLogger.Infof("PickupGoodsAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName)
order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
if err == nil {
- err = c.PickupGoods(order, GetStoreDeliveryType(order, nil) == scheduler.StoreDeliveryTypeByStore, userName)
+ err = c.PickupGoods(order, c.GetStoreDeliveryType(order, nil) == scheduler.StoreDeliveryTypeByStore, userName)
if err == nil {
order.Status = model.OrderStatusFinishedPickup
if err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order); err == nil {
@@ -94,7 +102,7 @@ func (c *BaseScheduler) PickupGoodsAndUpdateStatus(ctx *jxcontext.Context, vendo
return err
}
-func GetStoreDeliveryType(order *model.GoodsOrder, storeMap *model.StoreMap) (deliveryType int) {
+func (c *BaseScheduler) GetStoreDeliveryType(order *model.GoodsOrder, storeMap *model.StoreMap) (deliveryType int) {
globals.SugarLogger.Debugf("GetStoreDeliveryType orderID:%s", order.VendorOrderID)
jxStoreID := jxutils.GetSaleStoreIDFromOrder(order)
if storeMap == nil {
@@ -114,3 +122,32 @@ func GetStoreDeliveryType(order *model.GoodsOrder, storeMap *model.StoreMap) (de
globals.SugarLogger.Debugf("GetStoreDeliveryType orderID:%s, deliveryType:%d", order.VendorOrderID, deliveryType)
return deliveryType
}
+
+func (c *BaseScheduler) PrintOrder(ctx *jxcontext.Context, vendorOrderID string, vendorID int) (printResult int, err error) {
+ order, err := orderman.FixedOrderManager.LoadOrder(vendorOrderID, vendorID)
+ if err == nil {
+ printResult, err = c.PrintOrderByOrder(ctx, order)
+ }
+ return printResult, err
+}
+
+func (c *BaseScheduler) PrintOrderByOrder(ctx *jxcontext.Context, order *model.GoodsOrder) (printResult int, err error) {
+ globals.SugarLogger.Debugf("PrintOrderByOrder orderID:%s", order.VendorOrderID)
+ db := dao.GetDB()
+ storeDetail, err2 := dao.GetStoreDetail(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorID)
+ if err = err2; err == nil {
+ if storeDetail.PrinterSN != "" {
+ content := jxutils.GetFeieOrderContent(order, storeDetail.Tel1)
+ if _, err = api.FeieAPI.PrintMsg(storeDetail.PrinterSN, content, 1); err == nil {
+ printResult = PrintResultSuccess
+ dao.SetOrderPrintFlag(db, order.VendorOrderID, order.VendorID, true)
+ }
+ } else {
+ printResult = PrintResultNoNetPrinter
+ }
+ }
+ if err != nil {
+ globals.SugarLogger.Infof("PrintOrderByOrder orderID:%s failed with error:%v", order.VendorOrderID, err)
+ }
+ return printResult, err
+}
diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 289f3e4a1..a6d79bcc3 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -109,7 +109,7 @@ func (s *WatchOrderInfo) updateOrderStoreFeature(order *model.GoodsOrder) (err e
return err
}
s.autoPickupTimeoutMinute = int(storeMap.AutoPickup)
- s.storeDeliveryType = basesch.GetStoreDeliveryType(order, storeMap)
+ s.storeDeliveryType = FixedScheduler.GetStoreDeliveryType(order, storeMap)
if s.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
order.DeliveryFlag |= model.OrderDeliveryFlagMaskPurcahseDisabled
}
@@ -149,6 +149,9 @@ func init() {
err = err2
}
}
+ if isAcceptIt {
+ sch.PrintOrderByOrder(jxcontext.AdminCtx, order)
+ }
}
return err
})
diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index e35c2e476..6eaa0c85b 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -9,6 +9,7 @@ import (
"time"
"git.rosy.net.cn/baseapi/platformapi/dadaapi"
+ "git.rosy.net.cn/baseapi/platformapi/feieapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
@@ -367,8 +368,27 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
syncStatus := model.SyncFlagModifiedMask
if valid["name"] != nil {
valid["name"] = jxutils.FormalizeName(valid["name"].(string))
+ store.Name = valid["name"].(string)
syncStatus |= model.SyncFlagStoreName
}
+ // 网络打印机处理
+ if valid["printerSN"] != nil || valid["printerKey"] != nil {
+ originalPrinterSN := store.PrinterSN
+ if valid["printerSN"] != nil {
+ store.PrinterSN = valid["printerSN"].(string)
+ }
+ if valid["printerKey"] != nil {
+ store.PrinterKey = valid["printerKey"].(string)
+ }
+ if store.PrinterSN != "" {
+ if err = addNetPrinter(store.PrinterSN, store.PrinterKey, store.Name); err != nil {
+ return 0, err
+ }
+ } else if originalPrinterSN != "" {
+ api.FeieAPI.PrinterDelList([]string{originalPrinterSN})
+ }
+ }
+
for _, v := range []string{
"lng",
"lat",
@@ -437,6 +457,11 @@ func CreateStore(ctx *jxcontext.Context, storeExt *StoreExt, userName string) (i
store.Lat = jxutils.StandardCoordinate2Int(storeExt.FloatLat)
store.Name = jxutils.FormalizeName(store.Name)
store.DeliveryRange = strings.Trim(store.DeliveryRange, ";")
+ if store.PrinterSN != "" {
+ if err = addNetPrinter(store.PrinterSN, store.PrinterKey, store.Name); err != nil {
+ return 0, err
+ }
+ }
dao.WrapAddIDCULDEntity(store, userName)
store.ID = existingID
if err = dao.CreateEntity(nil, store); err == nil {
@@ -446,6 +471,27 @@ func CreateStore(ctx *jxcontext.Context, storeExt *StoreExt, userName string) (i
return 0, err
}
+func addNetPrinter(sn, key, storeName string) (err error) {
+ name := storeName
+ _, no, err := api.FeieAPI.PrinterAddList([]*feieapi.PrinterInfo{
+ &feieapi.PrinterInfo{
+ SN: sn,
+ Key: key,
+ Name: name,
+ },
+ })
+ if err == nil {
+ if no[sn] != "" {
+ if no[sn] == feieapi.ErrMsgAlredyAdded {
+ api.FeieAPI.PrinterEdit(sn, name, "")
+ } else {
+ err = fmt.Errorf("添加打印机出错:%s", no[sn])
+ }
+ }
+ }
+ return err
+}
+
func GetStoreVendorMaps(ctx *jxcontext.Context, db *dao.DaoDB, storeID int, vendorID int) (storeMaps []*model.StoreMap, err error) {
cond := map[string]interface{}{
model.FieldStoreID: storeID,
diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index 172050294..c3e8bf86a 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -383,3 +383,73 @@ func Strings2Objs(strAndObjAddPairs ...interface{}) (err error) {
}
return nil
}
+
+func GetFeieOrderContent(order *model.GoodsOrder, storeTel string) (content string) {
+ expectedDeliveryTime := order.ExpectedDeliveredTime
+ if utils.IsTimeZero(expectedDeliveryTime) {
+ expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
+ }
+ orderFmt := `
+京西菜市
+手机买菜上京西
+极速到家送惊喜
+--------------------------------
+下单时间: %s
+预计送达: %s
+订单编号: %s
+
+
+%s#%d
+%s
+
+客户: %s
+电话: %s
+地址: %s
+
+客户备注:
+%s
+
+
+实际支付:%.2f
+
+商品明细:
+品名 数量 单价 小计
+--------------------------------
`
+ orderParams := []interface{}{
+ utils.Time2Str(order.OrderCreatedAt),
+ utils.Time2Str(expectedDeliveryTime),
+ order.VendorOrderID,
+ GetVendorName(order.VendorID),
+ order.OrderSeq,
+ order.VendorOrderID,
+ order.ConsigneeName,
+ order.ConsigneeMobile,
+ order.ConsigneeAddress,
+ order.BuyerComment,
+ IntPrice2Standard(order.ActualPayPrice),
+ }
+
+ for _, sku := range order.Skus {
+ orderFmt += `%s
`
+ orderFmt += `%10d%10.2f%10.2f
`
+ orderParams = append(orderParams, sku.SkuName, sku.Count, IntPrice2Standard(sku.SalePrice), IntPrice2Standard(sku.SalePrice*int64(sku.Count)))
+ }
+ orderFmt += `
+共%d种%d件商品
+
+--------------------------------
+商品质量问题请联系:
+%s:%s
+
+官方服务热线: 18011516898
+更多信息请关注官方微信: 京西菜市
+
+
+--------------------------------
+--------------------------------
+
+`
+ // http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk
+ orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel)
+ return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...)
+}
diff --git a/business/model/store.go b/business/model/store.go
index 39d837d73..90336d3a7 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -131,6 +131,9 @@ type Store struct {
Status int `json:"status"`
ChangePriceType int8 `json:"changePriceType"` // 修改价格类型，即是否需要审核
+ PrinterSN string `orm:"size(32);column(printer_sn);index" json:"printerSN"`
+ PrinterKey string `orm:"size(32)" json:"printerKey"`
+
IDCardFront string `orm:"size(255);column(id_card_front)" json:"idCardFront"`
IDCardBack string `orm:"size(255);column(id_card_back)" json:"idCardBack"`
IDCardHand string `orm:"size(255);column(id_card_hand)" json:"idCardHand"`
diff --git a/conf/app.conf b/conf/app.conf
index 65c410c7e..db063cefc 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -66,6 +66,9 @@ dingdingCallbackToken = "j9JMGyaZs&vxqt&S"
dingdingCallbackURL = "http://callback.test.jxc4.com/dingding/msg"
dingdingCorpID = "ding7ab5687f3784a8db"
+feieUser = "jianhua.xu@rosy.net.cn"
+feieKey = "2JfKh8TyheQ9mwss"
+
[dev]
jdToken = "c8854ef2-f80a-45ee-aceb-dc8014d646f8"
jdAppKey = "06692746f7224695ad4788ce340bc854"
diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index c09b15ce2..a6129362f 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -313,3 +313,18 @@ func (c *OrderController) SetOrderPrintStatus() {
return retVal, "", err
})
}
+
+// @Title 网络打印订单
+// @Description 网络打印订单
+// @Param token header string true "认证token"
+// @Param vendorOrderID formData string true "订单/运单ID"
+// @Param vendorID formData int true "订单/运单所属厂商ID）"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /PrintOrder [put]
+func (c *OrderController) PrintOrder() {
+ c.callPrintOrder(func(params *tOrderPrintOrderParams) (retVal interface{}, errCode string, err error) {
+ retVal, err = defsch.FixedScheduler.PrintOrder(params.Ctx, params.VendorOrderID, params.VendorID)
+ return retVal, "", err
+ })
+}
diff --git a/globals/api/api.go b/globals/api/api.go
index fd2669cb5..e0653d77a 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -9,6 +9,7 @@ import (
"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
"git.rosy.net.cn/baseapi/platformapi/ebaiapi"
"git.rosy.net.cn/baseapi/platformapi/elmapi"
+ "git.rosy.net.cn/baseapi/platformapi/feieapi"
"git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
@@ -40,6 +41,8 @@ var (
DingDingAPI *dingdingapi.API
DingDingQRCodeAPI *dingdingapi.API
+ FeieAPI *feieapi.API
+
Cacher cache.ICacher
)
@@ -92,6 +95,8 @@ func Init() {
DingDingAPI = dingdingapi.NewWithAgentID(beego.AppConfig.DefaultInt64("dingdingAgentID", 0), beego.AppConfig.DefaultString("dingdingCorpID", ""), beego.AppConfig.DefaultString("dingdingAppKey", ""), beego.AppConfig.DefaultString("dingdingSecret", ""))
DingDingQRCodeAPI = dingdingapi.New(beego.AppConfig.DefaultString("dingdingCorpID", ""), beego.AppConfig.DefaultString("dingdingQRCodeAppKey", ""), beego.AppConfig.DefaultString("dingdingQRCodeSecret", ""))
+
+ FeieAPI = feieapi.New(beego.AppConfig.DefaultString("feieUser", ""), beego.AppConfig.DefaultString("feieKey", ""))
}
func initElm() {
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index 84c899f31..a527c2ce4 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -592,6 +592,15 @@ func init() {
Filters: nil,
Params: nil})
+ beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
+ beego.ControllerComments{
+ Method: "PrintOrder",
+ Router: `/PrintOrder`,
+ AllowHTTPMethods: []string{"put"},
+ MethodParams: param.Make(),
+ Filters: nil,
+ Params: nil})
+
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
beego.ControllerComments{
Method: "RefreshOrderRealMobile",