+GetMyOrders

business/partner/purchase/jx/localjx/order.go

@@ -100,6 +100,39 @@ func init() {
 	orderNoBeginTimestamp = utils.Str2Time("2010-01-01 00:00:00").Unix()
 }
 
+func GetMyOrders(ctx *jxcontext.Context, fromDateStr, toDateStr string, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
+	db := dao.GetDB()
+	tmpOrderList, totalCount, err := dao.GetOrders(db, nil, false, false, fromDateStr, toDateStr, false, nil, false, ctx.GetUserID(), params, offset, pageSize)
+	if err == nil {
+		pagedInfo = &model.PagedInfo{
+			TotalCount: totalCount,
+		}
+		if totalCount > 0 {
+			var ids []int64
+			for _, v := range tmpOrderList {
+				ids = append(ids, v.ID)
+			}
+			orderSkuList, _, err2 := dao.GetOrders(db, ids, true, false, "", "", false, nil, false, "", nil, 0, model.UnlimitedPageSize)
+			if err = err2; err == nil {
+				orderMap := make(map[string]*model.GoodsOrderExt)
+				var orderList []*model.GoodsOrderExt
+				for _, v := range orderSkuList {
+					universalOrderID := jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)
+					if orderMap[universalOrderID] == nil {
+						orderMap[universalOrderID] = v
+						orderList = append(orderList, v)
+					}
+					orderMap[universalOrderID].SkuList = append(orderMap[universalOrderID].SkuList, &v.ShortSkuInfo)
+				}
+				pagedInfo.Data = orderList
+			} else {
+				pagedInfo = nil
+			}
+		}
+	}
+	return pagedInfo, err
+}
+
 func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, createType int) (outJxOrder *JxOrderInfo, err error) {
 	outJxOrder, deliveryAddress, err := generateOrder(ctx, jxOrder, addressID)
 	if err != nil {