1

business/jxstore/act/act.go

@@ -800,6 +800,7 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i
 			}
 			actIdResult := make(map[string]int64, 0)
 			mtApi := mtwm.GetAPI(vendorOrgCode, storeID, storeDetail.VendorStoreID)
+			// 创建活动
 			actResult, fileInfoList, _ := mtApi.RetailDiscountBatchSave2(storeDetail.VendorStoreID, actType, actData)
 			for _, v := range actResult {
 				var (

business/jxstore/cms/store.go

@@ -956,6 +956,9 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
 	if payload["packageSwitch"] != nil {
 		valid["packageSwitch"], _ = payload["packageSwitch"].(json.Number).Int64()
 	}
+	if payload["pushBill"] != nil {
+		valid["pushBill"], _ = payload["pushBill"].(json.Number).Int64()
+	}
 	if payload["freightMarkup"] != nil {
 		valid["freightMarkup"], _ = payload["freightMarkup"].(json.Number).Int64()
 	}

business/jxutils/unipush/push.go

@@ -53,6 +53,7 @@ func NotifyNewOrder(order *model.GoodsOrder) {
 	msg.Context = "老板,你有新的订单了!"
 	msg.VendorOrderId = order.VendorOrderID
 	msg.StoreId = storeId
+	msg.BusinessType = order.BusinessType
 	context, _ := json.Marshal(msg)
 	body := msg.Context + fmt.Sprintf("门店ID:%d(%s)", storeId, model.VendorChineseNames[order.VendorID]+"#"+msg.OrderSqs+"号订单")
 	pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context), body, SoundsFileNewOrder, FlagOrder)
@@ -213,6 +214,7 @@ type MsgContext struct {
 	VendorName    string `json:"vendor_name"`     // 平台名称
 	OrderSqs      string `json:"order_sqs"`       // 订单流水号
 	VendorOrderId string `json:"vendor_order_id"` // 订单id
+	BusinessType  int    `json:"business_type"`   // 是否为预定单
 }
 
 func pushMsgByUniApp(storeId int, storeName string, cID []string, msg string, body string, soundsFileName string, flag int) {

business/model/dao/sku.go

@@ -348,6 +348,7 @@ func GetSkusWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string, nameIDs
 		model.ThingTypeSku,
 		utils.DefaultTimeValue,
 	}
+
 	if len(vendorIDs) > 0 {
 		sql += " AND t1m.vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
 		sqlParams = append(sqlParams, vendorIDs)

business/model/store.go

@@ -404,6 +404,7 @@ type Store struct {
 	IDCardHandBack     string `orm:"size(255);column(id_card_hand_back)" json:"idCardHandBack"`        //手持身份证背面
 	PackageSetting     int    `orm:"size(8);column(package_setting);default(0)" json:"packageSetting"` //门店包装袋扣费设置
 	PackageSwitch      int    `orm:"size(8);column(package_switch);default(0)" json:"packageSwitch"`   //物料购物单门店购买袋子开关[0打开/1关闭]
+	PushBill           int    `orm:"size(8);column(push_bill);default(0)" json:"pushBill"`             //是否推送门店账单[0推送/1不推送]
 	FreightMarkup      int    `orm:"size(8);column(freight_markup);default(0)" json:"freightMarkup"`   //门店为三方运单时,设置的运营加价
 }
 

business/partner/purchase/jd/sku2.go

@@ -123,10 +123,7 @@ func (p *PurchaseHandler) getVendorCategories(level int, pid int64) (vendorCats
 		vendorOrgCode = jdapi.JdVendorOrgCodeVagetable
 	}
 	jdsApi := apimanager.CurAPIManager.GetAPI(model.VendorIDJD, vendorOrgCode).(*jdapi.API)
-	globals.SugarLogger.Debugf("-------vendorOrgCode := %s", vendorOrgCode)
-	globals.SugarLogger.Debugf("-------jdsApi := %s", jdsApi.GetToken())
 	cats, err := jdsApi.QueryChildCategoriesForOP(pid)
-	globals.SugarLogger.Debugf("-------err := %v", err)
 	if err != nil {
 		return nil, err
 	}