1

business/model/store_sku.go

@@ -18,6 +18,18 @@ const (
 	RequestTypeFocusSkuName = 2
 )
 
+const (
+	WeightCosntMenuG  = "1" // "g"
+	WeightCosntMenuKG = "2" // "kg"
+	WeightCosntMenuL  = "4" // "l"
+	WeightCosntMenuML = "3" // "ml"
+
+	WeightCosntStringG  = "g"
+	WeightCosntStringKG = "kg"
+	WeightCosntStringL  = "l"
+	WeightCosntStringML = "ml"
+)
+
 const (
 	RequestStatusNew      = 0
 	RequestStatusRejected = -1
@@ -99,11 +111,11 @@ type StoreSkuBind struct {
 	Status     int
 
 	// ElmID  int64 `orm:"column(elm_id);index"`
-	MtwmID    int64  `orm:"column(mtwm_id);index"`
-	EbaiID    int64  `orm:"column(ebai_id);index"`
-	YbID      int64  `orm:"column(yb_id);index"`
-	JdsID     int64  `orm:"column(jds_id);index"`
-	JdsWareID int64  `orm:"column(jds_ware_id)"`
+	MtwmID    int64 `orm:"column(mtwm_id);index"`
+	EbaiID    int64 `orm:"column(ebai_id);index"`
+	YbID      int64 `orm:"column(yb_id);index"`
+	JdsID     int64 `orm:"column(jds_id);index"`
+	JdsWareID int64 `orm:"column(jds_ware_id)"`
 	//GmID      string `orm:"column(gm_id)"`
 	// WscID  int64 `orm:"column(wsc_id);index"`  // 表示微盟skuId
 	// WscID2 int64 `orm:"column(wsc_id2);index"` // 表示微盟goodsId

business/partner/purchase/jx/localjx/tiktokPay.go

@@ -69,7 +69,7 @@ func onTTPayFinished(msg *tiktok.DetailCallBackMessage) (err error) {
 	}
 	orderPay.DeletedAt = utils.DefaultTimeValue
 	db := dao.GetDB()
-	if err = dao.GetEntity(db, orderPay, "PayOrderID", "PayType", "DeletedAt"); err == nil {
+	if err = dao.GetEntity(db, orderPay); err == nil {
 		orderPay.PayFinishedAt = utils.Time2Pointer(wxpayapi.PayTime2Time(utils.Int64ToStr(msg.PaidAt)))
 		orderPay.TransactionID = msg.ChannelNo
 		orderPay.OriginalData = utils.Format4Output(msg, true)
@@ -94,7 +94,7 @@ func onTTPayRefund(msg *tiktok.DetailCallBackMessage2Refund) (err error) {
 		RefundID: msg.CpRefundno,
 	}
 	db := dao.GetDB()
-	if err = dao.GetEntity(db, orderPayRefund, "RefundID"); err == nil {
+	if err = dao.GetEntity(db, orderPayRefund); err == nil {
 		if msg.Status == tiktok.ResponseCodeSuccess {
 			orderPayRefund.Status = model.RefundStatusYes
 		} else {

business/partner/purchase/mtwm/store_sku2.go

@@ -337,6 +337,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		if foodData["tag_id"] != nil {
 			skus[0]["weight"] = storeSku.Weight // weight字段仅限服饰鞋帽、美妆、日用品、母婴、生鲜果蔬、生活超市下的便利店/超市门店品类的商家使用
 		}
+
 	}
 	if globals.EnableMtwmStoreWrite {
 		if len(foodDataList) == 1 {