aa

business/jxcallback/orderman/order.go

@@ -1303,7 +1303,7 @@ func MergeJdsOrders(ctx *jxcontext.Context, vendorOrderIDs []string) (vendorOrde
 	order.SalePrice = salePrice
 	order.ShopPrice = shopPrice
 	order.TotalShopMoney = totalShop
-	order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(orders[0].VendorOrderID2)*1000000) + utils.Int2Str(time.Now().Second())
+	order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(orders[0].VendorOrderID2)*10000000) + utils.Int2Str(time.Now().Second())
 	if len(order.VendorOrderID) < 18 {
 		order.VendorOrderID = order.VendorOrderID + "0"
 	}
@@ -1486,7 +1486,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 			if len(order.VendorOrderID2) > 18 {
 				order.VendorOrderID2 = order.VendorOrderID2[0:12]
 			}
-			order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*1000000) + utils.Int2Str(time.Now().Second())
+			order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*10000000) + utils.Int2Str(time.Now().Second())
 			if len(order.VendorOrderID) < 18 {
 				order.VendorOrderID = order.VendorOrderID + "0"
 			}

business/jxstore/report/report.go

@@ -702,3 +702,7 @@ func RefreshJDMembers(ctx *jxcontext.Context) (err error) {
 	task.GetID()
 	return err
 }
+
+func UserMemberReport(ctx *jxcontext.Context, vendorID int, keyword string, offset, pageSize int) (page *model.PagedInfo, err error) {
+	return dao.UserMemberReport(dao.GetDB(), vendorID, keyword, offset, pageSize)
+}

business/model/dao/report.go

@@ -374,3 +374,34 @@ func DeletePriceReferHistory(db *DaoDB, snapDate time.Time) (num int64, err erro
 	}
 	return ExecuteSQL(db, sql, sqlParams...)
 }
+
+func UserMemberReport(db *DaoDB, vendorID int, keyword string, offset, pageSize int) (page *model.PagedInfo, err error) {
+	sql := `
+		SELECT SQL_CALC_FOUND_ROWS DISTINCT a.mobile, IF(a.vendor_id = ?, c.name, b.consignee_name) name  
+		  FROM user_member a 	
+		  LEFT JOIN goods_order b ON a.mobile = b.consignee_mobile2 AND b.status <> ?
+		  LEFT JOIN user c ON c.mobile = a.mobile
+      GROUP BY 
+	`
+	sqlParams := []interface{}{
+		model.VendorIDJX, model.OrderStatusCanceled,
+	}
+	if vendorID != -1 {
+
+	}
+	if keyword != "" {
+
+	}
+	sql += "LIMIT ? OFFSET ?"
+	pageSize = jxutils.FormalizePageSize(pageSize)
+	sqlParams = append(sqlParams, pageSize, offset)
+	txDB, _ := Begin(db)
+	defer Commit(db, txDB)
+	if err = GetRowsTx(txDB, &page, sql, sqlParams...); err == nil {
+		return &model.PagedInfo{
+			TotalCount: GetLastTotalRowCount2(db, txDB),
+			Data:       page,
+		}, nil
+	}
+	return page, err
+}