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

business/partner/purchase/tao_vegetable/order.go

@@ -306,7 +306,7 @@ func (c *PurchaseHandler) onOrderMsg(orderStatus, orderId string, orderCallback
 	msg := orderCallback.(*tao_vegetable.CallbackOrder)
 	if orderStatus == tao_vegetable.OrderStatusOnSaleCancel {
 		onSale := orderCallback.(*tao_vegetable.OnSaleCancel)
-		msg.PublicModel = onSale.PublicModel
+		//msg.PublicModel = onSale.PublicModel
 		msg.MerchantCode = onSale.MerchantCode
 		msg.StoreId = onSale.StoreId
 		msg.BizOrderId = onSale.BizOrderId
@@ -387,7 +387,8 @@ func (c *PurchaseHandler) callbackOrderMsg2Status(msg *tao_vegetable.CallbackOrd
 		RefVendorOrderID: orderId,
 		RefVendorID:      model.VendorIDTaoVegetable,
 		VendorStatus:     msg.OrderStatus,
-		StatusTime:       utils.Str2TimeWithDefault(msg.Timestamp, time.Now()),
+		//StatusTime:       utils.Str2TimeWithDefault(msg.Timestamp, time.Now()),
+		StatusTime: time.Now(),
 	}
 
 	switch msg.OrderStatus {
@@ -421,18 +422,18 @@ func (c *PurchaseHandler) callbackOrderMsg2Status(msg *tao_vegetable.CallbackOrd
 
 func (c *PurchaseHandler) postFakeMsg(vendorOrderID, cmd, vendorStatus string) {
 	msg := &tao_vegetable.CallbackOrder{
-		PublicModel: tao_vegetable.PublicModel{
-			Method:     "",
-			AppKey:     "",
-			Session:    "",
-			Timestamp:  utils.Time2Str(time.Now()),
-			V:          "",
-			SignMethod: "",
-			Sign:       "",
-			Format:     "",
-			Simplify:   false,
-			CustomerId: false,
-		},
+		//PublicModel: tao_vegetable.PublicModel{
+		//	Method:     "",
+		//	AppKey:     "",
+		//	Session:    "",
+		//	Timestamp:  utils.Time2Str(time.Now()),
+		//	V:          "",
+		//	SignMethod: "",
+		//	Sign:       "",
+		//	Format:     "",
+		//	Simplify:   false,
+		//	CustomerId: false,
+		//},
 		MerchantCode: "",
 		StoreId:      "",
 		BizOrderId:   utils.Str2Int64(vendorOrderID),