订单下载。jd下单。。

services/express/internal/svc/delivery.go

@@ -50,7 +50,7 @@ func Cancel(client transit.Transit, w modelbase.Params, info dao.DeliveryOrderPr
 		modelObj.Rollback()
 		return utils.Fail
 	}
-	ww := modelbase.Params{Eq: map[string]string{"deliver_goods_id": strconv.Itoa(info.Id)}}
+	ww := modelbase.Params{Eq: map[string]string{"delivery_order_id": strconv.Itoa(info.Id)}}
 	editExp := dao.DeliveryExpStatus{
 		Status: utils.StatusFail,
 	}
@@ -80,7 +80,11 @@ func UpOrderDeliverStatus(name string, id string, Type int, status int32) utils.
 		}
 
 		client := order.NewOrderClient(cli.Conn())
-		_, err = client.UpdateOrderDeliverStatus(context.Background(), &order.UpdateOrderDeliverStatusRequest{Id: id, DeliverStatus: status})
+		update := order.UpdateOrderDeliverStatusRequest{Id: id, DeliverStatus: status}
+		if status == dao.SendStatusOver {
+			update.SignTime = utils.Now().GoString()
+		}
+		_, err = client.UpdateOrderDeliverStatus(context.Background(), &update)
 		if err != nil {
 			logx.Errorf("get order err: %v", err)
 			return utils.ErrorInternalServer
@@ -169,7 +173,7 @@ func QueryEdit(data map[string]interface{}, goods *dao.DeliveryOrderUpTransit, n
 	if status {
 		goods.Status = dao.SendStatusOver
 		goods.SignTime = utils.Now()
-		ww := modelbase.Params{Eq: map[string]string{"deliver_goods_id": strconv.Itoa(goods.Id)}}
+		ww := modelbase.Params{Eq: map[string]string{"delivery_order_id": strconv.Itoa(goods.Id)}}
 		editExp := dao.DeliveryExpStatus{
 			Status: utils.StatusFail,
 		}
@@ -198,3 +202,74 @@ func QueryEdit(data map[string]interface{}, goods *dao.DeliveryOrderUpTransit, n
 	modelObj.Commit()
 	return items, utils.Ok
 }
+func QueryJdEdit(data map[string]interface{}, goods *dao.DeliveryOrderUpTransit, name string) ([]dao.ExpressQueryItems, utils.Status) {
+	routeResps, ok := data["traceDetails"].([]interface{})
+	if !ok || len(routeResps) == 0 {
+		logx.Error("routeResps 为空")
+		return nil, utils.SetError(utils.ErrorNotFund, "获取快递错误")
+	}
+
+	status := false
+	var items []dao.ExpressQueryItems
+	for _, item := range routeResps {
+		route, ok := item.(map[string]interface{})
+		if !ok {
+			continue
+		}
+		categoryStr := utils.StringEmpty
+		if category, ok := route["category"]; ok {
+			categoryStr = strconv.Itoa(int(category.(float64)))
+		}
+		tmp := dao.ExpressQueryItems{
+			OpCode:     route["state"].(string),
+			Remark:     route["operationRemark"].(string),
+			AcceptTime: route["operationTime"].(string),
+
+			FirstStatusCode: categoryStr,
+			FirstStatusName: route["categoryName"].(string),
+			OperatorName:    route["operatorName"].(string),
+			OperationTitle:  route["operationTitle"].(string),
+		}
+		tmp.LastMd5 = utils.MD5Encrypt(tmp.Remark + tmp.AcceptTime +
+			tmp.OperatorName)
+		items = append(items, tmp)
+		if ok := transit.JdSingedCodeMap[tmp.OpCode]; ok {
+			status = true
+		}
+	}
+
+	modelObj := model.DeliveryOrderModel{}.Init()
+	modelObj.Begin()
+	if status {
+		goods.Status = dao.SendStatusOver
+		goods.SignTime = utils.Now()
+		ww := modelbase.Params{Eq: map[string]string{"delivery_order_id": strconv.Itoa(goods.Id)}}
+		editExp := dao.DeliveryExpStatus{
+			Status: utils.StatusOk,
+		}
+		_, err := model.DeliveryOrderExpModel{}.Init().Edit(ww, &editExp)
+		if err != nil {
+			modelObj.Rollback()
+			logx.Error("update deleverGoodsExp err", err)
+			return nil, utils.SetError(utils.ErrorNotFund, "更新数据出错")
+		}
+
+		s := UpOrderDeliverStatus(name, goods.ObjId, int(goods.Type), dao.SendStatusOver)
+		if s != utils.Ok {
+			modelObj.Rollback()
+			return nil, s
+		}
+	}
+
+	goods.TransitQuery = utils.StructToJson(items)
+	w := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(goods.Id)}}
+	_, err := modelObj.Edit(w, goods)
+	if err != nil {
+		modelObj.Rollback()
+		logx.Error("update deleverGoods err", err)
+		return nil, utils.SetError(utils.ErrorNotFund, "更新数据出错")
+	}
+
+	modelObj.Commit()
+	return items, utils.Ok
+}