Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

business/jxcallback/scheduler/basesch/basesch.go

@@ -247,14 +247,20 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr
 		//if model.DeliveryBrandMarkMap[platformVendorID]&storeDetail.BrandIsOpen != 0 && balance >= model.BrandBalanceLimit {
 		if _, ok := model.DeliveryBrandMarkMap[platformVendorID]; ok && storeDetail.BrandIsOpen != 0 && balance >= model.BrandBalanceLimit {
 			if c.IsReallyCallPlatformAPI {
-				// 美团配送订单生成，配送费计算
+				// 如果门店是美团服务商且订单为美团订单
-				bill, err = handlerInfo.Handler.CreateWaybill(order, maxDeliveryFee)
+				if storeDetail.IsService == model.YES && order.VendorID == model.VendorIDMTWM {
-				if err != nil {
+					err = fmt.Errorf("京西ID:[%d],平台id[%s],平台[美团]:错误:[%s]", storeDetail.Store.ID, storeDetail.VendorStoreID, "此门店美团平台为服务商模式,不支持本系统提供的三方配送![仅美团,其余平台订单正常使用.]")
-					globals.SugarLogger.Infof("CreateWaybill failed orderID:%s vendorID:%d with error:%v", order.VendorOrderID, platformVendorID, err)
 				} else {
-					order.DeliveryFlag |= model.WaybillVendorID2Mask(platformVendorID)
+					// 生成三方运单
-					err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order)
+					bill, err = handlerInfo.Handler.CreateWaybill(order, maxDeliveryFee)
+					if err != nil {
+						globals.SugarLogger.Infof("CreateWaybill failed orderID:%s vendorID:%d with error:%v", order.VendorOrderID, platformVendorID, err)
+					} else {
+						order.DeliveryFlag |= model.WaybillVendorID2Mask(platformVendorID)
+						err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order)
+					}
 				}
+
 			}
 		} else {
 			err = fmt.Errorf("CreateWaybill failed brand is close orderID: %s, isOpen: %d or store/brand money is enought ", order.VendorOrderID, storeDetail.BrandIsOpen)

business/jxstore/cms/store.go

@@ -1901,7 +1901,7 @@ func TmpGetJxBadCommentsByStoreId(ctx *jxcontext.Context, keyword string, storeI
 	sql := `
 	SELECT SQL_CALC_FOUND_ROWS
 	t1.*, t2.name store_name, t3.name city_name,
-	t4.vendor_order_id2
+	t4.vendor_order_id2 
 	FROM jx_bad_comments t1
 	LEFT JOIN store t2 ON t2.id = t1.jxstoreid
 	LEFT JOIN place t3 ON t3.code = t2.city_code

business/model/dao/store.go

@@ -38,6 +38,7 @@ type StoreDetail struct {
 	DeliveryType        int8 `orm:"default(0)" json:"deliveryType"`        // 配送类型
 	DeliveryCompetition int8 `orm:"default(1)" json:"deliveryCompetition"` // 是否支持配送竞争
 	IsSync              int8 `orm:"default(1)" json:"isSync"`              // 是否同步
+	IsService           int  `orm:"default(0)" json:"isService"`           // 默认0非服务商，1服务商
 
 	DistrictName  string `json:"districtName"`
 	CityName      string `json:"cityName"`
@@ -114,7 +115,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID, vendorOrgCo
 	SELECT t1.*,
 	t2.vendor_store_id, t2.status vendor_status, t2.delivery_fee_deduction_sill, t2.delivery_fee_deduction_fee, t2.sync_status, t2.vendor_org_code,
 	t2.price_percentage, t2.auto_pickup, t2.delivery_type, t2.delivery_competition, t2.is_sync, t2.vendor_store_name, t2.is_order, t2.yb_app_id, t2.yb_app_key, t2.yb_store_prefix,
-	t2.jds_street_code, t2.jds_street_name, t2.is_supply_goods, t2.vendor_pay_percentage, t2.mtwm_token, t2.ebai_supplier_id, t2.create_delivery_type,
+	t2.jds_street_code, t2.jds_street_name, t2.is_supply_goods, t2.vendor_pay_percentage, t2.mtwm_token, t2.ebai_supplier_id, t2.create_delivery_type,t2.is_service,
 	t3.value price_percentage_pack_str,
 	t4.value freight_deduction_pack_str,
 	province.name province_name,

business/partner/printer/jxprint/jxprint_const.go

@@ -8,6 +8,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
+	"time"
 )
 
 const (
@@ -83,6 +84,9 @@ func ManagerOrderPrint(order *model.GoodsOrder, storeTel string, storeDetail *da
 
 	printOrder[PayOrderTime] = utils.Time2Str(order.OrderCreatedAt)
 	printOrder[TrySendTime] = utils.Time2Str(order.ExpectedDeliveredTime)
+	if order.ExpectedDeliveredTime.Unix() == utils.DefaultTimeValue.Unix() {
+		printOrder[TrySendTime] = utils.Time2Str(order.OrderCreatedAt.Add(time.Hour * 1))
+	}
 	printOrder[OrderNo] = order.VendorOrderID
 	printOrder[VendorID] = utils.Int2Str(order.VendorID)
 	printOrder[VendorName] = jxutils.GetVendorName(order.VendorID)