- handle pending orders and waybills when starting.

business/model/order.go

@@ -19,6 +19,7 @@ type GoodsOrder struct {
 	SubStoreName          string `orm:"size(64)"`
 	ShopPrice             int64  // 单位为分
 	SalePrice             int64  // 单位为分
+	ActualPayPrice        int64  // 单位为分
 	Weight                int    // 单位为克
 	ConsigneeName         string `orm:"size(32)"`
 	ConsigneeMobile       string `orm:"size(32)"`
@@ -56,12 +57,12 @@ type OrderSku struct {
 	VendorOrderID  string `orm:"column(vendor_order_id);size(48)"`
 	VendorID       int    `orm:"column(vendor_id)"`
 	Count          int
-	VendorSkuID    string `orm:"column(vendor_sku_id);size(48)"`
-	SkuID          int    `orm:"column(sku_id)"`    // 外部系统里记录的 jxskuid
-	JxSkuID        int    `orm:"column(jx_sku_id)"` // 根据VendorSkuID在本地系统里查询出来的 jxskuid
-	SkuName        string `orm:"size(255)"`
-	ShopPrice      int64
-	SalePrice      int64
+	VendorSkuID    string    `orm:"column(vendor_sku_id);size(48)"`
+	SkuID          int       `orm:"column(sku_id)"`    // 外部系统里记录的 jxskuid
+	JxSkuID        int       `orm:"column(jx_sku_id)"` // 根据VendorSkuID在本地系统里查询出来的 jxskuid
+	SkuName        string    `orm:"size(255)"`
+	ShopPrice      int64     // 门店标价
+	SalePrice      int64     // 售卖价
 	Weight         int       // 单位为克
 	SkuType        int       // 当前如果为gift就为1，否则缺省为0
 	PromotionType  int       // todo 当前是用于记录京东的PromotionType(生成jxorder用)，没有做转换
@@ -72,17 +73,17 @@ type OrderSku struct {
 // 所以这里不能用唯一索引
 func (o *OrderSku) TableIndex() [][]string {
 	return [][]string{
-		[]string{"VendorOrderID", "SkuID", "VendorID"},
+		[]string{"VendorOrderID", "SkuID"},
 	}
 }
 
 type Waybill struct {
 	ID                int64     `orm:"column(id)"`
-	VendorOrderID     string    `orm:"column(vendor_order_id);size(48)"`
-	OrderVendorID     int       `orm:"column(order_vendor_id)"`
 	VendorWaybillID   string    `orm:"column(vendor_waybill_id);size(48)"`
 	VendorWaybillID2  string    `orm:"column(vendor_waybill_id2);size(48)"` // 某些平台有多个ID，比如美团配送，当前美团配送的 delivery_id存这里
 	WaybillVendorID   int       `orm:"column(waybill_vendor_id)"`
+	VendorOrderID     string    `orm:"column(vendor_order_id);size(48)"`
+	OrderVendorID     int       `orm:"column(order_vendor_id)"`
 	CourierName       string    `orm:"size(32)"`
 	CourierMobile     string    `orm:"size(32)"`
 	Status            int       // 参见WaybillStatus*相关的常量定义
@@ -125,6 +126,6 @@ type OrderStatus struct {
 
 func (v *OrderStatus) TableIndex() [][]string {
 	return [][]string{
-		[]string{"VendorOrderID", "VendorStatus", "Status"},
+		[]string{"VendorOrderID", "Status", "VendorStatus"},
 	}
 }