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

business/jxstore/cms/store_sku.go

@@ -1152,6 +1152,8 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []str
 	if isHighPrice || priceType != 0 {
 		sql += " , t4.unit_price DESC LIMIT 99"
 	}
+	globals.SugarLogger.Debugf("==========slq := %s", sql)
+	globals.SugarLogger.Debugf("==========sqlParams := %s", utils.Format4Output(sqlParams, false))
 	var tmpList []*tGetStoresSkusInfo
 	if err = dao.GetRowsTx(txDB, &tmpList, sql, sqlParams...); err != nil {
 		dao.Rollback(db, txDB)

business/model/const.go

@@ -151,6 +151,7 @@ var (
 		VendorIDMTWM: 0,
 		VendorIDELM:  0,
 		VendorIDEBAI: 0,
+		VendorIDDD:   0,
 	}
 
 	ZXCityCodeMap = map[int]string{

business/model/dao/dao_order.go

@@ -1384,8 +1384,9 @@ func GetOrdersForJxPay(db *DaoDB, finishTimeBegin, finishTimeEnd time.Time) (goo
 func GetWaybills(db *DaoDB, vendorOrderID string) (waybills []*model.Waybill, err error) {
 	sql := `		SELECT * 
 			FROM waybill 
-			WHERE vendor_order_id = ?
+			WHERE vendor_order_id = ? ORDER BY waybill_created_at asc
 	`
+
 	sqlParams := []interface{}{vendorOrderID}
 	err = GetRows(db, &waybills, sql, sqlParams)
 	return waybills, err

business/partner/delivery/rider.go

@@ -77,16 +77,16 @@ func GetOrderRiderInfoToPlatform(orderId string) {
 		switch riderInfo.LogisticsStatus {
 		case 20: //配送中
 			riderInfo.LogisticsStatus = 20
-			riderInfo.LogisticsContext = `正在配送中`
+			//riderInfo.LogisticsContext = `正在配送中`
 		case 110: // 完成
 			riderInfo.LogisticsStatus = 40
-			riderInfo.LogisticsContext = `配送完成`
+			//riderInfo.LogisticsContext = `配送完成`
 		case 105: // 完成
 			riderInfo.LogisticsStatus = 40
-			riderInfo.LogisticsContext = `被取消`
+			//riderInfo.LogisticsContext = `被取消`
 		case 115: // 取消
 			riderInfo.LogisticsStatus = 100
-			riderInfo.LogisticsContext = `被取消`
+			//riderInfo.LogisticsContext = `被取消`
 		default:
 			continue
 		}
@@ -114,6 +114,14 @@ func GetOrderRiderInfoToPlatform(orderId string) {
 		case model.VendorIDJDShop: // 京东商城
 		case model.VendorIDWSC: // 微盟微商城
 		case model.VendorIDDD: // 抖店小时达
+			globals.SugarLogger.Debugf("riderInfo Order========:%s", utils.Format4Output(riderInfo, false))
+			// 抖店由于发配送时运单id已经固定了,我们系统在重新发货,或者运单号发生改变时去推送信息时.抖店只识别第一个运单号所以在这儿修改成发单时的第一个运单号!
+			wayBillList, err := dao.GetWaybills(dao.GetDB(), riderInfo.OrderId)
+			if err != nil || len(wayBillList) == 0 {
+				globals.SugarLogger.Errorf("Get WayBill List err := %s", err)
+				continue
+			}
+			riderInfo.ThirdCarrierOrderId = wayBillList[0].VendorWaybillID
 			paramsMap := utils.Struct2Map(riderInfo, "", true)
 			if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil {
 				if err := handler.GetOrderRider(v.VendorOrgCode, v.VendorStoreID, paramsMap); err != nil {

business/partner/purchase/tiktok_store/order.go

@@ -143,7 +143,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
 				SkuID:          utils.Str2Int(extra.OutSkuId),
 				JxSkuID:        utils.Str2Int(extra.OutSkuId),
 				SkuName:        extra.ProductName,
-				ShopPrice:      0,
+				ShopPrice:      extra.OriginAmount,
 				VendorPrice:    extra.OrderAmount / extra.ItemNum,
 				SalePrice:      extra.OriginAmount,
 				EarningPrice:   0,