diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go index f0ace94ea..62fa95d5a 100644 --- a/business/partner/purchase/jdshop/callback.go +++ b/business/partner/purchase/jdshop/callback.go @@ -103,14 +103,24 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err OrderCreatedAt: utils.Str2Time(msg.OrderStartTime), ConsigneeAddress: Decrypt(msg.ConsigneeInfo.FullAddress), ConsigneeName: Decrypt(msg.ConsigneeInfo.Fullname), - ConsigneeMobile: Decrypt(msg.ConsigneeInfo.Mobile), - ConsigneeMobile2: Decrypt(msg.ConsigneeInfo.Telephone), - ActualPayPrice: jxutils.StandardPrice2Int(utils.Str2Float64(msg.OrderPayment)), - Status: model.OrderStatusNew, - TotalShopMoney: utils.Float64TwoInt64(math.Round(float64(jxutils.StandardPrice2Int(utils.Str2Float64(msg.OrderPayment))) * jdshopapi.JdsPayPercentage)), - DeliveryType: model.OrderDeliveryTypeStoreSelf, - StatusTime: utils.Str2Time(msg.OrderStartTime), - OrderSeq: 0, + // ConsigneeMobile: Decrypt(msg.ConsigneeInfo.Mobile), + // ConsigneeMobile2: Decrypt(msg.ConsigneeInfo.Telephone), + ActualPayPrice: jxutils.StandardPrice2Int(utils.Str2Float64(msg.OrderPayment)), + Status: model.OrderStatusNew, + TotalShopMoney: utils.Float64TwoInt64(math.Round(float64(jxutils.StandardPrice2Int(utils.Str2Float64(msg.OrderPayment))) * jdshopapi.JdsPayPercentage)), + DeliveryType: model.OrderDeliveryTypeStoreSelf, + StatusTime: utils.Str2Time(msg.OrderStartTime), + OrderSeq: 0, + } + if len(msg.ConsigneeInfo.Mobile) != 11 { + order.ConsigneeMobile = Decrypt(msg.ConsigneeInfo.Mobile) + } else { + order.ConsigneeMobile = msg.ConsigneeInfo.Mobile + } + if len(msg.ConsigneeInfo.Telephone) != 11 { + order.ConsigneeMobile2 = Decrypt(msg.ConsigneeInfo.Telephone) + } else { + order.ConsigneeMobile2 = msg.ConsigneeInfo.Telephone } if order.TotalShopMoney < 100 { order.TotalShopMoney = 100